8000 Use faster method after config change by zardoy · Pull Request #3393 · vuejs/language-tools · GitHub
[go: up one dir, main page]
Skip to content

Use faster method after config change #3393

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 13, 2023
Merged

Use faster method after config change #3393

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e30af8
Use faster method after config change
zardoy Jul 11, 2023
35c19e1
restore lockfile from master :shrug:
zardoy Jul 11, 2023
025865c
remove reload command
johnsoncodehk Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
60 changes: 28 additions & 32 deletions packages/vscode-vue/src/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,31 +137,28 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
activateServerSys(client);
}

async function requestReloadVscode() {
const reload = await vscode.window.showInformationMessage(
'Please reload VSCode to restart language servers.',
'Reload Window'
);
if (reload === undefined) return; // cancel
vscode.commands.executeCommand('workbench.action.reloadWindow');
}
function activateServerMaxOldSpaceSizeChange() {
vscode.workspace.onDidChangeConfiguration((e) => {
if (e.affectsConfiguration('vue.server')) {
requestReloadVscode();
}
else if (e.affectsConfiguration('vue')) {
if (e.affectsConfiguration('vue')) {
vscode.commands.executeCommand('volar.action.restartServer');
}
});
}

async function activateRestartRequest() {
context.subscriptions.push(vscode.commands.registerCommand('volar.action.restartServer', async () => {

await Promise.all(clients.map(client => client.stop()));

semanticClient.clientOptions.initializationOptions = await getInitializationOptions(ServerMode.PartialSemantic, context, semanticClient.clientOptions.initializationOptions);
syntacticClient.clientOptions.initializationOptions = await getInitializationOptions(ServerMode.Syntactic, context, syntacticClient.clientOptions.initializationOptions);

await Promise.all(clients.map(client => client.start()));

activateClientRequests();
}));
}

function activateClientRequests() {
nameCasing.activate(context, semanticClient);
}
Expand Down Expand Up @@ -204,29 +201,28 @@ export function getDocumentSelector(context: vscode.ExtensionContext, serverMode
async function getInitializationOptions(
serverMode: ServerMode,
context: vscode.ExtensionContext,
options: VueServerInitializationOptions = {},
) {
const initializationOptions: VueServerInitializationOptions = {
// volar
configFilePath: config.server.configFilePath,
serverMode,
diagnosticModel: config.server.diagnosticModel === 'pull' ? DiagnosticModel.Pull : DiagnosticModel.Push,
typescript: { tsdk: (await getTsdk(context)).tsdk },
reverseConfigFilePriority: config.server.reverseConfigFilePriority,
maxFileSize: config.server.maxFileSize,
semanticTokensLegend: {
// volar
options.configFilePath = config.server.configFilePath;
options.serverMode = serverMode,
options.diagnosticModel = config.server.diagnosticModel === 'pull' ? DiagnosticModel.Pull : DiagnosticModel.Push,
options.typescript = { tsdk: (await getTsdk(context)).tsdk },
options.reverseConfigFilePriority = config.server.reverseConfigFilePriority,
options.maxFileSize = config.server.maxFileSize,
options.semanticTokensLegend = {
tokenTypes: ['component'],
tokenModifiers: [],
},
fullCompletionList: config.server.fullCompletionList,
};
options.fullCompletionList = config.server.fullCompletionList,
// vue
json: {
options.json = {
customBlockSchemaUrls: config.server.json.customBlockSchemaUrls,
},
additionalExtensions: [
...config.server.additionalExtensions,
...!config.server.petiteVue.supportHtmlFile ? [] : ['html'],
...!config.server.vitePress.supportMdFile ? [] : ['md'],
],
};
return initializationOptions;
};
options.additionalExtensions = [
...config.server.additionalExtensions,
...!config.server.petiteVue.supportHtmlFile ? [] : ['html'],
...!config.server.vitePress.supportMdFile ? [] : ['md'],
];
return options;
}
0