@codingame/monaco-vscode-api 2.2.0-next.1 → 2.2.0-next.3

package/README.md

@@ -196,6 +196,28 @@ Additionally, several packages that include the VSCode version of some services
   - Support for the timeline view. *Hint*: It only makes sense to enable it when *Views* service is used.
 - **Workbench**: `@codingame/monaco-vscode-workbench-service-override`
   - Allows to render the full workbench layout. Is exclusive with the `views` service. Do not use both services at the same time.
+- **Comments**
+  - Enables comments extension api
+- **Edit-sessions**
+  - Enable cloudchanges
+- **Emmet**
+  - Enables the `triggerExpansionOnTab` command for the emmet default extension
+- **Interactive**
+  - Interactive notbooks
+- **Issue**
+  - Issue reporting
+- **Multi diff editor**
+  - Multi diff editor support (https://code.visualstudio.com/updates/v1_85#_multifile-diff-editor)
+- **Performance**
+  - Performance monitoring
+- **Relauncher**
+  - Detects changes that require a reload (like settings change) and prompt the user for it
+- **Share**
+  - Enables the share extension api
+- **Survey**
+  - Survey/feedback support
+- **Update**
+  - Update detection, release notes...
 
 Usage:
 

package/extensions.d.ts

@@ -107,6 +107,7 @@ interface RegisterExtensionResult {
     id: string;
     dispose(): Promise<void>;
     whenReady(): Promise<void>;
+    isEnabled(): Promise<boolean>;
 }
 interface RegisterRemoteExtensionResult extends RegisterExtensionResult {
 }
@@ -119,9 +120,10 @@ interface RegisterLocalProcessExtensionResult extends RegisterLocalExtensionResu
 }
 declare function registerRemoteExtension(directory: string): Promise<RegisterRemoteExtensionResult>;
 declare function getExtensionManifests(): IExtension[];
+declare function getForcedExtensionHostKind(id: string): ExtensionHostKind | undefined;
 declare function registerExtension(manifest: IExtensionManifest, extHostKind: ExtensionHostKind.LocalProcess, params?: RegisterExtensionParams): RegisterLocalProcessExtensionResult;
 declare function registerExtension(manifest: IExtensionManifest, extHostKind: ExtensionHostKind.LocalWebWorker, params?: RegisterExtensionParams): RegisterLocalExtensionResult;
 declare function registerExtension(manifest: IExtensionManifest, extHostKind: ExtensionHostKind.Remote, params?: RegisterRemoteExtensionParams): RegisterRemoteExtensionResult;
 declare function registerExtension(manifest: IExtensionManifest, extHostKind?: ExtensionHostKind, params?: RegisterExtensionParams): RegisterExtensionResult;
 
-export { type ApiFactory, ExtensionHostKind, IExtensionManifest, getExtensionManifests, registerExtension, registerLocalApiFactory, registerRemoteExtension };
+export { type ApiFactory, ExtensionHostKind, IExtensionManifest, getExtensionManifests, getForcedExtensionHostKind, registerExtension, registerLocalApiFactory, registerRemoteExtension };

package/extensions.js

@@ -9,6 +9,7 @@ import { IWorkbenchEnvironmentService } from './vscode/src/vs/workbench/services
 import { parse } from './vscode/src/vs/base/common/json.js';
 import { IFileService } from './vscode/src/vs/platform/files/common/files.js';
 import { IInstantiationService } from './vscode/src/vs/platform/instantiation/common/instantiation.js';
+import { IWorkbenchExtensionEnablementService } from './vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.js';
 import { CustomSchemas, registerExtensionFile } from '@codingame/monaco-vscode-files-service-override';
 import { getService } from './services.js';
 import { ExtensionManifestTranslator } from './tools/l10n.js';
@@ -49,10 +50,14 @@ async function registerRemoteExtension(directory) {
     const manifest = parse(( content.value.toString()));
     return registerExtension(manifest, 3 , { path: directory });
 }
+const forcedExtensionHostKinds = new Map();
 const extensions = [];
 function getExtensionManifests() {
     return extensions;
 }
+function getForcedExtensionHostKind(id) {
+    return forcedExtensionHostKinds.get(id);
+}
 function registerExtension(manifest, extHostKind, { path = '/', system = false, readmePath, changelogPath } = {}) {
     const id = getExtensionId(manifest.publisher, manifest.name);
     const location = ( URI.from({ scheme: CustomSchemas.extensionFile, authority: id, path }));
@@ -78,10 +83,16 @@ function registerExtension(manifest, extHostKind, { path = '/', system = false,
             readmeUrl: readmePath != null ? URI.joinPath(realLocation, readmePath) : undefined,
             changelogUrl: changelogPath != null ? URI.joinPath(realLocation, changelogPath) : undefined
         };
+        if (extHostKind != null) {
+            forcedExtensionHostKinds.set(id, extHostKind);
+        }
         if (extHostKind !== 3 ) {
             extensions.push(extension);
         }
-        await deltaExtensions({ toAdd: [extension], toRemove: [] });
+        const extensionEnablementService = await getService(IWorkbenchExtensionEnablementService);
+        if (extensionEnablementService.isEnabled(extension)) {
+            await deltaExtensions({ toAdd: [extension], toRemove: [] });
+        }
         return extension;
     })();
     let api = {
@@ -89,12 +100,18 @@ function registerExtension(manifest, extHostKind, { path = '/', system = false,
         async whenReady() {
             await addExtensionPromise;
         },
+        async isEnabled() {
+            const extensionEnablementService = await getService(IWorkbenchExtensionEnablementService);
+            const extension = await addExtensionPromise;
+            return extensionEnablementService.isEnabled(extension);
+        },
         async dispose() {
             const extension = await addExtensionPromise;
             const index = extensions.indexOf(extension);
             if (index >= 0) {
                 extensions.splice(extensions.indexOf(extension), 1);
             }
+            forcedExtensionHostKinds.delete(id);
             await deltaExtensions({ toAdd: [], toRemove: [extension] });
         }
     };
@@ -125,4 +142,4 @@ function registerExtension(manifest, extHostKind, { path = '/', system = false,
     }
     return api;
 }
-export { getExtensionManifests, registerExtension, registerLocalApiFactory, registerRemoteExtension };
+export { getExtensionManifests, getForcedExtensionHostKind, registerExtension, registerLocalApiFactory, registerRemoteExtension };

package/localExtensionHost.js

@@ -40,19 +40,22 @@ class LocalExtHostExtensionService extends ExtHostExtensionService {
             this._extHostConfiguration.getConfigProvider()
         ]);
         const extensionRegistry = { mine: myRegistry, all: this._globalRegistry };
-        const ext = extensionId != null ? myRegistry.getExtensionDescription(extensionId) : undefined;
-        if (ext != null) {
-            let apiImpl = this._extApiImpl.get(ext.identifier);
-            if (apiImpl == null) {
-                apiImpl = this._apiFactory(ext, extensionRegistry, configProvider);
-                this._extApiImpl.set(ext.identifier, apiImpl);
+        if (extensionId == null) {
+            if (this._defaultApiImpl == null) {
+                this._defaultApiImpl = this._apiFactory(nullExtensionDescription, extensionRegistry, configProvider);
             }
-            return apiImpl;
+            return this._defaultApiImpl;
         }
-        if (this._defaultApiImpl == null) {
-            this._defaultApiImpl = this._apiFactory(nullExtensionDescription, extensionRegistry, configProvider);
+        const ext = myRegistry.getExtensionDescription(extensionId);
+        if (ext == null) {
+            throw new Error(`Extension ${extensionId} does not exist or is disabled`);
         }
-        return this._defaultApiImpl;
+        let apiImpl = this._extApiImpl.get(ext.identifier);
+        if (apiImpl == null) {
+            apiImpl = this._apiFactory(ext, extensionRegistry, configProvider);
+            this._extApiImpl.set(ext.identifier, apiImpl);
+        }
+        return apiImpl;
     }
 }
 registerSingleton(IExtHostExtensionService, LocalExtHostExtensionService, 0 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "2.2.0-next.1",
+  "version": "2.2.0-next.3",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -96,12 +96,12 @@
   "dependencies": {
     "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0-next.1",
-    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.1",
-    "@codingame/monaco-vscode-extensions-service-override": "2.2.0-next.1",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.0-next.1",
-    "@codingame/monaco-vscode-layout-service-override": "2.2.0-next.1",
-    "@codingame/monaco-vscode-host-service-override": "2.2.0-next.1",
-    "@codingame/monaco-vscode-base-service-override": "2.2.0-next.1"
+    "@codingame/monaco-vscode-extensions-service-override": "2.2.0-next.3",
+    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.3",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0-next.3",
+    "@codingame/monaco-vscode-environment-service-override": "2.2.0-next.3",
+    "@codingame/monaco-vscode-layout-service-override": "2.2.0-next.3",
+    "@codingame/monaco-vscode-host-service-override": "2.2.0-next.3",
+    "@codingame/monaco-vscode-base-service-override": "2.2.0-next.3"
   }
 }

package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js

@@ -264,7 +264,7 @@ const openFolderButton = `[${openFolder}](command:${(isMacintosh && !isWeb) ? Op
 const openFolderViaWorkspaceButton = `[${openFolder}](command:${OpenFolderViaWorkspaceAction.ID})`;
 const openRecentButton = `[${openRecent}](command:${OpenRecentAction.ID})`;
 const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
-( viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
+viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localizeWithPath(
         'vs/workbench/contrib/files/browser/explorerViewlet',
         { key: 'noWorkspaceHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
@@ -276,8 +276,8 @@ const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
     OpenFolderWorkspaceSupportContext)),
     group: ViewContentGroups.Open,
     order: 1
-}));
-( viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
+});
+viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localizeWithPath(
         'vs/workbench/contrib/files/browser/explorerViewlet',
         { key: 'noFolderHelpWeb', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
@@ -290,8 +290,8 @@ const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
     OpenFolderWorkspaceSupportContext.toNegated()))),
     group: ViewContentGroups.Open,
     order: 1
-}));
-( viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
+});
+viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localizeWithPath(
         'vs/workbench/contrib/files/browser/explorerViewlet',
         { key: 'remoteNoFolderHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
@@ -304,8 +304,8 @@ const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
     IsWebContext.toNegated()))),
     group: ViewContentGroups.Open,
     order: 1
-}));
-( viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
+});
+viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localizeWithPath(
         'vs/workbench/contrib/files/browser/explorerViewlet',
         { key: 'noFolderButEditorsHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
@@ -319,8 +319,8 @@ const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
     ContextKeyExpr.and(( WorkbenchStateContext.notEqualsTo('workspace')), IsWebContext)))))),
     group: ViewContentGroups.Open,
     order: 1
-}));
-( viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
+});
+viewsRegistry.registerViewWelcomeContent(EmptyView.ID, {
     content: ( localizeWithPath(
         'vs/workbench/contrib/files/browser/explorerViewlet',
         { key: 'noFolderHelp', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
@@ -333,5 +333,5 @@ const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
     ContextKeyExpr.and(( WorkbenchStateContext.notEqualsTo('workspace')), IsWebContext)))))),
     group: ViewContentGroups.Open,
     order: 1
-}));
+});
 export { ExplorerViewPaneContainer, ExplorerViewletViewsContribution, VIEW_CONTAINER };

package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js

@@ -41,7 +41,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
         this.tunnelService = tunnelService;
         this.activityService = activityService;
         this.statusbarService = statusbarService;
-        this._register(( ( Registry.as(Extensions.ViewsRegistry)).registerViewWelcomeContent(TUNNEL_VIEW_ID, {
+        this._register(( Registry.as(Extensions.ViewsRegistry)).registerViewWelcomeContent(TUNNEL_VIEW_ID, {
             content: this.environmentService.remoteAuthority ? ( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/remoteExplorer',
                 'remoteNoPorts',
@@ -54,7 +54,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
                 "No forwarded ports. Forward a port to access your locally running services over the internet.\n[Forward a Port]({0})",
                 `command:${ForwardPortAction.INLINE_ID}`
             )),
-        })));
+        }));
         this.enableBadgeAndStatusBar();
         this.enableForwardedPortsView();
     }

package/vscode/src/vs/workbench/contrib/workspace/common/workspace.js

@@ -0,0 +1,16 @@
+import { localizeWithPath } from '../../../../nls.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+const WorkspaceTrustContext = {
+    IsEnabled: ( new RawContextKey('isWorkspaceTrustEnabled', false, ( localizeWithPath(
+     'vs/workbench/contrib/workspace/common/workspace',
+     'workspaceTrustEnabledCtx',
+     "Whether the workspace trust feature is enabled."
+    )))),
+    IsTrusted: ( new RawContextKey('isWorkspaceTrusted', false, ( localizeWithPath(
+     'vs/workbench/contrib/workspace/common/workspace',
+     'workspaceTrustedCtx',
+     "Whether the current workspace has been trusted by the user."
+    ))))
+};
+const MANAGE_TRUST_COMMAND_ID = 'workbench.trust.manage';
+export { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext };