@codingame/monaco-vscode-extension-gallery-service-override 5.0.0 → 5.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.0.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.1.0"
   }
 }

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.js

@@ -372,7 +372,11 @@ let ExtensionRecommendationNotificationService = class ExtensionRecommendationNo
             }
             if (resourceExtensions.length) {
                 const extensions = await this.extensionsWorkbenchService.getResourceExtensions(resourceExtensions, true);
-                result.push(...extensions);
+                for (const extension of extensions) {
+                    if (await this.extensionsWorkbenchService.canInstall(extension)) {
+                        result.push(extension);
+                    }
+                }
             }
         }
         return result;

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViews.js

@@ -764,7 +764,11 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
             }
             if (resourceExtensions.length) {
                 const extensions = await this.extensionsWorkbenchService.getResourceExtensions(resourceExtensions, true);
-                result.push(...extensions);
+                for (const extension of extensions) {
+                    if (await this.extensionsWorkbenchService.canInstall(extension)) {
+                        result.push(extension);
+                    }
+                }
             }
         }
         return result;

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.js

@@ -1681,7 +1681,7 @@ let ExtensionsWorkbenchService = class ExtensionsWorkbenchService extends Dispos
             }
             return false;
         }
-        if (extension.resourceExtension) {
+        if (extension.resourceExtension && (await this.extensionManagementService.canInstall(extension.resourceExtension))) {
             return true;
         }
         return false;

package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.js

@@ -35,6 +35,9 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 
 var WorkspaceExtensionsManagementService_1;
 const _moduleId = "vs/workbench/services/extensionManagement/common/extensionManagementService";
+function isResourceExtension(extension) {
+    return extension && !!extension.manifest;
+}
 let ExtensionManagementService = class ExtensionManagementService extends Disposable {
     constructor(extensionManagementServerService, extensionGalleryService, userDataProfileService, configurationService, productService, downloadService, userDataSyncEnablementService, dialogService, workspaceTrustRequestService, extensionManifestPropertiesService, fileService, logService, instantiationService, extensionsScannerService, telemetryService) {
         super();
@@ -291,7 +294,13 @@ let ExtensionManagementService = class ExtensionManagementService extends Dispos
         }
         return Promise.reject('No Servers');
     }
-    async canInstall(gallery) {
+    async canInstall(extension) {
+        if (isResourceExtension(extension)) {
+            return this.canInstallResourceExtension(extension);
+        }
+        return this.canInstallGalleryExtension(extension);
+    }
+    async canInstallGalleryExtension(gallery) {
         if (this.extensionManagementServerService.localExtensionManagementServer
             && (await this.extensionManagementServerService.localExtensionManagementServer.extensionManagementService.canInstall(gallery))) {
             return true;
@@ -312,6 +321,18 @@ let ExtensionManagementService = class ExtensionManagementService extends Dispos
         }
         return false;
     }
+    canInstallResourceExtension(extension) {
+        if (this.extensionManagementServerService.localExtensionManagementServer) {
+            return true;
+        }
+        if (this.extensionManagementServerService.remoteExtensionManagementServer && this.extensionManifestPropertiesService.canExecuteOnWorkspace(extension.manifest)) {
+            return true;
+        }
+        if (this.extensionManagementServerService.webExtensionManagementServer && this.extensionManifestPropertiesService.canExecuteOnWeb(extension.manifest)) {
+            return true;
+        }
+        return false;
+    }
     async updateFromGallery(gallery, extension, installOptions) {
         const server = this.getServer(extension);
         if (!server) {
@@ -395,6 +416,9 @@ let ExtensionManagementService = class ExtensionManagementService extends Dispos
         return this.workspaceExtensionManagementService.getInstalled(includeInvalid);
     }
     async installResourceExtension(extension, installOptions) {
+        if (!this.canInstallResourceExtension(extension)) {
+            throw ( (new Error('This extension cannot be installed in the current workspace.')));
+        }
         if (!installOptions.isWorkspaceScoped) {
             return this.installFromLocation(extension.location);
         }