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,11 +5,10 @@
'use strict';
import * as nls from 'vs/nls';
import { ICommonCodeEditor } from 'vs/editor/common/editorCommon';
import { editorAction, EditorAction, ServicesAccessor } from 'vs/editor/common/editorCommonExtensions';
import { registerEditorAction, EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneThemeService';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
@editorAction
class ToggleHighContrast extends EditorAction {
private _originalThemeName: string;
@@ -24,7 +23,7 @@ class ToggleHighContrast extends EditorAction {
this._originalThemeName = null;
}
public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): void {
public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
const standaloneThemeService = accessor.get(IStandaloneThemeService);
if (this._originalThemeName) {
// We must toggle back to the integrator's theme
@@ -36,3 +35,5 @@ class ToggleHighContrast extends EditorAction {
}
}
}
registerEditorAction(ToggleHighContrast);