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

Vscode merge (#4582)

Browse Source 
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies
This commit is contained in:
Anthony Dresser
2019-03-19 17:44:35 -07:00
committed by GitHub
parent 833d197412
commit 87765e8673
1879 changed files with 54505 additions and 38058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,12 +32,12 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
private static readonly ID = 'editor.contrib.dragAndDrop';
private _editor: ICodeEditor;
private readonly _editor: ICodeEditor;
private _toUnhook: IDisposable[];
private _dragSelection: Selection | null;
private _dndDecorationIds: string[];
private _mouseDown: boolean;
private _modiferPressed: boolean;
private _modifierPressed: boolean;
static TRIGGER_KEY_VALUE = isMacintosh ? KeyCode.Alt : KeyCode.Ctrl;
static get(editor: ICodeEditor): DragAndDropController {
@@ -56,7 +56,7 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
this._toUnhook.push(this._editor.onDidBlurEditorWidget(() => this.onEditorBlur()));
this._dndDecorationIds = [];
this._mouseDown = false;
this._modiferPressed = false;
this._modifierPressed = false;
this._dragSelection = null;
}
@@ -64,7 +64,7 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
this._removeDecoration();
this._dragSelection = null;
this._mouseDown = false;
this._modiferPressed = false;
this._modifierPressed = false;
}
private onEditorKeyDown(e: IKeyboardEvent): void {
@@ -73,7 +73,7 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
}
if (hasTriggerModifier(e)) {
this._modiferPressed = true;
this._modifierPressed = true;
}
if (this._mouseDown && hasTriggerModifier(e)) {
@@ -89,7 +89,7 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
}
if (hasTriggerModifier(e)) {
this._modiferPressed = false;
this._modifierPressed = false;
}
if (this._mouseDown && e.keyCode === DragAndDropController.TRIGGER_KEY_VALUE) {
@@ -170,13 +170,13 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
(
(
hasTriggerModifier(mouseEvent.event) ||
this._modiferPressed
this._modifierPressed
) && (
this._dragSelection.getEndPosition().equals(newCursorPosition) || this._dragSelection.getStartPosition().equals(newCursorPosition)
) // we allow users to paste content beside the selection
)) {
this._editor.pushUndoStop();
this._editor.executeCommand(DragAndDropController.ID, new DragAndDropCommand(this._dragSelection, newCursorPosition, hasTriggerModifier(mouseEvent.event) || this._modiferPressed));
this._editor.executeCommand(DragAndDropController.ID, new DragAndDropCommand(this._dragSelection, newCursorPosition, hasTriggerModifier(mouseEvent.event) || this._modifierPressed));
this._editor.pushUndoStop();
}
}
@@ -227,7 +227,7 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
this._removeDecoration();
this._dragSelection = null;
this._mouseDown = false;
this._modiferPressed = false;
this._modifierPressed = false;
this._toUnhook = dispose(this._toUnhook);
}
}

6
src/vs/editor/contrib/dnd/dragAndDropCommand.ts
View File

@@ -12,10 +12,10 @@ import { ITextModel } from 'vs/editor/common/model';
export class DragAndDropCommand implements editorCommon.ICommand {
private selection: Selection;
private targetPosition: Position;
private readonly selection: Selection;
private readonly targetPosition: Position;
private targetSelection: Selection;
private copy: boolean;
private readonly copy: boolean;
constructor(selection: Selection, targetPosition: Position, copy: boolean) {
this.selection = selection;