volar-service-typescript 0.0.64 → 0.0.66

package/lib/configs/getFormatCodeSettings.js

@@ -15,12 +15,15 @@ async function getFormatCodeSettings(ctx, document, options) {
         insertSpaceAfterSemicolonInForStatements: config.insertSpaceAfterSemicolonInForStatements ?? true,
         insertSpaceBeforeAndAfterBinaryOperators: config.insertSpaceBeforeAndAfterBinaryOperators ?? true,
         insertSpaceAfterKeywordsInControlFlowStatements: config.insertSpaceAfterKeywordsInControlFlowStatements ?? true,
-        insertSpaceAfterFunctionKeywordForAnonymousFunctions: config.insertSpaceAfterFunctionKeywordForAnonymousFunctions ?? true,
+        insertSpaceAfterFunctionKeywordForAnonymousFunctions: config.insertSpaceAfterFunctionKeywordForAnonymousFunctions
+            ?? true,
         insertSpaceBeforeFunctionParenthesis: config.insertSpaceBeforeFunctionParenthesis ?? false,
         insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: config.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis ?? false,
         insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets ?? false,
-        insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces ?? true,
-        insertSpaceAfterOpeningAndBeforeClosingEmptyBraces: config.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces ?? true,
+        insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces
+            ?? true,
+        insertSpaceAfterOpeningAndBeforeClosingEmptyBraces: config.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces
+            ?? true,
         insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: config.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces ?? false,
         insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: config.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces ?? false,
         insertSpaceAfterTypeAssertion: config.insertSpaceAfterTypeAssertion ?? false,

package/lib/configs/getUserPreferences.d.ts

@@ -1,5 +1,5 @@
+import type { LanguageServiceContext } from '@volar/language-service';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-import type { LanguageServiceContext } from '@volar/language-service';
 export declare function getUserPreferences(ctx: LanguageServiceContext, document: TextDocument): Promise<ts.UserPreferences>;
 //# sourceMappingURL=getUserPreferences.d.ts.map

package/lib/configs/getUserPreferences.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserPreferences = getUserPreferences;
 const path = require("path-browserify");
-const shared_1 = require("../shared");
 const vscode_uri_1 = require("vscode-uri");
+const shared_1 = require("../shared");
 async function getUserPreferences(ctx, document) {
     let currentDirectory = '';
     if (ctx.project.typescript) {
@@ -20,7 +20,9 @@ async function getUserPreferences(ctx, document) {
         importModuleSpecifierEnding: getImportModuleSpecifierEndingPreference(preferencesConfig),
         jsxAttributeCompletionStyle: getJsxAttributeCompletionStyle(preferencesConfig),
         allowTextChangesInNewFiles: documentUri.scheme === 'file',
-        providePrefixAndSuffixTextForRename: (preferencesConfig.renameShorthandProperties ?? true) === false ? false : (preferencesConfig.useAliasesForRenames ?? true),
+        providePrefixAndSuffixTextForRename: (preferencesConfig.renameShorthandProperties ?? true) === false
+            ? false
+            : (preferencesConfig.useAliasesForRenames ?? true),
         allowRenameOfImportPath: true,
         includeAutomaticOptionalChainCompletions: config.suggest?.includeAutomaticOptionalChainCompletions ?? true,
         provideRefactorNotApplicableReason: true,
@@ -52,9 +54,12 @@ async function getUserPreferences(ctx, document) {
 }
 function getQuoteStylePreference(config) {
     switch (config.quoteStyle) {
-        case 'single': return 'single';
-        case 'double': return 'double';
-        default: return 'auto';
+        case 'single':
+            return 'single';
+        case 'double':
+            return 'double';
+        default:
+            return 'auto';
     }
 }
 function getAutoImportFileExcludePatternsPreference(config, workspacePath) {
@@ -62,42 +67,61 @@ function getAutoImportFileExcludePatternsPreference(config, workspacePath) {
         // Normalization rules: https://github.com/microsoft/TypeScript/pull/49578
         const slashNormalized = p.replace(/\\/g, '/');
         const isRelative = /^\.\.?($|\/)/.test(slashNormalized);
-        return path.isAbsolute(p) ? p :
-            p.startsWith('*') ? '/' + slashNormalized :
-                isRelative ? path.join(workspacePath, p) :
-                    '/**/' + slashNormalized;
+        return path.isAbsolute(p)
+            ? p
+            : p.startsWith('*')
+                ? '/' + slashNormalized
+                : isRelative
+                    ? path.join(workspacePath, p)
+                    : '/**/' + slashNormalized;
     });
 }
 function getImportModuleSpecifierPreference(config) {
     switch (config.importModuleSpecifier) {
-        case 'project-relative': return 'project-relative';
-        case 'relative': return 'relative';
-        case 'non-relative': return 'non-relative';
-        default: return undefined;
+        case 'project-relative':
+            return 'project-relative';
+        case 'relative':
+            return 'relative';
+        case 'non-relative':
+            return 'non-relative';
+        default:
+            return undefined;
     }
 }
 function getImportModuleSpecifierEndingPreference(config) {
     switch (config.importModuleSpecifierEnding) {
-        case 'minimal': return 'minimal';
-        case 'index': return 'index';
-        case 'js': return 'js';
-        default: return 'minimal'; // fix https://github.com/johnsoncodehk/volar/issues/1667
+        case 'minimal':
+            return 'minimal';
+        case 'index':
+            return 'index';
+        case 'js':
+            return 'js';
+        default:
+            return 'minimal';
         // default: return 'auto';
+        // fix https://github.com/johnsoncodehk/volar/issues/1667
     }
 }
 function getJsxAttributeCompletionStyle(config) {
     switch (config.jsxAttributeCompletionStyle) {
-        case 'braces': return 'braces';
-        case 'none': return 'none';
-        default: return 'auto';
+        case 'braces':
+            return 'braces';
+        case 'none':
+            return 'none';
+        default:
+            return 'auto';
     }
 }
 function getInlayParameterNameHintsPreference(config) {
     switch (config.inlayHints?.parameterNames?.enabled) {
-        case 'none': return 'none';
-        case 'literals': return 'literals';
-        case 'all': return 'all';
-        default: return undefined;
+        case 'none':
+            return 'none';
+        case 'literals':
+            return 'literals';
+        case 'all':
+            return 'all';
+        default:
+            return undefined;
     }
 }
 //# sourceMappingURL=getUserPreferences.js.map

package/lib/plugins/directiveComment.js

@@ -7,17 +7,20 @@ const localize = nls.loadMessageBundle(); // TODO: not working
 const directives = [
     {
         value: '@ts-check',
-        description: localize('ts-check', "Enables semantic checking in a JavaScript file. Must be at the top of a file.")
-    }, {
+        description: localize('ts-check', 'Enables semantic checking in a JavaScript file. Must be at the top of a file.'),
+    },
+    {
         value: '@ts-nocheck',
-        description: localize('ts-nocheck', "Disables semantic checking in a JavaScript file. Must be at the top of a file.")
-    }, {
+        description: localize('ts-nocheck', 'Disables semantic checking in a JavaScript file. Must be at the top of a file.'),
+    },
+    {
         value: '@ts-ignore',
-        description: localize('ts-ignore', "Suppresses @ts-check errors on the next line of a file.")
-    }, {
+        description: localize('ts-ignore', 'Suppresses @ts-check errors on the next line of a file.'),
+    },
+    {
         value: '@ts-expect-error',
-        description: localize('ts-expect-error', "Suppresses @ts-check errors on the next line of a file, expecting at least one to exist.")
-    }
+        description: localize('ts-expect-error', 'Suppresses @ts-check errors on the next line of a file, expecting at least one to exist.'),
+    },
 ];
 function create() {
     return {

package/lib/plugins/docCommentTemplate.js

@@ -59,7 +59,10 @@ function createCompletionItem(document, position, insertText) {
     const line = (0, lspConverters_1.getLineText)(document, position.line);
     const prefix = line.slice(0, position.character).match(/\/\**\s*$/);
     const suffix = line.slice(position.character).match(/^\s*\**\//);
-    const start = { line: position.line, character: position.character + (prefix ? -prefix[0].length : 0) };
+    const start = {
+        line: position.line,
+        character: position.character + (prefix ? -prefix[0].length : 0),
+    };
     const end = { line: position.line, character: position.character + (suffix ? suffix[0].length : 0) };
     const range = { start, end };
     item.textEdit = { range, newText: insertText };

package/lib/plugins/semantic.js

@@ -283,7 +283,8 @@ function create(ts, { disableAutoImportCache = false, isValidationEnabled = asyn
                         Object.assign(item.labelDetails, data.originalItem.labelDetails);
                     }
                     (0, lspConverters_1.applyCompletionEntryDetails)(ts, item, details, document, ctx.fileNameToUri, ctx.getTextDocument);
-                    const useCodeSnippetsOnMethodSuggest = await ctx.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.suggest.completeFunctionCalls') ?? false;
+                    const useCodeSnippetsOnMethodSuggest = await ctx.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.suggest.completeFunctionCalls')
+                        ?? false;
                     const useCodeSnippet = useCodeSnippetsOnMethodSuggest
                         && (item.kind === 3
                             || item.kind === 2);
@@ -302,8 +303,8 @@ function create(ts, { disableAutoImportCache = false, isValidationEnabled = asyn
                             }
                             item.insertTextFormat = 2;
                             if (parameterCount > 0) {
-                                //Fix for https://github.com/microsoft/vscode/issues/104059
-                                //Don't show parameter hints if "editor.parameterHints.enabled": false
+                                // Fix for https://github.com/microsoft/vscode/issues/104059
+                                // Don't show parameter hints if "editor.parameterHints.enabled": false
                                 // if (await getConfiguration('editor.parameterHints.enabled', document.uri)) {
                                 // 	item.command = {
                                 // 		title: 'triggerParameterHints',
@@ -680,7 +681,7 @@ function create(ts, { disableAutoImportCache = false, isValidationEnabled = asyn
                     const options = {};
                     if (context?.triggerKind === 1) {
                         options.triggerReason = {
-                            kind: 'invoked'
+                            kind: 'invoked',
                         };
                     }
                     else if (context?.triggerKind === 2) {
@@ -708,14 +709,14 @@ function create(ts, { disableAutoImportCache = false, isValidationEnabled = asyn
                             const signature = {
                                 label: '',
                                 documentation: undefined,
-                                parameters: []
+                                parameters: [],
                             };
                             signature.label += ts.displayPartsToString(item.prefixDisplayParts);
                             item.parameters.forEach((p, i, a) => {
                                 const label = ts.displayPartsToString(p.displayParts);
                                 const parameter = {
                                     label,
-                                    documentation: ts.displayPartsToString(p.documentation)
+                                    documentation: ts.displayPartsToString(p.documentation),
                                 };
                                 signature.label += label;
                                 signature.parameters.push(parameter);
@@ -748,7 +749,8 @@ function create(ts, { disableAutoImportCache = false, isValidationEnabled = asyn
                 }
                 const tsToken = {
                     isCancellationRequested() {
-                        return ctx.project.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested() ?? false;
+                        return ctx.project.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested()
+                            ?? false;
                     },
                     throwIfCancellationRequested() { },
                 };
@@ -816,7 +818,7 @@ function create(ts, { disableAutoImportCache = false, isValidationEnabled = asyn
                 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 { getServiceScript, getExtraServiceScripts } = sourceScript.generated.languagePlugin.typescript;
                     const sourceFileName = uriConverter.asFileName(sourceScript.id);
                     if (getServiceScript(sourceScript.generated.root)?.code === virtualCode) {
                         return {
@@ -835,7 +837,7 @@ function create(ts, { disableAutoImportCache = false, isValidationEnabled = asyn
     };
 }
 function getBasicTriggerCharacters(tsVersion) {
-    const triggerCharacters = ['.', '"', '\'', '`', '/', '<'];
+    const triggerCharacters = ['.', '"', "'", '`', '/', '<'];
     // https://github.com/microsoft/vscode/blob/8e65ae28d5fb8b3c931135da1a41edb9c80ae46f/extensions/typescript-language-features/src/languageFeatures/completions.ts#L811-L833
     if (semver.lt(tsVersion, '3.1.0') || semver.gte(tsVersion, '3.2.0')) {
         triggerCharacters.push('@');

package/lib/semanticFeatures/codeAction.js

@@ -16,7 +16,8 @@ const renameCommandRefactors = new Set([
     'refactor.extract.function',
 ]);
 function register(ctx) {
-    let resolveCommandSupport = ctx.env.clientCapabilities?.textDocument?.codeAction?.resolveSupport?.properties?.includes('command');
+    let resolveCommandSupport = ctx.env.clientCapabilities?.textDocument?.codeAction?.resolveSupport?.properties
+        ?.includes('command');
     let resolveEditSupport = ctx.env.clientCapabilities?.textDocument?.codeAction?.resolveSupport?.properties?.includes('edit');
     let loged = false;
     const wranUnsupportResolve = () => {
@@ -178,7 +179,7 @@ function register(ctx) {
                     if (a.length <= b.length) {
                         let matchNums = 0;
                         for (let i = 0; i < a.length; i++) {
-                            if (a[i] == b[i]) {
+                            if (a[i] === b[i]) {
                                 matchNums++;
                             }
                         }

package/lib/semanticFeatures/codeActionResolve.d.ts

@@ -1,8 +1,8 @@
 import type * as vscode from '@volar/language-service';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-import type { SharedContext } from './types';
 import type { Data, FixAllData, RefactorData } from './codeAction';
+import type { SharedContext } from './types';
 export declare function register(ctx: SharedContext): (codeAction: vscode.CodeAction, formattingOptions: vscode.FormattingOptions | undefined) => Promise<vscode.CodeAction>;
 export declare function resolveFixAllCodeAction(ctx: SharedContext, codeAction: vscode.CodeAction, data: FixAllData, formatOptions: ts.FormatCodeSettings, preferences: ts.UserPreferences): void;
 export declare function resolveRefactorCodeAction(ctx: SharedContext, codeAction: vscode.CodeAction, data: RefactorData, document: TextDocument, formatOptions: ts.FormatCodeSettings, preferences: ts.UserPreferences): void;

package/lib/semanticFeatures/codeActionResolve.js

@@ -4,11 +4,11 @@ exports.register = register;
 exports.resolveFixAllCodeAction = resolveFixAllCodeAction;
 exports.resolveRefactorCodeAction = resolveRefactorCodeAction;
 exports.resolveOrganizeImportsCodeAction = resolveOrganizeImportsCodeAction;
+const vscode_uri_1 = require("vscode-uri");
 const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
 const getUserPreferences_1 = require("../configs/getUserPreferences");
 const shared_1 = require("../shared");
 const lspConverters_1 = require("../utils/lspConverters");
-const vscode_uri_1 = require("vscode-uri");
 function register(ctx) {
     return async (codeAction, formattingOptions) => {
         const data = codeAction.data;

package/lib/semanticFeatures/semanticTokens.d.ts

@@ -1,6 +1,8 @@
 import type * as vscode from '@volar/language-service';
+import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-import type { SharedContext } from './types';
 import type { URI } from 'vscode-uri';
+import type { SharedContext } from './types';
 export declare function register(ts: typeof import('typescript'), ctx: SharedContext): (uri: URI, document: TextDocument, range: vscode.Range, legend: vscode.SemanticTokensLegend) => [number, number, number, number, number][] | undefined;
+export declare function convertClassificationsToSemanticTokens(document: TextDocument, { start, length }: ts.TextSpan, legend: vscode.SemanticTokensLegend, response: ts.Classifications): [number, number, number, number, number][];
 //# sourceMappingURL=semanticTokens.d.ts.map

package/lib/semanticFeatures/semanticTokens.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = register;
+exports.convertClassificationsToSemanticTokens = convertClassificationsToSemanticTokens;
 const shared_1 = require("../shared");
 function register(ts, ctx) {
     return (uri, document, range, legend) => {
@@ -14,61 +15,64 @@ function register(ts, ctx) {
         if (!response) {
             return;
         }
-        let tokenModifiersTable = [];
-        tokenModifiersTable[2 /* TokenModifier.async */] = 1 << legend.tokenModifiers.indexOf('async');
-        tokenModifiersTable[0 /* TokenModifier.declaration */] = 1 << legend.tokenModifiers.indexOf('declaration');
-        tokenModifiersTable[3 /* TokenModifier.readonly */] = 1 << legend.tokenModifiers.indexOf('readonly');
-        tokenModifiersTable[1 /* TokenModifier.static */] = 1 << legend.tokenModifiers.indexOf('static');
-        tokenModifiersTable[5 /* TokenModifier.local */] = 1 << legend.tokenModifiers.indexOf('local');
-        tokenModifiersTable[4 /* TokenModifier.defaultLibrary */] = 1 << legend.tokenModifiers.indexOf('defaultLibrary');
-        tokenModifiersTable = tokenModifiersTable.map(mod => Math.max(mod, 0));
-        const end = start + length;
-        const tokenSpan = response.spans;
-        const tokens = [];
-        let i = 0;
-        while (i < tokenSpan.length) {
-            const offset = tokenSpan[i++];
-            if (offset >= end) {
-                break;
-            }
-            const length = tokenSpan[i++];
-            const tsClassification = tokenSpan[i++];
-            const tokenType = getTokenTypeFromClassification(tsClassification);
-            if (tokenType === undefined) {
-                continue;
-            }
-            const tokenModifiers = getTokenModifierFromClassification(tsClassification);
-            // we can use the document's range conversion methods because the result is at the same version as the document
-            const startPos = document.positionAt(offset);
-            const endPos = document.positionAt(offset + length);
-            const serverToken = tsTokenTypeToServerTokenType(tokenType);
-            if (serverToken === undefined) {
-                continue;
-            }
-            const serverTokenModifiers = tsTokenModifierToServerTokenModifier(tokenModifiers);
-            for (let line = startPos.line; line <= endPos.line; line++) {
-                const startCharacter = (line === startPos.line ? startPos.character : 0);
-                const endCharacter = (line === endPos.line ? endPos.character : docLineLength(document, line));
-                tokens.push([line, startCharacter, endCharacter - startCharacter, serverToken, serverTokenModifiers]);
-            }
+        return convertClassificationsToSemanticTokens(document, { start, length }, legend, response);
+    };
+}
+function convertClassificationsToSemanticTokens(document, { start, length }, legend, response) {
+    let tokenModifiersTable = [];
+    tokenModifiersTable[2 /* TokenModifier.async */] = 1 << legend.tokenModifiers.indexOf('async');
+    tokenModifiersTable[0 /* TokenModifier.declaration */] = 1 << legend.tokenModifiers.indexOf('declaration');
+    tokenModifiersTable[3 /* TokenModifier.readonly */] = 1 << legend.tokenModifiers.indexOf('readonly');
+    tokenModifiersTable[1 /* TokenModifier.static */] = 1 << legend.tokenModifiers.indexOf('static');
+    tokenModifiersTable[5 /* TokenModifier.local */] = 1 << legend.tokenModifiers.indexOf('local');
+    tokenModifiersTable[4 /* TokenModifier.defaultLibrary */] = 1 << legend.tokenModifiers.indexOf('defaultLibrary');
+    tokenModifiersTable = tokenModifiersTable.map(mod => Math.max(mod, 0));
+    const end = start + length;
+    const tokenSpan = response.spans;
+    const tokens = [];
+    let i = 0;
+    while (i < tokenSpan.length) {
+        const offset = tokenSpan[i++];
+        if (offset >= end) {
+            break;
         }
-        return tokens;
-        function tsTokenTypeToServerTokenType(tokenType) {
-            return legend.tokenTypes.indexOf(tokenTypes[tokenType]);
+        const length = tokenSpan[i++];
+        const tsClassification = tokenSpan[i++];
+        const tokenType = getTokenTypeFromClassification(tsClassification);
+        if (tokenType === undefined) {
+            continue;
         }
-        function tsTokenModifierToServerTokenModifier(input) {
-            let m = 0;
-            let i = 0;
-            while (input) {
-                if (input & 1) {
-                    m |= tokenModifiersTable[i];
-                }
-                input = input >> 1;
-                i++;
+        const tokenModifiers = getTokenModifierFromClassification(tsClassification);
+        // we can use the document's range conversion methods because the result is at the same version as the document
+        const startPos = document.positionAt(offset);
+        const endPos = document.positionAt(offset + length);
+        const serverToken = tsTokenTypeToServerTokenType(tokenType);
+        if (serverToken === undefined) {
+            continue;
+        }
+        const serverTokenModifiers = tsTokenModifierToServerTokenModifier(tokenModifiers);
+        for (let line = startPos.line; line <= endPos.line; line++) {
+            const startCharacter = line === startPos.line ? startPos.character : 0;
+            const endCharacter = line === endPos.line ? endPos.character : docLineLength(document, line);
+            tokens.push([line, startCharacter, endCharacter - startCharacter, serverToken, serverTokenModifiers]);
+        }
+    }
+    return tokens;
+    function tsTokenTypeToServerTokenType(tokenType) {
+        return legend.tokenTypes.indexOf(tokenTypes[tokenType]);
+    }
+    function tsTokenModifierToServerTokenModifier(input) {
+        let m = 0;
+        let i = 0;
+        while (input) {
+            if (input & 1) {
+                m |= tokenModifiersTable[i];
             }
-            return m;
+            input = input >> 1;
+            i++;
         }
-    };
+        return m;
+    }
 }
 function docLineLength(document, line) {
     const currentLineOffset = document.offsetAt({ line, character: 0 });

package/lib/shared.js

@@ -14,14 +14,14 @@ function getConfigTitle(document) {
     return document.languageId;
 }
 function isTsDocument(document) {
-    return document.languageId === 'javascript' ||
-        document.languageId === 'typescript' ||
-        document.languageId === 'javascriptreact' ||
-        document.languageId === 'typescriptreact';
+    return document.languageId === 'javascript'
+        || document.languageId === 'typescript'
+        || document.languageId === 'javascriptreact'
+        || document.languageId === 'typescriptreact';
 }
 function isJsonDocument(document) {
-    return document.languageId === 'json' ||
-        document.languageId === 'jsonc';
+    return document.languageId === 'json'
+        || document.languageId === 'jsonc';
 }
 function safeCall(cb) {
     try {

package/lib/utils/lspConverters.js

@@ -93,10 +93,14 @@ function convertDiagnosticRelatedInformation(diag, fileNameToUri, getTextDocumen
 }
 function convertDiagnosticCategory(input) {
     switch (input) {
-        case 0: return 2;
-        case 1: return 1;
-        case 2: return 4;
-        case 3: return 3;
+        case 0:
+            return 2;
+        case 1:
+            return 1;
+        case 2:
+            return 4;
+        case 3:
+            return 3;
     }
     return 1;
 }
@@ -205,7 +209,9 @@ function convertCompletionInfo(ts, completionContext, document, position, create
             enableCallCompletions: true, // TODO: suggest.completeFunctionCalls
         });
         item.insertText = tsEntry.insertText;
-        item.insertTextFormat = isSnippet ? 2 : 1;
+        item.insertTextFormat = isSnippet
+            ? 2
+            : 1;
         item.filterText = getFilterText(tsEntry, wordRange, line, tsEntry.insertText);
         if (completionContext?.isMemberCompletion && dotAccessorContext && !isSnippet) {
             item.filterText = dotAccessorContext.text + (item.insertText || item.label);
@@ -440,8 +446,12 @@ function handleKindModifiers(item, tsEntry) {
     }
 }
 function rangeUnion(a, b) {
-    const start = (a.start.line < b.start.line || (a.start.line === b.start.line && a.start.character < b.start.character)) ? a.start : b.start;
-    const end = (a.end.line > b.end.line || (a.end.line === b.end.line && a.end.character > b.end.character)) ? a.end : b.end;
+    const start = (a.start.line < b.start.line || (a.start.line === b.start.line && a.start.character < b.start.character))
+        ? a.start
+        : b.start;
+    const end = (a.end.line > b.end.line || (a.end.line === b.end.line && a.end.character > b.end.character))
+        ? a.end
+        : b.end;
     return { start, end };
 }
 function getLineText(document, line) {
@@ -478,18 +488,30 @@ function getLabel(item) {
 }
 function convertScriptElementKind(kind) {
     switch (kind) {
-        case PConst.Kind.method: return 6;
-        case PConst.Kind.enum: return 10;
-        case PConst.Kind.enumMember: return 22;
-        case PConst.Kind.function: return 12;
-        case PConst.Kind.class: return 5;
-        case PConst.Kind.interface: return 11;
-        case PConst.Kind.type: return 5;
-        case PConst.Kind.memberVariable: return 8;
-        case PConst.Kind.memberGetAccessor: return 8;
-        case PConst.Kind.memberSetAccessor: return 8;
-        case PConst.Kind.variable: return 13;
-        default: return 13;
+        case PConst.Kind.method:
+            return 6;
+        case PConst.Kind.enum:
+            return 10;
+        case PConst.Kind.enumMember:
+            return 22;
+        case PConst.Kind.function:
+            return 12;
+        case PConst.Kind.class:
+            return 5;
+        case PConst.Kind.interface:
+            return 11;
+        case PConst.Kind.type:
+            return 5;
+        case PConst.Kind.memberVariable:
+            return 8;
+        case PConst.Kind.memberGetAccessor:
+            return 8;
+        case PConst.Kind.memberSetAccessor:
+            return 8;
+        case PConst.Kind.variable:
+            return 13;
+        default:
+            return 13;
     }
 }
 // inlayHints
@@ -497,8 +519,10 @@ function convertInlayHint(hint, document) {
     const result = {
         position: document.positionAt(hint.position),
         label: hint.text,
-        kind: hint.kind === 'Type' ? 1
-            : hint.kind === 'Parameter' ? 2
+        kind: hint.kind === 'Type'
+            ? 1
+            : hint.kind === 'Parameter'
+                ? 2
                 : undefined,
     };
     result.paddingLeft = hint.whitespaceBefore;
@@ -651,21 +675,36 @@ function convertNavTree(item, document) {
 }
 const getSymbolKind = (kind) => {
     switch (kind) {
-        case PConst.Kind.module: return 2;
-        case PConst.Kind.class: return 5;
-        case PConst.Kind.enum: return 10;
-        case PConst.Kind.interface: return 11;
-        case PConst.Kind.method: return 6;
-        case PConst.Kind.memberVariable: return 7;
-        case PConst.Kind.memberGetAccessor: return 7;
-        case PConst.Kind.memberSetAccessor: return 7;
-        case PConst.Kind.variable: return 13;
-        case PConst.Kind.const: return 13;
-        case PConst.Kind.localVariable: return 13;
-        case PConst.Kind.function: return 12;
-        case PConst.Kind.localFunction: return 12;
-        case PConst.Kind.constructSignature: return 9;
-        case PConst.Kind.constructorImplementation: return 9;
+        case PConst.Kind.module:
+            return 2;
+        case PConst.Kind.class:
+            return 5;
+        case PConst.Kind.enum:
+            return 10;
+        case PConst.Kind.interface:
+            return 11;
+        case PConst.Kind.method:
+            return 6;
+        case PConst.Kind.memberVariable:
+            return 7;
+        case PConst.Kind.memberGetAccessor:
+            return 7;
+        case PConst.Kind.memberSetAccessor:
+            return 7;
+        case PConst.Kind.variable:
+            return 13;
+        case PConst.Kind.const:
+            return 13;
+        case PConst.Kind.localVariable:
+            return 13;
+        case PConst.Kind.function:
+            return 12;
+        case PConst.Kind.localFunction:
+            return 12;
+        case PConst.Kind.constructSignature:
+            return 9;
+        case PConst.Kind.constructorImplementation:
+            return 9;
     }
     return 13;
 };
@@ -689,11 +728,15 @@ function convertOutliningSpan(outliningSpan, document) {
 }
 function convertOutliningSpanKind(kind) {
     switch (kind) {
-        case 'comment': return 'comment';
-        case 'region': return 'region';
-        case 'imports': return 'imports';
+        case 'comment':
+            return 'comment';
+        case 'region':
+            return 'region';
+        case 'imports':
+            return 'imports';
         case 'code':
-        default: return undefined;
+        default:
+            return undefined;
     }
 }
 const foldEndPairCharacters = ['}', ']', ')', '`'];

package/lib/utils/snippetForFunctionCall.js

@@ -16,7 +16,10 @@ function snippetForFunctionCall(item, displayParts) {
     }
     snippet += ')';
     snippet += '$' + _tabstop++;
-    return { snippet, parameterCount: parameterListParts.parts.length + (parameterListParts.hasOptionalParameters ? 1 : 0) };
+    return {
+        snippet,
+        parameterCount: parameterListParts.parts.length + (parameterListParts.hasOptionalParameters ? 1 : 0),
+    };
     function appendJoinedPlaceholders(snippet, parts, joiner) {
         for (let i = 0; i < parts.length; ++i) {
             const paramterPart = parts[i];

package/lib/utils/typeConverters.js

@@ -10,29 +10,52 @@ var SymbolKind;
 (function (SymbolKind) {
     function fromProtocolScriptElementKind(kind) {
         switch (kind) {
-            case PConst.Kind.module: return 2;
-            case PConst.Kind.class: return 5;
-            case PConst.Kind.enum: return 10;
-            case PConst.Kind.enumMember: return 22;
-            case PConst.Kind.interface: return 11;
-            case PConst.Kind.indexSignature: return 6;
-            case PConst.Kind.callSignature: return 6;
-            case PConst.Kind.method: return 6;
-            case PConst.Kind.memberVariable: return 7;
-            case PConst.Kind.memberGetAccessor: return 7;
-            case PConst.Kind.memberSetAccessor: return 7;
-            case PConst.Kind.variable: return 13;
-            case PConst.Kind.let: return 13;
-            case PConst.Kind.const: return 13;
-            case PConst.Kind.localVariable: return 13;
-            case PConst.Kind.alias: return 13;
-            case PConst.Kind.function: return 12;
-            case PConst.Kind.localFunction: return 12;
-            case PConst.Kind.constructSignature: return 9;
-            case PConst.Kind.constructorImplementation: return 9;
-            case PConst.Kind.typeParameter: return 26;
-            case PConst.Kind.string: return 15;
-            default: return 13;
+            case PConst.Kind.module:
+                return 2;
+            case PConst.Kind.class:
+                return 5;
+            case PConst.Kind.enum:
+                return 10;
+            case PConst.Kind.enumMember:
+                return 22;
+            case PConst.Kind.interface:
+                return 11;
+            case PConst.Kind.indexSignature:
+                return 6;
+            case PConst.Kind.callSignature:
+                return 6;
+            case PConst.Kind.method:
+                return 6;
+            case PConst.Kind.memberVariable:
+                return 7;
+            case PConst.Kind.memberGetAccessor:
+                return 7;
+            case PConst.Kind.memberSetAccessor:
+                return 7;
+            case PConst.Kind.variable:
+                return 13;
+            case PConst.Kind.let:
+                return 13;
+            case PConst.Kind.const:
+                return 13;
+            case PConst.Kind.localVariable:
+                return 13;
+            case PConst.Kind.alias:
+                return 13;
+            case PConst.Kind.function:
+                return 12;
+            case PConst.Kind.localFunction:
+                return 12;
+            case PConst.Kind.constructSignature:
+                return 9;
+            case PConst.Kind.constructorImplementation:
+                return 9;
+            case PConst.Kind.typeParameter:
+                return 26;
+            case PConst.Kind.string:
+                return 15;
+            default:
+                return 13;
         }
     }
     SymbolKind.fromProtocolScriptElementKind = fromProtocolScriptElementKind;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.64",
+	"version": "0.0.66",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -43,5 +43,6 @@
 		"@volar/language-service": {
 			"optional": true
 		}
-	}
+	},
+	"gitHead": "7113cd822bff8839f54ec8dfb3cb9c0486716230"
 }