maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove staticExtensions api

Browse source
This commit is contained in:
Sandeep Somavarapu 2021-08-17 11:49:48 +02:00
parent 323e53b38c
commit 476484061b
No known key found for this signature in database
GPG key ID: 1FED25EC4646638B
3 changed files with 2 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/api/browser/mainThreadCLICommands.ts
View file

@ -12,6 +12,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import { CLIOutput, IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
import { ExtensionManagementCLIService } from 'vs/platform/extensionManagement/common/extensionManagementCLIService';
import { getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
import { ILabelService } from 'vs/platform/label/common/label';
@ -21,7 +22,6 @@ import { IOpenWindowOptions, IWindowOpenable } from 'vs/platform/windows/common/
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
import { IExtensionManifestPropertiesService } from 'vs/workbench/services/extensions/common/extensionManifestPropertiesService';
import { IExtensionManifest } from 'vs/workbench/workbench.web.api';
// this class contains the commands that the CLI server is reying on

43
src/vs/workbench/services/extensionManagement/common/webExtensionsScannerService.ts
View file

@ -17,12 +17,11 @@ import { ILogService } from 'vs/platform/log/common/log';
import { CancellationToken } from 'vs/base/common/cancellation';
import { IExtensionGalleryService, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
import { groupByExtension, areSameExtensions, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
import type { IStaticExtension } from 'vs/workbench/workbench.web.api';
import { Disposable } from 'vs/base/common/lifecycle';
import { localizeManifest } from 'vs/platform/extensionManagement/common/extensionNls';
import { localize } from 'vs/nls';
import * as semver from 'vs/base/common/semver/semver';
import { isString, isUndefined } from 'vs/base/common/types';
import { isString } from 'vs/base/common/types';
import { getErrorMessage } from 'vs/base/common/errors';
import { ResourceMap } from 'vs/base/common/map';
import { IProductService } from 'vs/platform/product/common/productService';
@ -56,7 +55,6 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
declare readonly _serviceBrand: undefined;
private readonly builtinExtensionsPromise: Promise<IExtension[]> = Promise.resolve([]);
private readonly staticExtensionsPromise: Promise<IExtension[]> = Promise.resolve([]);
private readonly cutomBuiltinExtensions: (string | URI)[];
private readonly customBuiltinExtensionsPromise: Promise<IExtension[]> = Promise.resolve([]);
@ -80,7 +78,6 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
this.installedExtensionsResource = joinPath(environmentService.userRoamingDataHome, 'extensions.json');
this.customBuiltinExtensionsCacheResource = joinPath(environmentService.userRoamingDataHome, 'customBuiltinExtensionsCache.json');
this.builtinExtensionsPromise = this.readSystemExtensions();
this.staticExtensionsPromise = this.readStaticExtensions();
this.customBuiltinExtensionsPromise = this.readCustomBuiltinExtensions();
}
}
@ -92,21 +89,6 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
return this.builtinExtensionsScannerService.scanBuiltinExtensions();
}
/**
* All extensions defined via `staticExtensions` API
*/
private async readStaticExtensions(): Promise<IExtension[]> {
const staticExtensions = this.environmentService.options && Array.isArray(this.environmentService.options.staticExtensions) ? this.environmentService.options.staticExtensions : [];
const result: IExtension[] = [];
for (const e of staticExtensions) {
const extension = this.parseStaticExtension(e, isUndefined(e.isBuiltin) ? true : e.isBuiltin);
if (extension) {
result.push(extension);
}
}
return result;
}
/**
* All extensions defined via `additionalBuiltinExtensions` API
*/
@ -209,23 +191,6 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
return result;
}
private parseStaticExtension(e: IStaticExtension, isBuiltin: boolean): IExtension | null {
const extensionLocation = URI.revive(e.extensionLocation);
try {
return {
identifier: { id: getGalleryExtensionId(e.packageJSON.publisher, e.packageJSON.name) },
location: extensionLocation,
type: ExtensionType.User,
isBuiltin,
manifest: e.packageJSON,
};
} catch (error) {
this.logService.error(`Error while parsing extension ${extensionLocation.toString()}`);
this.logService.error(error);
}
return null;
}
async scanSystemExtensions(): Promise<IExtension[]> {
return this.builtinExtensionsPromise;
}
@ -239,12 +204,6 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
extensions.set(extension.identifier.id.toLowerCase(), extension);
}
// Static extensions defined through `staticExtensions` API
const staticExtensions = await this.staticExtensionsPromise;
for (const extension of staticExtensions) {
extensions.set(extension.identifier.id.toLowerCase(), extension);
}
// Custom builtin extensions defined through `additionalBuiltinExtensions` API
const customBuiltinExtensions = await this.customBuiltinExtensionsPromise;
for (const extension of customBuiltinExtensions) {

17
src/vs/workbench/workbench.web.api.ts
View file

@ -7,7 +7,6 @@ import 'vs/workbench/workbench.web.main';
import { main } from 'vs/workbench/browser/web.main';
import { UriComponents, URI } from 'vs/base/common/uri';
import { IWebSocketFactory, IWebSocket } from 'vs/platform/remote/browser/browserSocketFactory';
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
import { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
import { LogLevel } from 'vs/platform/log/common/log';
import { IUpdateProvider, IUpdate } from 'vs/workbench/services/update/browser/updateService';
@ -24,12 +23,6 @@ interface IResourceUriProvider {
(uri: URI): URI;
}
interface IStaticExtension {
packageJSON: IExtensionManifest;
extensionLocation: UriComponents;
isBuiltin?: boolean;
}
/**
* The identifier of an extension in the format: `PUBLISHER.NAME`.
* For example: `vscode.csharp`
@ -351,12 +344,6 @@ interface IWorkbenchConstructionOptions {
*/
readonly credentialsProvider?: ICredentialsProvider;
/**
* Add static extensions that cannot be uninstalled but only be disabled.
* @deprecated. Use `additionalBuiltinExtensions` instead.
*/
readonly staticExtensions?: readonly IStaticExtension[];
/**
* Additional builtin extensions that cannot be uninstalled but only be disabled.
* It can be one of the following:
@ -679,10 +666,6 @@ export {
// Credentials
ICredentialsProvider,
// Static Extensions
IStaticExtension,
IExtensionManifest,
// Callbacks
IURLCallbackProvider,