Skip to content

Commit 86dc38e

Browse files
committed
Allow extensions of any kind
This enables vscode-icons among others.
1 parent a2b69c8 commit 86dc38e

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed

ci/vscode.patch

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3088,6 +3088,36 @@ index 4728f3e510..2e38804ac2 100644
30883088
+ readonly extraExtensionPaths: string[]
30893089
+ readonly extraBuiltinExtensionPaths: string[]
30903090
}
3091+
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts
3092+
index cfac383e8a..c535d38296 100644
3093+
--- a/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts
3094+
+++ b/src/vs/workbench/services/extensionManagement/common/extensionEnablementService.ts
3095+
@@ -153,7 +153,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
3096+
}
3097+
}
3098+
}
3099+
- return true;
3100+
+ return false; // NOTE@coder: Don't disable anything by extensionKind.
3101+
}
3102+
return false;
3103+
}
3104+
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
3105+
index 9f8c6ac6f5..34cbaf087c 100644
3106+
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
3107+
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
3108+
@@ -208,11 +208,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
3109+
if (!manifest) {
3110+
return Promise.reject(localize('Manifest is not found', "Installing Extension {0} failed: Manifest is not found.", gallery.displayName || gallery.name));
3111+
}
3112+
- if (!isLanguagePackExtension(manifest) && !canExecuteOnWorkspace(manifest, this.productService, this.configurationService)) {
3113+
- const error = new Error(localize('cannot be installed', "Cannot install '{0}' because this extension has defined that it cannot run on the remote server.", gallery.displayName || gallery.name));
3114+
- error.name = INSTALL_ERROR_NOT_SUPPORTED;
3115+
- return Promise.reject(error);
3116+
- }
3117+
+ // NOTE@coder: Allow extensions of any kind.
3118+
return this.extensionManagementServerService.remoteExtensionManagementServer.extensionManagementService.installFromGallery(gallery);
3119+
}
3120+
return Promise.reject('No Servers to Install');
30913121
diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts
30923122
index 5b6a15e820..0f93c896e2 100644
30933123
--- a/src/vs/workbench/services/extensions/browser/extensionService.ts

0 commit comments

Comments
 (0)