Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions

View File

@@ -5,13 +5,12 @@
'use strict';
import { Selection } from 'vs/editor/common/core/selection';
import { editorCommand, ServicesAccessor, EditorCommand } from 'vs/editor/common/editorCommonExtensions';
import { registerEditorCommand, ServicesAccessor, EditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { Disposable } from 'vs/base/common/lifecycle';
import { ICommonCodeEditor, IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { editorContribution } from 'vs/editor/browser/editorBrowserExtensions';
class CursorState {
readonly selections: Selection[];
@@ -35,12 +34,11 @@ class CursorState {
}
}
@editorContribution
export class CursorUndoController extends Disposable implements IEditorContribution {
private static ID = 'editor.contrib.cursorUndoController';
private static readonly ID = 'editor.contrib.cursorUndoController';
public static get(editor: ICommonCodeEditor): CursorUndoController {
public static get(editor: ICodeEditor): CursorUndoController {
return editor.getContribution<CursorUndoController>(CursorUndoController.ID);
}
@@ -110,7 +108,6 @@ export class CursorUndoController extends Disposable implements IEditorContribut
}
}
@editorCommand
export class CursorUndo extends EditorCommand {
constructor() {
super({
@@ -123,7 +120,10 @@ export class CursorUndo extends EditorCommand {
});
}
public runEditorCommand(accessor: ServicesAccessor, editor: ICommonCodeEditor, args: any): void {
public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void {
CursorUndoController.get(editor).cursorUndo();
}
}
registerEditorContribution(CursorUndoController);
registerEditorCommand(new CursorUndo());