Skip to content

Commit e3778eb

Browse files
committed
Fix regression in API impacting Codespaces
The API wouldn't report lightweight mode correctly when it was forced to start in lightweight due to vscode-java detecting it was being run in Codespaces. This broke the mechanism to switch to standard mode in Codespaces. Fixes #2968 Signed-off-by: David Thompson <[email protected]>
1 parent 53172be commit e3778eb

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/extension.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import * as fs from 'fs';
55
import * as fse from 'fs-extra';
66
import * as os from 'os';
77
import * as path from 'path';
8-
import { CodeActionContext, CodeActionTriggerKind, commands, ConfigurationTarget, Diagnostic, env, EventEmitter, ExtensionContext, extensions, IndentAction, InputBoxOptions, languages, RelativePattern, TextDocument, UIKind, Uri, ViewColumn, window, workspace, WorkspaceConfiguration } from 'vscode';
9-
import { CancellationToken, CodeActionParams, CodeActionRequest, Command, DidChangeConfigurationNotification, ExecuteCommandParams, ExecuteCommandRequest, LanguageClientOptions, RevealOutputChannelOn, State } from 'vscode-languageclient';
8+
import { CodeActionContext, commands, ConfigurationTarget, Diagnostic, env, EventEmitter, ExtensionContext, extensions, IndentAction, InputBoxOptions, languages, RelativePattern, TextDocument, UIKind, Uri, ViewColumn, window, workspace, WorkspaceConfiguration } from 'vscode';
9+
import { CancellationToken, CodeActionParams, CodeActionRequest, Command, DidChangeConfigurationNotification, ExecuteCommandParams, ExecuteCommandRequest, LanguageClientOptions, RevealOutputChannelOn } from 'vscode-languageclient';
1010
import { LanguageClient } from 'vscode-languageclient/node';
1111
import { apiManager } from './apiManager';
1212
import { ClientErrorHandler } from './clientErrorHandler';
@@ -379,8 +379,12 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
379379
const importOnStartup = config.get(importOnStartupSection);
380380
if (importOnStartup === "disabled" ||
381381
env.uiKind === UIKind.Web && env.appName.includes("Visual Studio Code")) {
382+
apiManager.getApiInstance().serverMode = ServerMode.lightWeight;
383+
apiManager.fireDidServerModeChange(ServerMode.lightWeight);
382384
requireStandardServer = false;
383385
} else if (importOnStartup === "interactive" && await workspaceContainsBuildFiles()) {
386+
apiManager.getApiInstance().serverMode = ServerMode.lightWeight;
387+
apiManager.fireDidServerModeChange(ServerMode.lightWeight);
384388
requireStandardServer = await promptUserForStandardServer(config);
385389
} else {
386390
requireStandardServer = true;

0 commit comments

Comments
 (0)