Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(vscode): rewrite with reactive-vscode #4945

Merged
merged 13 commits into from
Oct 30, 2024
Prev Previous commit
Next Next commit
refactor: rename
KazariEX committed Oct 26, 2024
commit 15fd06e55ca785d6efa72ad2e2d55fc4db407cbc
Original file line number Diff line number Diff line change
@@ -50,6 +50,10 @@ export function activate(
});
}

export function deactivate(): Thenable<any> | undefined {
return client?.stop();
}

async function activateLc(
context: vscode.ExtensionContext,
createLc: CreateLanguageClient
@@ -140,10 +144,6 @@ async function activateLc(
}
}

export function deactivate(): Thenable<any> | undefined {
return client?.stop();
}

async function getInitializationOptions(
context: vscode.ExtensionContext,
hybridMode: boolean
7 changes: 3 additions & 4 deletions extensions/vscode/src/nodeClientMain.ts
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import * as vscode from 'vscode';
import * as lsp from '@volar/vscode/node';
import { defineExtension, executeCommand, extensionContext, onDeactivate } from 'reactive-vscode';
import { enabledHybridMode, enabledTypeScriptPlugin } from './hybridMode';
import { activate as commonActivate, deactivate as commonDeactivate } from './common';
import { activate as activateLanguageClient, deactivate as deactivateLanguageClient } from './languageClient';
import { config } from './config';
import { middleware } from './middleware';

@@ -40,9 +40,8 @@ export const { activate, deactivate } = defineExtension(async () => {
});
}

// 下个小版本就不需要这行了,我晚点发布
const context = extensionContext.value!;
commonActivate(
activateLanguageClient(
context,
(id, name, documentSelector, initOptions, port, outputChannel) => {
class _LanguageClient extends lsp.LanguageClient {
@@ -103,7 +102,7 @@ export const { activate, deactivate } = defineExtension(async () => {
);

onDeactivate(() => {
commonDeactivate();
deactivateLanguageClient();
});

return volarLabs.extensionExports;