volar-service-typescript 0.0.33 → 0.0.35

package/index.d.ts

@@ -1,5 +1,5 @@
 export { Provide } from './lib/plugins/semantic';
 import { create as createSemanticServicePlugin } from './lib/plugins/semantic';
 import { create as createSyntacticServicePlugin } from './lib/plugins/syntactic';
-export declare function create(ts: typeof import('typescript'), options?: Parameters<typeof createSemanticServicePlugin>[1] & Parameters<typeof createSyntacticServicePlugin>[1]): import("@volar/language-service").ServicePlugin[];
+export declare function create(ts: typeof import('typescript'), options?: Parameters<typeof createSemanticServicePlugin>[1] & Parameters<typeof createSyntacticServicePlugin>[1]): import("@volar/language-service").LanguageServicePlugin<any>[];
 //# sourceMappingURL=index.d.ts.map

package/lib/plugins/directiveComment.d.ts

@@ -1,3 +1,3 @@
 import type * as vscode from '@volar/language-service';
-export declare function create(): vscode.ServicePlugin;
+export declare function create(): vscode.LanguageServicePlugin;
 //# sourceMappingURL=directiveComment.d.ts.map

package/lib/plugins/directiveComment.js

@@ -26,8 +26,9 @@ function create() {
         create() {
             return {
                 provideCompletionItems(document, position) {
-                    if (!(0, shared_1.isTsDocument)(document))
+                    if (!(0, shared_1.isTsDocument)(document)) {
                         return;
+                    }
                     const prefix = document.getText({
                         start: { line: position.line, character: 0 },
                         end: position,

package/lib/plugins/docCommentTemplate.d.ts

@@ -1,3 +1,3 @@
 import type * as vscode from '@volar/language-service';
-export declare function create(ts: typeof import('typescript')): vscode.ServicePlugin;
+export declare function create(ts: typeof import('typescript')): vscode.LanguageServicePlugin;
 //# sourceMappingURL=docCommentTemplate.d.ts.map

package/lib/plugins/docCommentTemplate.js

@@ -14,15 +14,18 @@ function create(ts) {
         create() {
             return {
                 provideCompletionItems(document, position) {
-                    if (!(0, shared_1.isTsDocument)(document))
+                    if (!(0, shared_1.isTsDocument)(document)) {
                         return;
-                    if (!isPotentiallyValidDocCompletionPosition(document, position))
+                    }
+                    if (!isPotentiallyValidDocCompletionPosition(document, position)) {
                         return;
+                    }
                     const { languageService, fileName } = (0, syntacticLanguageService_1.getLanguageService)(ts, document);
                     const offset = document.offsetAt(position);
                     const docCommentTemplate = languageService.getDocCommentTemplateAtPosition(fileName, offset);
-                    if (!docCommentTemplate)
+                    if (!docCommentTemplate) {
                         return;
+                    }
                     let insertText;
                     // Workaround for #43619
                     // docCommentTemplate previously returned undefined for empty jsdoc templates.
@@ -76,7 +79,7 @@ function templateToSnippet(template) {
     let snippetIndex = 1;
     template = template.replace(/\$/g, '\\$');
     template = template.replace(/^[ \t]*(?=(\/|[ ]\*))/gm, '');
-    template = template.replace(/^(\/\*\*\s*\*[ ]*)$/m, (x) => x + `\$0`);
+    template = template.replace(/^(\/\*\*\s*\*[ ]*)$/m, x => x + `\$0`);
     template = template.replace(/\* @param([ ]\{\S+\})?\s+(\S+)[ \t]*$/gm, (_param, type, post) => {
         let out = '* @param ';
         if (type === ' {any}' || type === ' {*}') {

package/lib/plugins/semantic.d.ts

@@ -1,4 +1,4 @@
-import type { Result, ServiceContext, ServicePlugin } from '@volar/language-service';
+import type { ProviderResult, ServiceContext, LanguageServicePlugin } from '@volar/language-service';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 export interface Provide {
@@ -17,7 +17,7 @@ export interface CompletionItemData {
     };
 }
 export declare function create(ts: typeof import('typescript'), { isValidationEnabled, isSuggestionsEnabled, }?: {
-    isValidationEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
-    isSuggestionsEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
-}): ServicePlugin;
+    isValidationEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
+    isSuggestionsEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
+}): LanguageServicePlugin;
 //# sourceMappingURL=semantic.d.ts.map

package/lib/plugins/semantic.js

@@ -35,7 +35,8 @@ function create(ts, { isValidationEnabled = async (document, context) => {
             if (!context.language.typescript) {
                 return {};
             }
-            const { sys, languageServiceHost } = context.language.typescript;
+            const { projectHost, languageServiceHost } = context.language.typescript;
+            const sys = projectHost;
             const created = tsWithImportCache.createLanguageService(ts, sys, languageServiceHost, proxiedHost => ts.createLanguageService(proxiedHost, getDocumentRegistry(ts, sys.useCaseSensitiveFileNames, languageServiceHost.getCurrentDirectory())));
             const { languageService } = created;
             if (created.setPreferences && context.env.getConfiguration) {
@@ -54,7 +55,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     ? (id) => id
                     : (id) => id.toLowerCase();
                 updateSourceScriptFileNames();
-                context.env.onDidChangeWatchedFiles?.((params) => {
+                context.env.onDidChangeWatchedFiles?.(params => {
                     const someFileCreateOrDeiete = params.changes.some(change => change.type !== 2);
                     if (someFileCreateOrDeiete) {
                         updateSourceScriptFileNames();
@@ -70,14 +71,14 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     sourceScriptNames.clear();
                     for (const fileName of languageServiceHost.getScriptFileNames()) {
                         const uri = context.env.typescript.fileNameToUri(fileName);
-                        const sourceFile = context.language.files.get(uri);
-                        if (sourceFile?.generated) {
-                            const tsCode = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
+                        const sourceScript = context.language.scripts.get(uri);
+                        if (sourceScript?.generated) {
+                            const tsCode = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
                             if (tsCode) {
                                 sourceScriptNames.add(normalizeFileName(fileName));
                             }
                         }
-                        else if (sourceFile) {
+                        else if (sourceScript) {
                             sourceScriptNames.add(normalizeFileName(fileName));
                         }
                     }
@@ -96,29 +97,34 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                 },
                 fileNameToUri(fileName) {
                     const uri = context.env.typescript.fileNameToUri(fileName);
-                    const sourceFile = context.language.files.get(uri);
-                    const extraScript = context.language.typescript.getExtraScript(fileName);
-                    let virtualCode = extraScript?.code;
-                    if (!virtualCode && sourceFile?.generated?.languagePlugin.typescript) {
-                        const mainScript = sourceFile.generated.languagePlugin.typescript.getScript(sourceFile.generated.code);
-                        if (mainScript) {
-                            virtualCode = mainScript.code;
+                    const sourceScript = context.language.scripts.get(uri);
+                    const extraServiceScript = context.language.typescript.getExtraServiceScript(fileName);
+                    let virtualCode = extraServiceScript?.code;
+                    if (!virtualCode && sourceScript?.generated?.languagePlugin.typescript) {
+                        const serviceScript = sourceScript.generated.languagePlugin.typescript.getServiceScript(sourceScript.generated.root);
+                        if (serviceScript) {
+                            virtualCode = serviceScript.code;
                         }
                     }
-                    if (virtualCode) {
-                        const sourceFile = context.language.files.getByVirtualCode(virtualCode);
-                        return context.documents.getVirtualCodeUri(sourceFile.id, virtualCode.id);
+                    if (sourceScript && virtualCode) {
+                        return context.encodeEmbeddedDocumentUri(sourceScript.id, virtualCode.id);
                     }
                     return uri;
                 },
                 getTextDocument(uri) {
-                    const virtualCode = context.documents.getVirtualCodeByUri(uri)[0];
-                    if (virtualCode) {
-                        return context.documents.get(uri, virtualCode.languageId, virtualCode.snapshot);
+                    const decoded = context.decodeEmbeddedDocumentUri(uri);
+                    if (decoded) {
+                        const sourceScript = context.language.scripts.get(decoded[0]);
+                        const virtualCode = sourceScript?.generated?.embeddedCodes.get(decoded[1]);
+                        if (virtualCode) {
+                            return context.documents.get(uri, virtualCode.languageId, virtualCode.snapshot);
+                        }
                     }
-                    const sourceFile = context.language.files.get(uri);
-                    if (sourceFile) {
-                        return context.documents.get(uri, sourceFile.languageId, sourceFile.snapshot);
+                    else {
+                        const sourceFile = context.language.scripts.get(uri);
+                        if (sourceFile) {
+                            return context.documents.get(uri, sourceFile.languageId, sourceFile.snapshot);
+                        }
                     }
                     throw new Error(`getTextDocument: uri not found: ${uri}`);
                 },
@@ -137,10 +143,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     languageService.dispose();
                 },
                 async provideCompletionItems(document, position, completeContext, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
-                    if (!await isSuggestionsEnabled(document, context))
+                    }
+                    if (!await isSuggestionsEnabled(document, context)) {
                         return;
+                    }
                     return await worker(token, async () => {
                         const preferences = await (0, getUserPreferences_1.getUserPreferences)(ctx, document);
                         const fileName = ctx.uriToFileName(document.uri);
@@ -244,8 +252,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     }) ?? item;
                 },
                 provideRenameRange(document, position, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, () => {
                         const fileName = ctx.uriToFileName(document.uri);
                         const offset = document.offsetAt(position);
@@ -260,8 +269,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideRenameEdits(document, position, newName, token) {
-                    if (!isSemanticDocument(document, true))
+                    if (!isSemanticDocument(document, true)) {
                         return;
+                    }
                     return worker(token, async () => {
                         const fileName = ctx.uriToFileName(document.uri);
                         const offset = document.offsetAt(position);
@@ -307,8 +317,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideCodeActions(document, range, context, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, () => {
                         return getCodeActions(document, range, context);
                     });
@@ -319,8 +330,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     }) ?? codeAction;
                 },
                 provideInlayHints(document, range, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, async () => {
                         const preferences = await (0, getUserPreferences_1.getUserPreferences)(ctx, document);
                         const fileName = ctx.uriToFileName(document.uri);
@@ -336,8 +348,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideCallHierarchyItems(document, position, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, () => {
                         const fileName = ctx.uriToFileName(document.uri);
                         const offset = document.offsetAt(position);
@@ -376,8 +389,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     }) ?? [];
                 },
                 provideDefinition(document, position, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, () => {
                         const fileName = ctx.uriToFileName(document.uri);
                         const offset = document.offsetAt(position);
@@ -389,8 +403,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideTypeDefinition(document, position, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, () => {
                         const fileName = ctx.uriToFileName(document.uri);
                         const offset = document.offsetAt(position);
@@ -408,8 +423,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     return provideDiagnosticsWorker(document, token, 'semantic');
                 },
                 provideHover(document, position, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, () => {
                         const fileName = ctx.uriToFileName(document.uri);
                         const offset = document.offsetAt(position);
@@ -421,8 +437,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideImplementation(document, position, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, () => {
                         const fileName = ctx.uriToFileName(document.uri);
                         const offset = document.offsetAt(position);
@@ -434,8 +451,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideReferences(document, position, referenceContext, token) {
-                    if (!isSemanticDocument(document, true))
+                    if (!isSemanticDocument(document, true)) {
                         return;
+                    }
                     return worker(token, () => {
                         const fileName = ctx.uriToFileName(document.uri);
                         const offset = document.offsetAt(position);
@@ -462,8 +480,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideFileReferences(document, token) {
-                    if (!isSemanticDocument(document, true))
+                    if (!isSemanticDocument(document, true)) {
                         return;
+                    }
                     return worker(token, () => {
                         const fileName = ctx.uriToFileName(document.uri);
                         const entries = (0, shared_1.safeCall)(() => ctx.languageService.getFileReferences(fileName));
@@ -474,8 +493,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideDocumentHighlights(document, position, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, () => {
                         const fileName = ctx.uriToFileName(document.uri);
                         const offset = document.offsetAt(position);
@@ -493,8 +513,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideDocumentSemanticTokens(document, range, legend, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, () => {
                         return getDocumentSemanticTokens(document, range, legend);
                     });
@@ -528,8 +549,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideSelectionRanges(document, positions, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, () => {
                         return positions
                             .map(position => {
@@ -545,8 +567,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideSignatureHelp(document, position, context, token) {
-                    if (!isSemanticDocument(document))
+                    if (!isSemanticDocument(document)) {
                         return;
+                    }
                     return worker(token, () => {
                         const options = {};
                         if (context?.triggerKind === 1) {
@@ -602,10 +625,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                 },
             };
             async function provideDiagnosticsWorker(document, token, mode) {
-                if (!isSemanticDocument(document))
+                if (!isSemanticDocument(document)) {
                     return;
-                if (!await isValidationEnabled(document, context))
+                }
+                if (!await isValidationEnabled(document, context)) {
                     return;
+                }
                 return await worker(token, () => {
                     const fileName = ctx.uriToFileName(document.uri);
                     const program = ctx.languageService.getProgram();
@@ -653,7 +678,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
             async function worker(token, fn) {
                 let result;
                 let oldSysVersion;
-                let newSysVersion = await sys.sync?.();
+                let newSysVersion = await projectHost.syncSystem?.();
                 do {
                     oldSysVersion = newSysVersion;
                     try {
@@ -663,22 +688,24 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         console.warn(err);
                         break;
                     }
-                    newSysVersion = await sys.sync?.();
+                    newSysVersion = await projectHost.syncSystem?.();
                 } while (newSysVersion !== oldSysVersion && !token.isCancellationRequested);
                 return result;
             }
             function getVirtualScriptByUri(uri) {
-                const [virtualCode, sourceFile] = context.documents.getVirtualCodeByUri(uri);
-                if (virtualCode && sourceFile.generated?.languagePlugin.typescript) {
-                    const { getScript, getExtraScripts } = sourceFile.generated?.languagePlugin.typescript;
-                    const sourceFileName = context.env.typescript.uriToFileName(sourceFile.id);
-                    if (getScript(sourceFile.generated.code)?.code === virtualCode) {
+                const decoded = context.decodeEmbeddedDocumentUri(uri);
+                const sourceScript = decoded && context.language.scripts.get(decoded[0]);
+                const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
+                if (virtualCode && sourceScript?.generated?.languagePlugin.typescript) {
+                    const { getServiceScript, getExtraServiceScripts } = sourceScript.generated?.languagePlugin.typescript;
+                    const sourceFileName = context.env.typescript.uriToFileName(sourceScript.id);
+                    if (getServiceScript(sourceScript.generated.root)?.code === virtualCode) {
                         return {
                             fileName: sourceFileName,
                             code: virtualCode,
                         };
                     }
-                    for (const extraScript of getExtraScripts?.(sourceFileName, sourceFile.generated.code) ?? []) {
+                    for (const extraScript of getExtraServiceScripts?.(sourceFileName, sourceScript.generated.root) ?? []) {
                         if (extraScript.code === virtualCode) {
                             return extraScript;
                         }

package/lib/plugins/syntactic.d.ts

@@ -1,7 +1,7 @@
-import type { Result, ServiceContext, ServicePlugin } from '@volar/language-service';
+import type { ProviderResult, ServiceContext, LanguageServicePlugin } from '@volar/language-service';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 export declare function create(ts: typeof import('typescript'), { isFormattingEnabled, isAutoClosingTagsEnabled, }?: {
-    isFormattingEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
-    isAutoClosingTagsEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
-}): ServicePlugin;
+    isFormattingEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
+    isAutoClosingTagsEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
+}): LanguageServicePlugin;
 //# sourceMappingURL=syntactic.d.ts.map

package/lib/plugins/syntactic.js

@@ -28,8 +28,9 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                     }
                 },
                 provideFoldingRanges(document) {
-                    if (!(0, shared_1.isTsDocument)(document))
+                    if (!(0, shared_1.isTsDocument)(document)) {
                         return;
+                    }
                     const { languageService, fileName } = (0, syntacticLanguageService_1.getLanguageService)(ts, document);
                     const outliningSpans = (0, shared_1.safeCall)(() => languageService.getOutliningSpans(fileName));
                     if (!outliningSpans) {
@@ -38,12 +39,14 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                     return outliningSpans.map(span => (0, lspConverters_1.convertOutliningSpan)(span, document));
                 },
                 provideDocumentSymbols(document) {
-                    if (!(0, shared_1.isTsDocument)(document))
+                    if (!(0, shared_1.isTsDocument)(document)) {
                         return;
+                    }
                     const { languageService, fileName } = (0, syntacticLanguageService_1.getLanguageService)(ts, document);
                     const barItems = (0, shared_1.safeCall)(() => languageService.getNavigationTree(fileName));
-                    if (!barItems)
+                    if (!barItems) {
                         return [];
+                    }
                     // The root represents the file. Ignore this when showing in the UI
                     return barItems.childItems
                         ?.map(item => (0, lspConverters_1.convertNavTree)(item, document))
@@ -51,10 +54,12 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                         ?? [];
                 },
                 async provideDocumentFormattingEdits(document, range, options, codeOptions) {
-                    if (!(0, shared_1.isTsDocument)(document))
+                    if (!(0, shared_1.isTsDocument)(document)) {
                         return;
-                    if (!await isFormattingEnabled(document, context))
+                    }
+                    if (!await isFormattingEnabled(document, context)) {
                         return;
+                    }
                     const tsOptions = await (0, getFormatCodeSettings_1.getFormatCodeSettings)(context, document, options);
                     if (codeOptions) {
                         tsOptions.baseIndentSize = codeOptions.initialIndentLevel * options.tabSize;
@@ -69,10 +74,12 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                     return scriptEdits.map(edit => (0, lspConverters_1.convertTextChange)(edit, document));
                 },
                 async provideOnTypeFormattingEdits(document, position, key, options, codeOptions) {
-                    if (!(0, shared_1.isTsDocument)(document))
+                    if (!(0, shared_1.isTsDocument)(document)) {
                         return;
-                    if (!await isFormattingEnabled(document, context))
+                    }
+                    if (!await isFormattingEnabled(document, context)) {
                         return;
+                    }
                     const tsOptions = await (0, getFormatCodeSettings_1.getFormatCodeSettings)(context, document, options);
                     if (codeOptions) {
                         tsOptions.baseIndentSize = codeOptions.initialIndentLevel * options.tabSize;

package/lib/semanticFeatures/codeAction.js

@@ -162,8 +162,9 @@ function register(ctx) {
                                 matchNums++;
                             }
                         }
-                        if (matchNums === a.length)
+                        if (matchNums === a.length) {
                             return only;
+                        }
                     }
                 }
             }

package/lib/semanticFeatures/semanticTokens.js

@@ -7,11 +7,13 @@ function register(ts, ctx) {
         const fileName = ctx.uriToFileName(document.uri);
         const start = range ? document.offsetAt(range.start) : 0;
         const length = range ? (document.offsetAt(range.end) - start) : document.getText().length;
-        if (ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested())
+        if (ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested()) {
             return;
+        }
         const response = (0, shared_1.safeCall)(() => ctx.languageService.getEncodedSemanticClassifications(fileName, { start, length }, ts.SemanticClassificationFormat.TwentyTwenty));
-        if (!response)
+        if (!response) {
             return;
+        }
         let tokenModifiersTable = [];
         tokenModifiersTable[2 /* TokenModifier.async */] = 1 << legend.tokenModifiers.indexOf('async');
         tokenModifiersTable[0 /* TokenModifier.declaration */] = 1 << legend.tokenModifiers.indexOf('declaration');

package/lib/utils/lspConverters.js

@@ -10,10 +10,12 @@ const typeConverters = require("../utils/typeConverters");
 const semver = require("semver");
 // diagnostics
 function convertDiagnostic(diag, document, fileNameToUri, getTextDocument) {
-    if (diag.start === undefined)
+    if (diag.start === undefined) {
         return;
-    if (diag.length === undefined)
+    }
+    if (diag.length === undefined) {
         return;
+    }
     const diagnostic = {
         range: {
             start: document.positionAt(diag.start),
@@ -30,29 +32,34 @@ function convertDiagnostic(diag, document, fileNameToUri, getTextDocument) {
             .filter((v) => !!v);
     }
     if (diag.reportsUnnecessary) {
-        if (diagnostic.tags === undefined)
+        if (diagnostic.tags === undefined) {
             diagnostic.tags = [];
+        }
         diagnostic.tags.push(1);
     }
     if (diag.reportsDeprecated) {
-        if (diagnostic.tags === undefined)
+        if (diagnostic.tags === undefined) {
             diagnostic.tags = [];
+        }
         diagnostic.tags.push(2);
     }
     return diagnostic;
 }
 exports.convertDiagnostic = convertDiagnostic;
 function convertDiagnosticRelatedInformation(diag, fileNameToUri, getTextDocument) {
-    if (diag.start === undefined)
+    if (diag.start === undefined) {
         return;
-    if (diag.length === undefined)
+    }
+    if (diag.length === undefined) {
         return;
+    }
     let document;
     if (diag.file) {
         document = getTextDocument(fileNameToUri(diag.file.fileName));
     }
-    if (!document)
+    if (!document) {
         return;
+    }
     const diagnostic = {
         location: {
             uri: document.uri,
@@ -215,8 +222,9 @@ function convertCompletionInfo(ts, completionContext, document, position, create
     function getDotAccessorContext(document) {
         let dotAccessorContext;
         if (gte_300) {
-            if (!completionContext)
+            if (!completionContext) {
                 return;
+            }
             const isMemberCompletion = completionContext.isMemberCompletion;
             if (isMemberCompletion) {
                 const dotMatch = line.slice(0, position.character).match(/\??\.\s*$/) || undefined;
@@ -529,10 +537,12 @@ function convertRenameLocations(newText, locations, fileNameToUri, getTextDocume
             workspaceEdit.changes[uri] = [];
         }
         let _newText = newText;
-        if (location.prefixText)
+        if (location.prefixText) {
             _newText = location.prefixText + _newText;
-        if (location.suffixText)
+        }
+        if (location.suffixText) {
             _newText = _newText + location.suffixText;
+        }
         workspaceEdit.changes[uri].push({
             newText: _newText,
             range: convertTextSpan(location.textSpan, doc),

package/lib/utils/snippetForFunctionCall.js

@@ -35,53 +35,55 @@ function getParameterListParts(displayParts) {
     let hasOptionalParameters = false;
     let parenCount = 0;
     let braceCount = 0;
-    outer: for (let i = 0; i < displayParts.length; ++i) {
-        const part = displayParts[i];
-        switch (part.kind) {
-            case PConst.DisplayPartKind.methodName:
-            case PConst.DisplayPartKind.functionName:
-            case PConst.DisplayPartKind.text:
-            case PConst.DisplayPartKind.propertyName:
-                if (parenCount === 0 && braceCount === 0) {
-                    isInMethod = true;
-                }
-                break;
-            case PConst.DisplayPartKind.parameterName:
-                if (parenCount === 1 && braceCount === 0 && isInMethod) {
-                    // Only take top level paren names
-                    const next = displayParts[i + 1];
-                    // Skip optional parameters
-                    const nameIsFollowedByOptionalIndicator = next && next.text === '?';
-                    // Skip this parameter
-                    const nameIsThis = part.text === 'this';
-                    if (!nameIsFollowedByOptionalIndicator && !nameIsThis) {
-                        parts.push(part);
+    outer: {
+        for (let i = 0; i < displayParts.length; ++i) {
+            const part = displayParts[i];
+            switch (part.kind) {
+                case PConst.DisplayPartKind.methodName:
+                case PConst.DisplayPartKind.functionName:
+                case PConst.DisplayPartKind.text:
+                case PConst.DisplayPartKind.propertyName:
+                    if (parenCount === 0 && braceCount === 0) {
+                        isInMethod = true;
                     }
-                    hasOptionalParameters = hasOptionalParameters || nameIsFollowedByOptionalIndicator;
-                }
-                break;
-            case PConst.DisplayPartKind.punctuation:
-                if (part.text === '(') {
-                    ++parenCount;
-                }
-                else if (part.text === ')') {
-                    --parenCount;
-                    if (parenCount <= 0 && isInMethod) {
+                    break;
+                case PConst.DisplayPartKind.parameterName:
+                    if (parenCount === 1 && braceCount === 0 && isInMethod) {
+                        // Only take top level paren names
+                        const next = displayParts[i + 1];
+                        // Skip optional parameters
+                        const nameIsFollowedByOptionalIndicator = next && next.text === '?';
+                        // Skip this parameter
+                        const nameIsThis = part.text === 'this';
+                        if (!nameIsFollowedByOptionalIndicator && !nameIsThis) {
+                            parts.push(part);
+                        }
+                        hasOptionalParameters = hasOptionalParameters || nameIsFollowedByOptionalIndicator;
+                    }
+                    break;
+                case PConst.DisplayPartKind.punctuation:
+                    if (part.text === '(') {
+                        ++parenCount;
+                    }
+                    else if (part.text === ')') {
+                        --parenCount;
+                        if (parenCount <= 0 && isInMethod) {
+                            break outer;
+                        }
+                    }
+                    else if (part.text === '...' && parenCount === 1) {
+                        // Found rest parmeter. Do not fill in any further arguments
+                        hasOptionalParameters = true;
                         break outer;
                     }
-                }
-                else if (part.text === '...' && parenCount === 1) {
-                    // Found rest parmeter. Do not fill in any further arguments
-                    hasOptionalParameters = true;
-                    break outer;
-                }
-                else if (part.text === '{') {
-                    ++braceCount;
-                }
-                else if (part.text === '}') {
-                    --braceCount;
-                }
-                break;
+                    else if (part.text === '{') {
+                        ++braceCount;
+                    }
+                    else if (part.text === '}') {
+                        --braceCount;
+                    }
+                    break;
+            }
         }
     }
     return { hasOptionalParameters, parts };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.33",
+	"version": "0.0.35",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -35,12 +35,12 @@
 		"vscode-nls": "^5.2.0"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.1.0"
+		"@volar/language-service": "~2.2.0-alpha.0"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "d04c9ea5f5b58c5e0b6db9a65a8aba1a5a2ed9ef"
+	"gitHead": "cbd8ef0ada6eae9656286535599c9b289134d1e3"
 }