Skip to content

Commit 05520d4

Browse files
author
Kartik Raj
committed
Also support Jedi in virtual workspaces
1 parent 30c91b2 commit 05520d4

File tree

5 files changed

+4
-17
lines changed

5 files changed

+4
-17
lines changed

news/1 Enhancements/17519.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Declare limited support when running in virtual workspaces by only supporting Pylance.
1+
Declare limited support when running in virtual workspaces by only supporting language servers.

package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
},
99
"capabilities": {
1010
"untrustedWorkspaces": {
11-
"supported": "limited",
12-
"description": "Only intellisense with Pylance is supported. Cannot execute Python with untrusted files."
11+
"supported": false
1312
},
1413
"virtualWorkspaces": {
15-
"supported": false,
16-
"description": "Python only works with local file paths."
14+
"supported": "limited",
15+
"description": "Limited support on the web."
1716
}
1817
},
1918
"languageServerVersion": "0.5.30",

package.nls.json

-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@
178178
"LanguageService.startingJedi": "Starting Jedi language server.",
179179
"LanguageService.startingNone": "Editor support is inactive since language server is set to None.",
180180
"LanguageService.reloadAfterLanguageServerChange": "Please reload the window switching between language servers.",
181-
"LanguageService.virtualWorkspaceMessage": "Only Pylance is supported when running in virtual workspaces, setting language server to None.",
182181
"AttachProcess.unsupportedOS": "Operating system '{0}' not supported.",
183182
"AttachProcess.attachTitle": "Attach to process",
184183
"AttachProcess.selectProcessPlaceholder": "Select the process to attach to",

src/client/activation/activationService.ts

-7
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,6 @@ export class LanguageServerExtensionActivationService
261261
}
262262

263263
this.sendTelemetryForChosenLanguageServer(serverType).ignoreErrors();
264-
265-
if (this.workspaceService.isVirtualWorkspace && serverType !== LanguageServerType.Node) {
266-
// Only Node is supported when using virtual workspaces.
267-
this.output.appendLine(LanguageService.virtualWorkspaceMessage());
268-
serverType = LanguageServerType.None;
269-
}
270-
271264
await this.logStartup(serverType);
272265
let server = this.serviceContainer.get<ILanguageServerActivator>(ILanguageServerActivator, serverType);
273266
try {

src/client/common/utils/localize.ts

-4
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,6 @@ export namespace LanguageService {
211211
);
212212
export const startingPylance = localize('LanguageService.startingPylance', 'Starting Pylance language server.');
213213
export const startingJedi = localize('LanguageService.startingJedi', 'Starting Jedi language server.');
214-
export const virtualWorkspaceMessage = localize(
215-
'LanguageService.virtualWorkspaceMessage',
216-
'Only Pylance is supported when running in virtual workspaces, setting language server to None.',
217-
);
218214
export const startingNone = localize(
219215
'LanguageService.startingNone',
220216
'Editor support is inactive since language server is set to None.',

0 commit comments

Comments
 (0)