Skip to content

Commit d4644dc

Browse files
author
Kartik Raj
authored
Only activate language servers when running in virtual workspaces (microsoft#17519)
* Only activate Pylance when running in virtual workspaces * News entry * Trigger intelliSense analysis for all schemes of python code * Also support Jedi in virtual workspaces * Rebase with main * Oops * Only support known virtual workspace scheme * Look into all python schemes when in a virtual workspace * Fix some tests * Fix mistake * Do not register Jupyter hooks when using virtual workspaces * Nit * Only activate interpreter and language server component when in a virtual workspace * Make component id a mandatory field in extension activation services * Refactor * Use supported workspace types instead of component id * Fix lint * Code reviwes
1 parent 64118ff commit d4644dc

44 files changed

Lines changed: 169 additions & 73 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎news/1 Enhancements/17519.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Declare limited support when running in virtual workspaces by only supporting language servers.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"supported": false
1212
},
1313
"virtualWorkspaces": {
14-
"supported": false,
15-
"description": "Limited support on the web."
14+
"supported": "limited",
15+
"description": "Only Partial IntelliSense supported."
1616
}
1717
},
1818
"languageServerVersion": "0.5.30",

‎src/client/activation/activationManager.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,16 @@ export class ExtensionActivationManager implements IExtensionActivationManager {
3939
@inject(IActiveResourceService) private readonly activeResourceService: IActiveResourceService,
4040
@inject(IExperimentService) private readonly experiments: IExperimentService,
4141
@inject(IInterpreterPathService) private readonly interpreterPathService: IInterpreterPathService,
42-
) {}
42+
) {
43+
if (this.workspaceService.isVirtualWorkspace) {
44+
this.activationServices = this.activationServices.filter(
45+
(service) => service.supportedWorkspaceTypes.virtualWorkspace,
46+
);
47+
this.singleActivationServices = this.singleActivationServices.filter(
48+
(service) => service.supportedWorkspaceTypes.virtualWorkspace,
49+
);
50+
}
51+
}
4352

4453
public dispose(): void {
4554
while (this.disposables.length > 0) {
@@ -56,8 +65,9 @@ export class ExtensionActivationManager implements IExtensionActivationManager {
5665
await this.initialize();
5766

5867
// Activate all activation services together.
68+
5969
await Promise.all([
60-
Promise.all(this.singleActivationServices.map((item) => item.activate())),
70+
...this.singleActivationServices.map((item) => item.activate()),
6171
this.activateWorkspace(this.activeResourceService.getActiveResource()),
6272
]);
6373
}

‎src/client/activation/activationService.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ export class LanguageServerExtensionActivationService
4949

5050
private activatedServer?: IActivatedServer;
5151

52+
public readonly supportedWorkspaceTypes = { untrustedWorkspace: true, virtualWorkspace: true };
53+
5254
private readonly workspaceService: IWorkspaceService;
5355

5456
private readonly configurationService: IConfigurationService;
@@ -234,7 +236,6 @@ export class LanguageServerExtensionActivationService
234236
}
235237

236238
this.sendTelemetryForChosenLanguageServer(serverType).ignoreErrors();
237-
238239
await this.logStartup(serverType);
239240
let server = this.serviceContainer.get<ILanguageServerActivator>(ILanguageServerActivator, serverType);
240241
try {

‎src/client/activation/common/analysisOptions.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the MIT License.
33
import { Disposable, Event, EventEmitter, WorkspaceFolder } from 'vscode';
44
import { DocumentFilter, LanguageClientOptions, RevealOutputChannelOn } from 'vscode-languageclient/node';
5+
import { IWorkspaceService } from '../../common/application/types';
56

67
import { PYTHON, PYTHON_LANGUAGE } from '../../common/constants';
78
import { IOutputChannel, Resource } from '../../common/types';
@@ -15,7 +16,10 @@ export abstract class LanguageServerAnalysisOptionsBase implements ILanguageServ
1516
protected readonly didChange = new EventEmitter<void>();
1617
private readonly output: IOutputChannel;
1718

18-
protected constructor(lsOutputChannel: ILanguageServerOutputChannel) {
19+
protected constructor(
20+
lsOutputChannel: ILanguageServerOutputChannel,
21+
protected readonly workspace: IWorkspaceService,
22+
) {
1923
this.output = lsOutputChannel.channel;
2024
}
2125

@@ -51,7 +55,7 @@ export abstract class LanguageServerAnalysisOptionsBase implements ILanguageServ
5155
}
5256

5357
protected getDocumentFilters(_workspaceFolder?: WorkspaceFolder): DocumentFilter[] {
54-
return PYTHON;
58+
return this.workspace.isVirtualWorkspace ? [{ language: PYTHON_LANGUAGE }] : PYTHON;
5559
}
5660

5761
protected async getInitializationOptions(): Promise<any> {
@@ -66,8 +70,9 @@ export abstract class LanguageServerAnalysisOptionsWithEnv extends LanguageServe
6670
protected constructor(
6771
private readonly envVarsProvider: IEnvironmentVariablesProvider,
6872
lsOutputChannel: ILanguageServerOutputChannel,
73+
workspace: IWorkspaceService,
6974
) {
70-
super(lsOutputChannel);
75+
super(lsOutputChannel, workspace);
7176
}
7277

7378
public async initialize(_resource: Resource, _interpreter: PythonEnvironment | undefined) {

‎src/client/activation/common/loadLanguageServerExtension.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import { IExtensionSingleActivationService } from '../types';
1313

1414
@injectable()
1515
export class LoadLanguageServerExtension implements IExtensionSingleActivationService {
16+
public readonly supportedWorkspaceTypes = { untrustedWorkspace: true, virtualWorkspace: true };
17+
1618
constructor(
1719
@inject(ICommandManager) private readonly commandManager: ICommandManager,
1820
@inject(IDisposableRegistry) private readonly disposables: IDisposableRegistry,

‎src/client/activation/extensionSurvey.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const WAIT_TIME_TO_SHOW_SURVEY = 1000 * 60 * 60 * 3; // 3 hours
2828

2929
@injectable()
3030
export class ExtensionSurveyPrompt implements IExtensionSingleActivationService {
31+
public readonly supportedWorkspaceTypes = { untrustedWorkspace: false, virtualWorkspace: true };
3132
constructor(
3233
@inject(IApplicationShell) private appShell: IApplicationShell,
3334
@inject(IBrowserService) private browserService: IBrowserService,

‎src/client/activation/jedi/analysisOptions.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ export class JediLanguageServerAnalysisOptions extends LanguageServerAnalysisOpt
2121
@inject(IEnvironmentVariablesProvider) envVarsProvider: IEnvironmentVariablesProvider,
2222
@inject(ILanguageServerOutputChannel) lsOutputChannel: ILanguageServerOutputChannel,
2323
@inject(IConfigurationService) private readonly configurationService: IConfigurationService,
24-
@inject(IWorkspaceService) private readonly workspace: IWorkspaceService,
24+
@inject(IWorkspaceService) workspace: IWorkspaceService,
2525
) {
26-
super(envVarsProvider, lsOutputChannel);
26+
super(envVarsProvider, lsOutputChannel, workspace);
2727
this.resource = undefined;
2828
}
2929

‎src/client/activation/node/analysisOptions.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33
import { inject, injectable } from 'inversify';
4+
import { IWorkspaceService } from '../../common/application/types';
45

56
import { LanguageServerAnalysisOptionsBase } from '../common/analysisOptions';
67
import { ILanguageServerOutputChannel } from '../types';
78

89
@injectable()
910
export class NodeLanguageServerAnalysisOptions extends LanguageServerAnalysisOptionsBase {
10-
constructor(@inject(ILanguageServerOutputChannel) lsOutputChannel: ILanguageServerOutputChannel) {
11-
super(lsOutputChannel);
11+
constructor(
12+
@inject(ILanguageServerOutputChannel) lsOutputChannel: ILanguageServerOutputChannel,
13+
@inject(IWorkspaceService) workspace: IWorkspaceService,
14+
) {
15+
super(lsOutputChannel, workspace);
1216
}
1317

1418
protected async getInitializationOptions() {

‎src/client/activation/types.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export const IExtensionActivationService = Symbol('IExtensionActivationService')
5858
* @interface IExtensionActivationService
5959
*/
6060
export interface IExtensionActivationService {
61+
supportedWorkspaceTypes: { untrustedWorkspace: boolean; virtualWorkspace: boolean };
6162
activate(resource: Resource): Promise<void>;
6263
}
6364

@@ -178,5 +179,6 @@ export const IExtensionSingleActivationService = Symbol('IExtensionSingleActivat
178179
* @interface IExtensionSingleActivationService
179180
*/
180181
export interface IExtensionSingleActivationService {
182+
supportedWorkspaceTypes: { untrustedWorkspace: boolean; virtualWorkspace: boolean };
181183
activate(): Promise<void>;
182184
}

0 commit comments

Comments
 (0)