Merge from vscode 8a997f7321ae6612fc0e6eb3eac4f358a6233bfb

This commit is contained in:
ADS Merger
2020-02-11 07:08:19 +00:00
parent 0f934081e1
commit 085752f111
217 changed files with 2561 additions and 2063 deletions

View File

@@ -108,7 +108,7 @@ interface IBrowserWorkbenchEnvironmentConstructionOptions extends IWorkbenchCons
interface IExtensionHostDebugEnvironment {
params: IExtensionHostDebugParams;
isExtensionDevelopment: boolean;
extensionDevelopmentLocationURI: URI[];
extensionDevelopmentLocationURI?: URI[];
extensionTestsLocationURI?: URI;
}
@@ -177,7 +177,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
return this._extensionHostDebugEnvironment.isExtensionDevelopment;
}
get extensionDevelopmentLocationURI(): URI[] {
get extensionDevelopmentLocationURI(): URI[] | undefined {
if (!this._extensionHostDebugEnvironment) {
this._extensionHostDebugEnvironment = this.resolveExtensionHostDebugEnvironment();
}
@@ -289,7 +289,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
break: false
},
isExtensionDevelopment: false,
extensionDevelopmentLocationURI: []
extensionDevelopmentLocationURI: undefined
};
// Fill in selected extra environmental properties