Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms
This commit is contained in:
Karl Burtram
2018-04-04 15:27:51 -07:00
committed by GitHub
parent 5fba3e31b4
commit dafb780987
9412 changed files with 141255 additions and 98813 deletions

View File

@@ -5,11 +5,12 @@
'use strict';
/*
import Severity from 'vs/base/common/severity';
import { IConfirmation, IMessageService, IMessageWithAction, IConfirmationResult } from 'vs/platform/message/common/message';
import { TPromise } from 'vs/base/common/winjs.base';
export class MessageServiceStub implements IMessageService{
export class MessageServiceStub implements IMessageService {
_serviceBrand: any;
show(sev: Severity, message: string): () => void;
@@ -29,17 +30,13 @@ export class MessageServiceStub implements IMessageService{
return true;
}
/**
* Ask the user for confirmation.
*/
confirmSync(confirmation: IConfirmation): boolean {
return undefined;
}
/**
* Ask the user for confirmation with a checkbox.
*/
confirmWithCheckbox(confirmation: IConfirmation): TPromise<IConfirmationResult> {
return undefined;
}
}
}
*/

View File

@@ -10,6 +10,7 @@ import { IEditorService, IEditor, IEditorInput, IEditorOptions, ITextEditorOptio
import { TPromise } from 'vs/base/common/winjs.base';
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
import { EditorInput, EditorOptions, IFileEditorInput, TextEditorOptions, Extensions, SideBySideEditorInput } from 'vs/workbench/common/editor';
import { ICloseEditorsFilter } from 'vs/workbench/browser/parts/editor/editorPart';
export class WorkbenchEditorTestService implements IWorkbenchEditorService {
_serviceBrand: ServiceIdentifier<any>;
@@ -87,7 +88,7 @@ export class WorkbenchEditorTestService implements IWorkbenchEditorService {
* will not be closed. The direction can be used in that case to control if all other editors should get closed,
* or towards a specific direction.
*/
closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise<void> {
closeEditors(p1?: any, p2?: any, p3?: any): TPromise<void> {
return undefined;
}