ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-29 08:10:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

Browse Source 
* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files
This commit is contained in:
Anthony Dresser
2019-10-21 22:12:22 -07:00
committed by GitHub
parent 7c9be74970
commit 1e22f47304
913 changed files with 18898 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/editor/contrib/dnd/dnd.ts
View File

@@ -31,14 +31,14 @@ function hasTriggerModifier(e: IKeyboardEvent | IMouseEvent): boolean {
export class DragAndDropController extends Disposable implements editorCommon.IEditorContribution {
private static readonly ID = 'editor.contrib.dragAndDrop';
public static readonly ID = 'editor.contrib.dragAndDrop';
private readonly _editor: ICodeEditor;
private _dragSelection: Selection | null;
private _dndDecorationIds: string[];
private _mouseDown: boolean;
private _modifierPressed: boolean;
static TRIGGER_KEY_VALUE = isMacintosh ? KeyCode.Alt : KeyCode.Ctrl;
static readonly TRIGGER_KEY_VALUE = isMacintosh ? KeyCode.Alt : KeyCode.Ctrl;
static get(editor: ICodeEditor): DragAndDropController {
return editor.getContribution<DragAndDropController>(DragAndDropController.ID);
@@ -219,10 +219,6 @@ export class DragAndDropController extends Disposable implements editorCommon.IE
target.type === MouseTargetType.GUTTER_LINE_DECORATIONS;
}
public getId(): string {
return DragAndDropController.ID;
}
public dispose(): void {
this._removeDecoration();
this._dragSelection = null;
@@ -232,4 +228,4 @@ export class DragAndDropController extends Disposable implements editorCommon.IE
}
}
registerEditorContribution(DragAndDropController);
registerEditorContribution(DragAndDropController.ID, DragAndDropController);