Merge VS Code 1.23.1 (#1520)

This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions

View File

@@ -173,22 +173,17 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
});
public showAt(position: Position): void {
this._editor.changeDecorations(changeAccessor => {
let newDecorations: IModelDeltaDecoration[] = [];
newDecorations.push({
range: new Range(position.lineNumber, position.column, position.lineNumber, position.column),
options: DragAndDropController._DECORATION_OPTIONS
});
let newDecorations: IModelDeltaDecoration[] = [{
range: new Range(position.lineNumber, position.column, position.lineNumber, position.column),
options: DragAndDropController._DECORATION_OPTIONS
}];
this._dndDecorationIds = changeAccessor.deltaDecorations(this._dndDecorationIds, newDecorations);
});
this._dndDecorationIds = this._editor.deltaDecorations(this._dndDecorationIds, newDecorations);
this._editor.revealPosition(position, editorCommon.ScrollType.Immediate);
}
private _removeDecoration(): void {
this._editor.changeDecorations(changeAccessor => {
changeAccessor.deltaDecorations(this._dndDecorationIds, []);
});
this._dndDecorationIds = this._editor.deltaDecorations(this._dndDecorationIds, []);
}
private _hitContent(target: IMouseTarget): boolean {