Skip to content

Commit 1593fa4

Browse files
author
Benjamin Pasero
committed
sandbox - lift extension workbench service back to browser
1 parent b9750d0 commit 1593fa4

5 files changed

Lines changed: 3 additions & 50 deletions

File tree

‎src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ import { CopyAction, CutAction, PasteAction } from 'vs/editor/contrib/clipboard/
5252
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
5353
import { MultiCommand } from 'vs/editor/browser/editorExtensions';
5454
import { Webview } from 'vs/workbench/contrib/webview/browser/webview';
55+
import { ExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService';
5556

5657
// Singletons
57-
// registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService); // TODO@sandbox TODO@ben uncomment when 'semver-umd' can be loaded
58+
registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService);
5859
registerSingleton(IExtensionRecommendationsService, ExtensionRecommendationsService);
5960

6061
Registry.as<IOutputChannelRegistry>(OutputExtensions.OutputChannels)

‎src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.ts‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@ import { ExtensionsAutoProfiler } from 'vs/workbench/contrib/extensions/electron
2323
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
2424
import { OpenExtensionsFolderAction } from 'vs/workbench/contrib/extensions/electron-sandbox/extensionsActions';
2525
import { ExtensionsLabel } from 'vs/platform/extensionManagement/common/extensionManagement';
26-
import { ExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService';
27-
import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
2826

2927
// Singletons
30-
registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService); // TODO@sandbox TODO@ben move back into common/extensions.contribution.ts when 'semver-umd' can be loaded
3128
registerSingleton(IExtensionHostProfileService, ExtensionHostProfileService, true);
3229

3330
const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);

‎src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import { isWindows, OS } from 'vs/base/common/platform';
3838
import { IWebviewService, WebviewContentOptions, WebviewElement, WebviewExtensionDescription, WebviewIcons, WebviewOptions, WebviewOverlay } from 'vs/workbench/contrib/webview/browser/webview';
3939
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
4040
import { AbstractTextFileService } from 'vs/workbench/services/textfile/browser/textFileService';
41-
import { EnablementState, ExtensionRecommendationReason, IExtensionManagementServer, IExtensionManagementServerService, IExtensionRecommendation } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
41+
import { ExtensionRecommendationReason, IExtensionManagementServer, IExtensionManagementServerService, IExtensionRecommendation } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
4242
import { LanguageId, TokenizationRegistry } from 'vs/editor/common/modes';
4343
import { IGrammar, ITextMateService } from 'vs/workbench/services/textMate/common/textMateService';
4444
import { ITunnelProvider, ITunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
@@ -58,7 +58,6 @@ import { AsbtractOutputChannelModelService, IOutputChannelModelService } from 'v
5858
import { Color, RGBA } from 'vs/base/common/color';
5959
import { joinPath } from 'vs/base/common/resources';
6060
import { VSBuffer } from 'vs/base/common/buffer';
61-
import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
6261
import { IIntegrityService, IntegrityTestResult } from 'vs/workbench/services/integrity/common/integrity';
6362
import { INativeWorkbenchConfiguration, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
6463
import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
@@ -486,36 +485,6 @@ registerSingleton(IExtensionService, SimpleExtensionService);
486485
//#endregion
487486

488487

489-
//#region Extensions Workbench (TODO@sandbox TODO@ben remove when 'semver-umd' can be loaded)
490-
491-
class SimpleExtensionsWorkbenchService implements IExtensionsWorkbenchService {
492-
493-
declare readonly _serviceBrand: undefined;
494-
495-
onChange = Event.None;
496-
497-
local = [];
498-
installed = [];
499-
outdated = [];
500-
501-
queryGallery(...args: any[]): any { throw new Error('Method not implemented.'); }
502-
install(...args: any[]): any { throw new Error('Method not implemented.'); }
503-
queryLocal(server?: IExtensionManagementServer): Promise<any[]> { throw new Error('Method not implemented.'); }
504-
canInstall(extension: any): boolean { throw new Error('Method not implemented.'); }
505-
uninstall(extension: any): Promise<void> { throw new Error('Method not implemented.'); }
506-
installVersion(extension: any, version: string): Promise<any> { throw new Error('Method not implemented.'); }
507-
reinstall(extension: any): Promise<any> { throw new Error('Method not implemented.'); }
508-
setEnablement(extensions: any | any[], enablementState: EnablementState): Promise<void> { throw new Error('Method not implemented.'); }
509-
open(extension: any, options?: { sideByside?: boolean | undefined; preserveFocus?: boolean | undefined; pinned?: boolean | undefined; }): Promise<any> { throw new Error('Method not implemented.'); }
510-
checkForUpdates(): Promise<void> { throw new Error('Method not implemented.'); }
511-
isExtensionIgnoredToSync(extension: any): boolean { throw new Error('Method not implemented.'); }
512-
toggleExtensionIgnoredToSync(extension: any): Promise<void> { throw new Error('Method not implemented.'); }
513-
}
514-
515-
registerSingleton(IExtensionsWorkbenchService, SimpleExtensionsWorkbenchService);
516-
517-
//#endregion
518-
519488
//#region Telemetry
520489

521490
class SimpleTelemetryService implements ITelemetryService {

‎src/vs/workbench/workbench.web.main.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,4 @@ import 'vs/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.con
131131
// Issues
132132
import 'vs/workbench/contrib/issue/browser/issue.web.contribution';
133133

134-
// Extensions Management (// TODO@sandbox TODO@ben move back into common/extensions.contribution.ts when 'semver-umd' can be loaded)
135-
import 'vs/workbench/contrib/extensions/browser/extensions.web.contribution';
136-
137134
//#endregion

0 commit comments

Comments
 (0)