Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions

View File

@@ -24,7 +24,7 @@ const ENABLED_EXTENSIONS_STORAGE_PATH = 'extensionsIdentifiers/enabled';
export class ExtensionEnablementService extends Disposable implements IExtensionEnablementService {
_serviceBrand: any;
_serviceBrand: undefined;
private _onEnablementChanged = new Emitter<IExtension[]>();
public readonly onEnablementChanged: Event<IExtension[]> = this._onEnablementChanged.event;

View File

@@ -19,7 +19,7 @@ export interface IExtensionManagementServer {
}
export interface IExtensionManagementServerService {
_serviceBrand: any;
_serviceBrand: undefined;
readonly localExtensionManagementServer: IExtensionManagementServer | null;
readonly remoteExtensionManagementServer: IExtensionManagementServer | null;
getExtensionManagementServer(location: URI): IExtensionManagementServer | null;
@@ -37,7 +37,7 @@ export const enum EnablementState {
export const IExtensionEnablementService = createDecorator<IExtensionEnablementService>('extensionEnablementService');
export interface IExtensionEnablementService {
_serviceBrand: any;
_serviceBrand: undefined;
readonly allUserExtensionsDisabled: boolean;
@@ -97,7 +97,7 @@ export interface IExtensionRecommendation {
export const IExtensionTipsService = createDecorator<IExtensionTipsService>('extensionTipsService');
export interface IExtensionTipsService {
_serviceBrand: any;
_serviceBrand: undefined;
getAllRecommendationsWithReason(): { [id: string]: { reasonId: ExtensionRecommendationReason, reasonText: string }; };
getFileBasedRecommendations(): IExtensionRecommendation[];
getOtherRecommendations(): Promise<IExtensionRecommendation[]>;

View File

@@ -15,7 +15,7 @@ import { ILabelService } from 'vs/platform/label/common/label';
export class ExtensionManagementServerService implements IExtensionManagementServerService {
_serviceBrand: any;
_serviceBrand: undefined;
readonly localExtensionManagementServer: IExtensionManagementServer | null = null;
readonly remoteExtensionManagementServer: IExtensionManagementServer | null = null;

View File

@@ -22,7 +22,7 @@ import { IDownloadService } from 'vs/platform/download/common/download';
export class ExtensionManagementService extends Disposable implements IExtensionManagementService {
_serviceBrand: any;
_serviceBrand: undefined;
readonly onInstallExtension: Event<InstallExtensionEvent>;
readonly onDidInstallExtension: Event<DidInstallExtensionEvent>;

View File

@@ -24,7 +24,7 @@ const localExtensionManagementServerAuthority: string = 'vscode-local';
export class ExtensionManagementServerService implements IExtensionManagementServerService {
_serviceBrand: any;
_serviceBrand: undefined;
readonly localExtensionManagementServer: IExtensionManagementServer;
readonly remoteExtensionManagementServer: IExtensionManagementServer | null = null;

View File

@@ -560,7 +560,7 @@ function aMultiExtensionManagementServerService(instantiationService: TestInstan
extensionManagementService: instantiationService.get(IExtensionManagementService)
};
return {
_serviceBrand: {},
_serviceBrand: undefined,
localExtensionManagementServer,
remoteExtensionManagementServer,
getExtensionManagementServer: (location: URI) => {