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

@@ -3,7 +3,8 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { IContextKeyService, IContextKeyServiceTarget, IContextKey, ContextKeyExpr, IContext } from 'vs/platform/contextkey/common/contextkey';
import { IContextKeyService, IContextKeyServiceTarget, IContextKey, ContextKeyExpr, IContext, IContextKeyChangeEvent } from 'vs/platform/contextkey/common/contextkey';
import Event from 'vs/base/common/event';
export class ContextKeyServiceStub implements IContextKeyService {
@@ -13,7 +14,7 @@ export class ContextKeyServiceStub implements IContextKeyService {
//
}
onDidChangeContext: Event<string[]>;
onDidChangeContext: Event<IContextKeyChangeEvent>;
createKey<T>(key: string, defaultValue: T): IContextKey<T> {
return undefined;

View File

@@ -25,8 +25,8 @@ export class MessageServiceStub implements IMessageService{
return undefined;
}
confirm(confirmation: IConfirmation): TPromise<IConfirmationResult> {
return undefined;
confirm(confirmation: IConfirmation): boolean {
return true;
}
/**
@@ -35,4 +35,11 @@ export class MessageServiceStub implements IMessageService{
confirmSync(confirmation: IConfirmation): boolean {
return undefined;
}
/**
* Ask the user for confirmation with a checkbox.
*/
confirmWithCheckbox(confirmation: IConfirmation): TPromise<IConfirmationResult> {
return undefined;
}
}

View File

@@ -16,20 +16,26 @@ import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
export class WorkspaceConfigurationTestService implements IWorkspaceConfigurationService {
_serviceBrand: any;
getValue<T>(): T;
getValue<T>(section: string): T;
getValue<T>(overrides: IConfigurationOverrides): T;
getValue<T>(section: string, overrides: IConfigurationOverrides): T;
getValue(arg1?: any, arg2?: any): any {
return TPromise.as(null);
}
onDidChangeConfiguration: Event<IConfigurationChangeEvent>;
getConfigurationData(): IConfigurationData { return undefined; }
getConfiguration<T>(): T
getConfiguration<T>(section: string): T
getConfiguration<T>(overrides: IConfigurationOverrides): T
getConfiguration<T>(section: string, overrides: IConfigurationOverrides): T
getConfiguration<T>(): T;
getConfiguration<T>(section: string): T;
getConfiguration<T>(overrides: IConfigurationOverrides): T;
getConfiguration<T>(section: string, overrides: IConfigurationOverrides): T;
getConfiguration(arg1?: any, arg2?: any): any {
return TPromise.as(null);
}
getValue<T>(key: string, overrides?: IConfigurationOverrides): T { return undefined; }
updateValue(key: string, value: any): TPromise<void>
updateValue(key: string, value: any, overrides: IConfigurationOverrides): TPromise<void>
updateValue(key: string, value: any, target: ConfigurationTarget): TPromise<void>