Skip to content

Commit 43fc575

Browse files
committed
fix: start language server with addon manager
1 parent c3b6616 commit 43fc575

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

client/src/addon_manager/registration.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import RelativeTime from "dayjs/plugin/relativeTime";
88
import { git, setupGit } from "./services/git.service";
99
import { GIT_DOWNLOAD_URL } from "./config";
1010
import { NotificationLevels } from "./types/webvue";
11+
import * as languageServer from "../languageserver";
1112

1213
dayjs.extend(RelativeTime);
1314

@@ -41,6 +42,13 @@ export async function activate(context: vscode.ExtensionContext) {
4142
logger.add(fileLogger);
4243
await fileLogger.logStart();
4344
}
45+
// Start language server if it is not already
46+
// We depend on it to apply config modifications
47+
if (!languageServer.defaultClient) {
48+
logger.debug("Starting language server");
49+
await languageServer.createClient(context);
50+
logger.debug("Language server has started");
51+
}
4452

4553
// Check if git is installed
4654
if (!(await git.version()).installed) {

client/src/languageserver.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ function registerCustomCommands(context: ExtensionContext) {
7878
}));
7979
}
8080

81+
/** Creates a new {@link LuaClient} and starts it. */
82+
export const createClient = (context: ExtensionContext) => {
83+
defaultClient = new LuaClient(context, [{ language: 'lua' }])
84+
defaultClient.start();
85+
}
86+
8187
class LuaClient {
8288

8389
public client: LanguageClient;
@@ -248,10 +254,7 @@ export function activate(context: ExtensionContext) {
248254

249255
// Untitled files go to a default client.
250256
if (!defaultClient) {
251-
defaultClient = new LuaClient(context, [
252-
{ language: 'lua' }
253-
]);
254-
defaultClient.start();
257+
createClient(context);
255258
return;
256259
}
257260
}

0 commit comments

Comments
 (0)