Skip to content

Commit 7c27e43

Browse files
author
Kartik Raj
committed
Also support Jedi in virtual workspaces
1 parent 2d6ea0e commit 7c27e43

File tree

5 files changed

+3
-16
lines changed

5 files changed

+3
-16
lines changed

news/1 Enhancements/17519.md

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
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,
14+
"supported": "limited",
1615
"description": "Limited support on the web."
1716
}
1817
},

package.nls.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@
180180
"LanguageService.startingJedi": "Starting Jedi language server.",
181181
"LanguageService.startingNone": "Editor support is inactive since language server is set to None.",
182182
"LanguageService.reloadAfterLanguageServerChange": "Please reload the window switching between language servers.",
183-
"LanguageService.virtualWorkspaceMessage": "Only Pylance is supported when running in virtual workspaces, setting language server to None.",
184183
"AttachProcess.unsupportedOS": "Operating system '{0}' not supported.",
185184
"AttachProcess.attachTitle": "Attach to process",
186185
"AttachProcess.selectProcessPlaceholder": "Select the process to attach to",

src/client/activation/activationService.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,6 @@ export class LanguageServerExtensionActivationService
238238
}
239239

240240
this.sendTelemetryForChosenLanguageServer(serverType).ignoreErrors();
241-
242-
if (this.workspaceService.isVirtualWorkspace && serverType !== LanguageServerType.Node) {
243-
// Only Node is supported when using virtual workspaces.
244-
this.output.appendLine(LanguageService.virtualWorkspaceMessage());
245-
serverType = LanguageServerType.None;
246-
}
247-
248241
await this.logStartup(serverType);
249242
let server = this.serviceContainer.get<ILanguageServerActivator>(ILanguageServerActivator, serverType);
250243
try {

src/client/common/utils/localize.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,6 @@ export namespace TensorBoard {
206206
export namespace LanguageService {
207207
export const startingPylance = localize('LanguageService.startingPylance', 'Starting Pylance language server.');
208208
export const startingJedi = localize('LanguageService.startingJedi', 'Starting Jedi language server.');
209-
export const virtualWorkspaceMessage = localize(
210-
'LanguageService.virtualWorkspaceMessage',
211-
'Only Pylance is supported when running in virtual workspaces, setting language server to None.',
212-
);
213209
export const startingNone = localize(
214210
'LanguageService.startingNone',
215211
'Editor support is inactive since language server is set to None.',

0 commit comments

Comments
 (0)