volar-service-typescript 0.0.51 → 0.0.53

package/index.js

@@ -1,18 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
-var semantic_1 = require("./lib/plugins/semantic");
+exports.create = create;
 const directiveComment_1 = require("./lib/plugins/directiveComment");
 const docCommentTemplate_1 = require("./lib/plugins/docCommentTemplate");
-const semantic_2 = require("./lib/plugins/semantic");
+const semantic_1 = require("./lib/plugins/semantic");
 const syntactic_1 = require("./lib/plugins/syntactic");
 function create(ts, options) {
     return [
-        (0, semantic_2.create)(ts, options),
+        (0, semantic_1.create)(ts, options),
         (0, syntactic_1.create)(ts, options),
         (0, docCommentTemplate_1.create)(ts),
         (0, directiveComment_1.create)(),
     ];
 }
-exports.create = create;
 //# sourceMappingURL=index.js.map

package/lib/configs/getFormatCodeSettings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFormatCodeSettings = void 0;
+exports.getFormatCodeSettings = getFormatCodeSettings;
 const shared_1 = require("../shared");
 async function getFormatCodeSettings(ctx, document, options) {
     const config = await ctx.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.format') ?? {};
@@ -29,5 +29,4 @@ async function getFormatCodeSettings(ctx, document, options) {
         semicolons: config.semicolons ?? 'ignore',
     };
 }
-exports.getFormatCodeSettings = getFormatCodeSettings;
 //# sourceMappingURL=getFormatCodeSettings.js.map

package/lib/configs/getUserPreferences.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserPreferences = void 0;
+exports.getUserPreferences = getUserPreferences;
 const path = require("path-browserify");
 const shared_1 = require("../shared");
 const vscode_uri_1 = require("vscode-uri");
@@ -49,7 +49,6 @@ async function getUserPreferences(ctx, document) {
     };
     return preferences;
 }
-exports.getUserPreferences = getUserPreferences;
 function getQuoteStylePreference(config) {
     switch (config.quoteStyle) {
         case 'single': return 'single';

package/lib/plugins/directiveComment.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
+exports.create = create;
 const nls = require("vscode-nls");
 const shared_1 = require("../shared");
 const localize = nls.loadMessageBundle(); // TODO: not working
@@ -66,5 +66,4 @@ function create() {
         },
     };
 }
-exports.create = create;
 //# sourceMappingURL=directiveComment.js.map

package/lib/plugins/docCommentTemplate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
+exports.create = create;
 const nls = require("vscode-nls");
 const shared_1 = require("../shared");
 const lspConverters_1 = require("../utils/lspConverters");
@@ -50,7 +50,6 @@ function create(ts) {
         },
     };
 }
-exports.create = create;
 function createCompletionItem(document, position, insertText) {
     const item = { label: '/** */' };
     item.kind = 1;

package/lib/plugins/semantic.d.ts

@@ -1,4 +1,4 @@
-import type { ProviderResult, LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
+import type { LanguageServiceContext, LanguageServicePlugin, ProviderResult } from '@volar/language-service';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { URI } from 'vscode-uri';

package/lib/plugins/semantic.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
+exports.create = create;
 const path = require("path-browserify");
 const semver = require("semver");
 const tsWithImportCache = require("typescript-auto-import-cache");
+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 snippetForFunctionCall_1 = require("../utils/snippetForFunctionCall");
 const codeActions = require("../semanticFeatures/codeAction");
 const codeActionResolve = require("../semanticFeatures/codeActionResolve");
 const semanticTokens = require("../semanticFeatures/semanticTokens");
-const vscode_uri_1 = require("vscode-uri");
+const shared_1 = require("../shared");
+const lspConverters_1 = require("../utils/lspConverters");
+const snippetForFunctionCall_1 = require("../utils/snippetForFunctionCall");
 const documentRegistries = [];
 function getDocumentRegistry(ts, useCaseSensitiveFileNames, currentDirectory) {
     let documentRegistry = documentRegistries.find(item => item[0] === useCaseSensitiveFileNames && item[1] === currentDirectory)?.[2];
@@ -69,43 +69,27 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         'class',
                         'enum',
                         'interface',
-                        'struct',
                         'typeParameter',
                         'type',
                         'parameter',
                         'variable',
                         'property',
                         'enumMember',
-                        'decorator',
-                        'event',
                         'function',
                         'method',
-                        'macro',
-                        'label',
-                        'comment',
-                        'string',
-                        'keyword',
-                        'number',
-                        'regexp',
-                        'operator',
                     ],
                     tokenModifiers: [
                         'declaration',
-                        'definition',
                         'readonly',
                         'static',
-                        'deprecated',
-                        'abstract',
                         'async',
-                        'modification',
-                        'documentation',
                         'defaultLibrary',
+                        'local', // additional
                     ],
                 },
             },
             workspaceSymbolProvider: true,
             // fileRenameEdits: true,
-            selectionRangeProvider: true,
             signatureHelpProvider: {
                 triggerCharacters: ['(', ',', '<'],
                 retriggerCharacters: [')'],
@@ -197,7 +181,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                 function updateSourceScriptFileNames() {
                     sourceScriptNames.clear();
                     for (const fileName of languageServiceHost.getScriptFileNames()) {
-                        const uri = ctx.fileNameToUri(fileName);
+                        const maybeEmbeddedUri = ctx.fileNameToUri(fileName);
+                        const decoded = context.decodeEmbeddedDocumentUri(maybeEmbeddedUri);
+                        const uri = decoded ? decoded[0] : maybeEmbeddedUri;
                         const sourceScript = context.language.scripts.get(uri);
                         if (sourceScript?.generated) {
                             const tsCode = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
@@ -633,7 +619,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         return items
                             .filter(item => item.containerName || item.kind !== 'alias')
                             .map(item => (0, lspConverters_1.convertNavigateToItem)(item, ctx.getTextDocument(ctx.fileNameToUri(item.fileName))))
-                            .filter(shared_1.notEmpty);
+                            .filter(item => !!item);
                     });
                 },
                 provideFileRenameEdits(oldUri, newUri, token) {
@@ -652,25 +638,6 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         return (0, lspConverters_1.convertFileTextChanges)(response, ctx.fileNameToUri, ctx.getTextDocument);
                     });
                 },
-                provideSelectionRanges(document, positions, token) {
-                    const uri = vscode_uri_1.URI.parse(document.uri);
-                    if (!isSemanticDocument(uri, document)) {
-                        return;
-                    }
-                    return worker(token, () => {
-                        return positions
-                            .map(position => {
-                            const fileName = ctx.uriToFileName(uri);
-                            const offset = document.offsetAt(position);
-                            const range = (0, shared_1.safeCall)(() => ctx.languageService.getSmartSelectionRange(fileName, offset));
-                            if (!range) {
-                                return;
-                            }
-                            return (0, lspConverters_1.convertSelectionRange)(range, document);
-                        })
-                            .filter(shared_1.notEmpty);
-                    });
-                },
                 provideSignatureHelp(document, position, context, token) {
                     const uri = vscode_uri_1.URI.parse(document.uri);
                     if (!isSemanticDocument(uri, document)) {
@@ -756,7 +723,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         const suggestionDiagnostics = (0, shared_1.safeCall)(() => ctx.languageService.getSuggestionDiagnostics(fileName)) ?? [];
                         return [...syntacticDiagnostics, ...suggestionDiagnostics]
                             .map(diagnostic => (0, lspConverters_1.convertDiagnostic)(diagnostic, document, ctx.fileNameToUri, ctx.getTextDocument))
-                            .filter(shared_1.notEmpty);
+                            .filter(diagnostic => !!diagnostic);
                     }
                     else if (mode === 'semantic') {
                         const semanticDiagnostics = (0, shared_1.safeCall)(() => program.getSemanticDiagnostics(sourceFile, token)) ?? [];
@@ -765,7 +732,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                             : [];
                         return [...semanticDiagnostics, ...declarationDiagnostics]
                             .map(diagnostic => (0, lspConverters_1.convertDiagnostic)(diagnostic, document, ctx.fileNameToUri, ctx.getTextDocument))
-                            .filter(shared_1.notEmpty);
+                            .filter(diagnostic => !!diagnostic);
                     }
                 });
             }
@@ -822,7 +789,6 @@ function create(ts, { isValidationEnabled = async (document, context) => {
         },
     };
 }
-exports.create = create;
 function getBasicTriggerCharacters(tsVersion) {
     const triggerCharacters = ['.', '"', '\'', '`', '/', '<'];
     // https://github.com/microsoft/vscode/blob/8e65ae28d5fb8b3c931135da1a41edb9c80ae46f/extensions/typescript-language-features/src/languageFeatures/completions.ts#L811-L833

package/lib/plugins/syntactic.d.ts

@@ -1,6 +1,6 @@
-import type { ProviderResult, LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
-import type { TextDocument } from 'vscode-languageserver-textdocument';
+import type { LanguageServiceContext, LanguageServicePlugin, ProviderResult } from '@volar/language-service';
 import type * as ts from 'typescript';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 export declare function getLanguageServiceByDocument(ts: typeof import('typescript'), document: TextDocument): {
     languageService: ts.LanguageService;
     fileName: string;

package/lib/plugins/syntactic.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = exports.getLanguageServiceByDocument = void 0;
+exports.getLanguageServiceByDocument = getLanguageServiceByDocument;
+exports.create = create;
 const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
 const shared_1 = require("../shared");
-const lspConverters_1 = require("../utils/lspConverters");
 const syntaxOnlyService_1 = require("../syntaxOnlyService");
+const lspConverters_1 = require("../utils/lspConverters");
 const snapshots = new WeakMap();
 let created;
 function getLanguageServiceByDocument(ts, document) {
@@ -29,7 +30,6 @@ function getLanguageServiceByDocument(ts, document) {
         fileName: document.uri,
     };
 }
-exports.getLanguageServiceByDocument = getLanguageServiceByDocument;
 function create(ts, { isFormattingEnabled = async (document, context) => {
     return await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.format.enable') ?? true;
 }, } = {}) {
@@ -41,6 +41,7 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                 configurationSections: ['javascript.autoClosingTags', 'typescript.autoClosingTags'],
             },
             foldingRangeProvider: true,
+            selectionRangeProvider: true,
             documentSymbolProvider: true,
             documentFormattingProvider: true,
             documentOnTypeFormattingProvider: {
@@ -76,6 +77,24 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
                     }
                     return outliningSpans.map(span => (0, lspConverters_1.convertOutliningSpan)(span, document));
                 },
+                provideSelectionRanges(document, positions) {
+                    if (!(0, shared_1.isTsDocument)(document)) {
+                        return;
+                    }
+                    const { languageService, fileName } = getLanguageServiceByDocument(ts, document);
+                    const ranges = positions
+                        .map(position => {
+                        const offset = document.offsetAt(position);
+                        const range = (0, shared_1.safeCall)(() => languageService.getSmartSelectionRange(fileName, offset));
+                        if (!range) {
+                            return;
+                        }
+                        return (0, lspConverters_1.convertSelectionRange)(range, document);
+                    });
+                    if (ranges.every(range => !!range)) {
+                        return ranges;
+                    }
+                },
                 provideDocumentSymbols(document) {
                     if (!(0, shared_1.isTsDocument)(document)) {
                         return;
@@ -133,5 +152,4 @@ function create(ts, { isFormattingEnabled = async (document, context) => {
         },
     };
 }
-exports.create = create;
 //# sourceMappingURL=syntactic.js.map

package/lib/semanticFeatures/codeAction.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.register = void 0;
+exports.register = register;
 const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
 const getUserPreferences_1 = require("../configs/getUserPreferences");
 const shared_1 = require("../shared");
@@ -260,5 +260,4 @@ function register(ctx) {
         }
     };
 }
-exports.register = register;
 //# sourceMappingURL=codeAction.js.map

package/lib/semanticFeatures/codeActionResolve.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveOrganizeImportsCodeAction = exports.resolveRefactorCodeAction = exports.resolveFixAllCodeAction = exports.register = void 0;
+exports.register = register;
+exports.resolveFixAllCodeAction = resolveFixAllCodeAction;
+exports.resolveRefactorCodeAction = resolveRefactorCodeAction;
+exports.resolveOrganizeImportsCodeAction = resolveOrganizeImportsCodeAction;
 const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
 const getUserPreferences_1 = require("../configs/getUserPreferences");
 const shared_1 = require("../shared");
@@ -26,13 +29,11 @@ function register(ctx) {
         return codeAction;
     };
 }
-exports.register = register;
 function resolveFixAllCodeAction(ctx, codeAction, data, formatOptions, preferences) {
     const fixes = data.fixIds.map(fixId => (0, shared_1.safeCall)(() => ctx.languageService.getCombinedCodeFix({ type: 'file', fileName: data.fileName }, fixId, formatOptions, preferences)));
     const changes = fixes.map(fix => fix?.changes ?? []).flat();
     codeAction.edit = (0, lspConverters_1.convertFileTextChanges)(changes, ctx.fileNameToUri, ctx.getTextDocument);
 }
-exports.resolveFixAllCodeAction = resolveFixAllCodeAction;
 function resolveRefactorCodeAction(ctx, codeAction, data, document, formatOptions, preferences) {
     const editInfo = (0, shared_1.safeCall)(() => ctx.languageService.getEditsForRefactor(data.fileName, formatOptions, data.range, data.refactorName, data.actionName, preferences));
     if (!editInfo) {
@@ -43,10 +44,8 @@ function resolveRefactorCodeAction(ctx, codeAction, data, document, formatOption
         codeAction.command = ctx.commands.rename.create(document.uri, document.positionAt(editInfo.renameLocation));
     }
 }
-exports.resolveRefactorCodeAction = resolveRefactorCodeAction;
 function resolveOrganizeImportsCodeAction(ctx, codeAction, data, formatOptions, preferences) {
     const changes = (0, shared_1.safeCall)(() => ctx.languageService.organizeImports({ type: 'file', fileName: data.fileName }, formatOptions, preferences));
     codeAction.edit = (0, lspConverters_1.convertFileTextChanges)(changes ?? [], ctx.fileNameToUri, ctx.getTextDocument);
 }
-exports.resolveOrganizeImportsCodeAction = resolveOrganizeImportsCodeAction;
 //# sourceMappingURL=codeActionResolve.js.map

package/lib/semanticFeatures/semanticTokens.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.register = void 0;
+exports.register = register;
 const shared_1 = require("../shared");
 function register(ts, ctx) {
     return (uri, document, range, legend) => {
@@ -19,14 +19,18 @@ function register(ts, ctx) {
         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'); // missing in server tokenModifiers
+        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);
@@ -66,7 +70,6 @@ function register(ts, ctx) {
         }
     };
 }
-exports.register = register;
 function docLineLength(document, line) {
     const currentLineOffset = document.offsetAt({ line, character: 0 });
     const nextLineOffset = document.offsetAt({ line: line + 1, character: 0 });
@@ -99,7 +102,7 @@ tokenModifiers[2 /* TokenModifier.async */] = 'async';
 tokenModifiers[0 /* TokenModifier.declaration */] = 'declaration';
 tokenModifiers[3 /* TokenModifier.readonly */] = 'readonly';
 tokenModifiers[1 /* TokenModifier.static */] = 'static';
-tokenModifiers[5 /* TokenModifier.local */] = 'local'; // missing in server tokenModifiers
+tokenModifiers[5 /* TokenModifier.local */] = 'local';
 tokenModifiers[4 /* TokenModifier.defaultLibrary */] = 'defaultLibrary';
 // mapping for the original ExperimentalProtocol.ClassificationType from TypeScript (only used when plugin is not available)
 const tokenTypeMap = [];

package/lib/shared.d.ts

@@ -3,5 +3,4 @@ export declare function getConfigTitle(document: TextDocument): string;
 export declare function isTsDocument(document: TextDocument): boolean;
 export declare function isJsonDocument(document: TextDocument): boolean;
 export declare function safeCall<T>(cb: () => T): T | undefined;
-export declare function notEmpty(value: any): value is NonNullable<typeof value>;
 //# sourceMappingURL=shared.d.ts.map

package/lib/shared.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.notEmpty = exports.safeCall = exports.isJsonDocument = exports.isTsDocument = exports.getConfigTitle = void 0;
+exports.getConfigTitle = getConfigTitle;
+exports.isTsDocument = isTsDocument;
+exports.isJsonDocument = isJsonDocument;
+exports.safeCall = safeCall;
 function getConfigTitle(document) {
     if (document.languageId === 'javascriptreact') {
         return 'javascript';
@@ -10,28 +13,20 @@ function getConfigTitle(document) {
     }
     return document.languageId;
 }
-exports.getConfigTitle = getConfigTitle;
 function isTsDocument(document) {
     return document.languageId === 'javascript' ||
         document.languageId === 'typescript' ||
         document.languageId === 'javascriptreact' ||
         document.languageId === 'typescriptreact';
 }
-exports.isTsDocument = isTsDocument;
 function isJsonDocument(document) {
     return document.languageId === 'json' ||
         document.languageId === 'jsonc';
 }
-exports.isJsonDocument = isJsonDocument;
 function safeCall(cb) {
     try {
         return cb();
     }
     catch { }
 }
-exports.safeCall = safeCall;
-function notEmpty(value) {
-    return value !== null && value !== undefined;
-}
-exports.notEmpty = notEmpty;
 //# sourceMappingURL=shared.js.map

package/lib/syntaxOnlyService.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSyntaxOnlyService = void 0;
+exports.createSyntaxOnlyService = createSyntaxOnlyService;
 function createSyntaxOnlyService(ts, syntaxOnly) {
     let currentProjectVersion = -1;
     let fileNames = [];
@@ -41,5 +41,4 @@ function createSyntaxOnlyService(ts, syntaxOnly) {
         }
     }
 }
-exports.createSyntaxOnlyService = createSyntaxOnlyService;
 //# sourceMappingURL=syntaxOnlyService.js.map

package/lib/utils/lspConverters.js

@@ -1,10 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertTextSpan = exports.convertDocumentSpantoLocationLink = exports.convertDefinitionInfoAndBoundSpan = exports.convertDocumentSpanToLocation = exports.convertCallHierarchyItem = exports.convertCallHierarchyOutgoingCall = exports.convertCallHierarchyIncomingCall = exports.convertTextChange = exports.convertOutliningSpanKind = exports.convertOutliningSpan = exports.convertNavTree = exports.convertQuickInfo = exports.convertRenameLocations = exports.convertFileTextChanges = exports.convertSelectionRange = exports.convertHighlightSpan = exports.convertInlayHint = exports.convertNavigateToItem = exports.getLineText = exports.convertCompletionInfo = exports.applyCompletionEntryDetails = exports.convertDiagnostic = void 0;
+exports.convertDiagnostic = convertDiagnostic;
+exports.applyCompletionEntryDetails = applyCompletionEntryDetails;
+exports.convertCompletionInfo = convertCompletionInfo;
+exports.getLineText = getLineText;
+exports.convertNavigateToItem = convertNavigateToItem;
+exports.convertInlayHint = convertInlayHint;
+exports.convertHighlightSpan = convertHighlightSpan;
+exports.convertSelectionRange = convertSelectionRange;
+exports.convertFileTextChanges = convertFileTextChanges;
+exports.convertRenameLocations = convertRenameLocations;
+exports.convertQuickInfo = convertQuickInfo;
+exports.convertNavTree = convertNavTree;
+exports.convertOutliningSpan = convertOutliningSpan;
+exports.convertOutliningSpanKind = convertOutliningSpanKind;
+exports.convertTextChange = convertTextChange;
+exports.convertCallHierarchyIncomingCall = convertCallHierarchyIncomingCall;
+exports.convertCallHierarchyOutgoingCall = convertCallHierarchyOutgoingCall;
+exports.convertCallHierarchyItem = convertCallHierarchyItem;
+exports.convertDocumentSpanToLocation = convertDocumentSpanToLocation;
+exports.convertDefinitionInfoAndBoundSpan = convertDefinitionInfoAndBoundSpan;
+exports.convertDocumentSpantoLocationLink = convertDocumentSpantoLocationLink;
+exports.convertTextSpan = convertTextSpan;
 const path = require("path-browserify");
 const semver = require("semver");
 const PConst = require("../protocol.const");
-const shared_1 = require("../shared");
 const modifiers_1 = require("../utils/modifiers");
 const previewer = require("../utils/previewer");
 const typeConverters = require("../utils/typeConverters");
@@ -45,7 +65,6 @@ function convertDiagnostic(diag, document, fileNameToUri, getTextDocument) {
     }
     return diagnostic;
 }
-exports.convertDiagnostic = convertDiagnostic;
 function convertDiagnosticRelatedInformation(diag, fileNameToUri, getTextDocument) {
     if (diag.start === undefined) {
         return;
@@ -130,7 +149,6 @@ function applyCompletionEntryDetails(ts, item, data, document, fileNameToUri, ge
         handleKindModifiers(item, data);
     }
 }
-exports.applyCompletionEntryDetails = applyCompletionEntryDetails;
 // completion
 function convertCompletionInfo(ts, completionContext, document, position, createData) {
     const lt_320 = semver.lt(ts.version, '3.2.0');
@@ -330,7 +348,6 @@ function convertCompletionInfo(ts, completionContext, document, position, create
         return true;
     }
 }
-exports.convertCompletionInfo = convertCompletionInfo;
 function convertCompletionItemKind(kind) {
     switch (kind) {
         case PConst.Kind.primitiveType:
@@ -426,7 +443,6 @@ function getLineText(document, line) {
     });
     return text;
 }
-exports.getLineText = getLineText;
 // workspaceSymbol
 function convertNavigateToItem(item, document) {
     const info = {
@@ -443,7 +459,6 @@ function convertNavigateToItem(item, document) {
     }
     return info;
 }
-exports.convertNavigateToItem = convertNavigateToItem;
 function getLabel(item) {
     const label = item.name;
     if (item.kind === 'method' || item.kind === 'function') {
@@ -480,7 +495,6 @@ function convertInlayHint(hint, document) {
     result.paddingRight = hint.whitespaceAfter;
     return result;
 }
-exports.convertInlayHint = convertInlayHint;
 // documentHighlight
 function convertHighlightSpan(span, document) {
     return {
@@ -490,7 +504,6 @@ function convertHighlightSpan(span, document) {
         range: convertTextSpan(span.textSpan, document),
     };
 }
-exports.convertHighlightSpan = convertHighlightSpan;
 // selectionRanges
 function convertSelectionRange(range, document) {
     return {
@@ -500,7 +513,6 @@ function convertSelectionRange(range, document) {
         range: convertTextSpan(range.textSpan, document),
     };
 }
-exports.convertSelectionRange = convertSelectionRange;
 // rename
 function convertFileTextChanges(changes, fileNameToUri, getTextDocument) {
     const workspaceEdit = {};
@@ -538,7 +550,6 @@ function convertFileTextChanges(changes, fileNameToUri, getTextDocument) {
     }
     return workspaceEdit;
 }
-exports.convertFileTextChanges = convertFileTextChanges;
 // rename file
 function convertRenameLocations(newText, locations, fileNameToUri, getTextDocument) {
     const workspaceEdit = {};
@@ -565,7 +576,6 @@ function convertRenameLocations(newText, locations, fileNameToUri, getTextDocume
     }
     return workspaceEdit;
 }
-exports.convertRenameLocations = convertRenameLocations;
 // hover
 function convertQuickInfo(ts, info, document, fileNameToUri, getTextDocument) {
     const parts = [];
@@ -586,7 +596,6 @@ function convertQuickInfo(ts, info, document, fileNameToUri, getTextDocument) {
         range: convertTextSpan(info.textSpan, document),
     };
 }
-exports.convertQuickInfo = convertQuickInfo;
 // documentSymbol
 function convertNavTree(item, document) {
     if (!shouldIncludeEntry(item)) {
@@ -630,7 +639,6 @@ function convertNavTree(item, document) {
         return symbol;
     });
 }
-exports.convertNavTree = convertNavTree;
 const getSymbolKind = (kind) => {
     switch (kind) {
         case PConst.Kind.module: return 2;
@@ -669,7 +677,6 @@ function convertOutliningSpan(outliningSpan, document) {
         kind: convertOutliningSpanKind(outliningSpan.kind),
     };
 }
-exports.convertOutliningSpan = convertOutliningSpan;
 function convertOutliningSpanKind(kind) {
     switch (kind) {
         case 'comment': return 'comment';
@@ -679,7 +686,6 @@ function convertOutliningSpanKind(kind) {
         default: return undefined;
     }
 }
-exports.convertOutliningSpanKind = convertOutliningSpanKind;
 const foldEndPairCharacters = ['}', ']', ')', '`'];
 // https://github.com/microsoft/vscode/blob/bed61166fb604e519e82e4d1d1ed839bc45d65f8/extensions/typescript-language-features/src/languageFeatures/folding.ts#L61-L73
 function adjustFoldingEnd(start, end, document) {
@@ -703,7 +709,6 @@ function convertTextChange(edit, document) {
         newText: edit.newText,
     };
 }
-exports.convertTextChange = convertTextChange;
 // callHierarchy
 function convertCallHierarchyIncomingCall(item, ctx) {
     const uri = ctx.fileNameToUri(item.from.file);
@@ -712,19 +717,17 @@ function convertCallHierarchyIncomingCall(item, ctx) {
         from: convertCallHierarchyItem(item.from, ctx),
         fromRanges: item.fromSpans
             .map(span => convertTextSpan(span, document))
-            .filter(shared_1.notEmpty),
+            .filter(span => !!span),
     };
 }
-exports.convertCallHierarchyIncomingCall = convertCallHierarchyIncomingCall;
 function convertCallHierarchyOutgoingCall(item, fromDocument, ctx) {
     return {
         to: convertCallHierarchyItem(item.to, ctx),
         fromRanges: item.fromSpans
             .map(span => convertTextSpan(span, fromDocument))
-            .filter(shared_1.notEmpty),
+            .filter(span => !!span),
     };
 }
-exports.convertCallHierarchyOutgoingCall = convertCallHierarchyOutgoingCall;
 function convertCallHierarchyItem(item, ctx) {
     const rootPath = ctx.languageService.getProgram()?.getCompilerOptions().rootDir ?? '';
     const uri = ctx.fileNameToUri(item.file);
@@ -746,7 +749,6 @@ function convertCallHierarchyItem(item, ctx) {
     }
     return result;
 }
-exports.convertCallHierarchyItem = convertCallHierarchyItem;
 function isSourceFileItem(item) {
     return item.kind === PConst.Kind.script || item.kind === PConst.Kind.module && item.selectionSpan.start === 0;
 }
@@ -760,7 +762,6 @@ function convertDocumentSpanToLocation(documentSpan, ctx) {
         range,
     };
 }
-exports.convertDocumentSpanToLocation = convertDocumentSpanToLocation;
 function convertDefinitionInfoAndBoundSpan(info, document, ctx) {
     if (!info.definitions) {
         return [];
@@ -774,9 +775,8 @@ function convertDefinitionInfoAndBoundSpan(info, document, ctx) {
             return link;
         }
     })
-        .filter(shared_1.notEmpty);
+        .filter(entry => !!entry);
 }
-exports.convertDefinitionInfoAndBoundSpan = convertDefinitionInfoAndBoundSpan;
 function convertDocumentSpantoLocationLink(documentSpan, ctx) {
     const targetUri = ctx.fileNameToUri(documentSpan.fileName);
     const document = ctx.getTextDocument(targetUri);
@@ -794,7 +794,6 @@ function convertDocumentSpantoLocationLink(documentSpan, ctx) {
         originSelectionRange,
     };
 }
-exports.convertDocumentSpantoLocationLink = convertDocumentSpantoLocationLink;
 function convertTextSpan(textSpan, document) {
     if (!document) {
         return {
@@ -807,5 +806,4 @@ function convertTextSpan(textSpan, document) {
         end: document.positionAt(textSpan.start + textSpan.length),
     };
 }
-exports.convertTextSpan = convertTextSpan;
 //# sourceMappingURL=lspConverters.js.map

package/lib/utils/modifiers.js

@@ -4,9 +4,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseKindModifier = void 0;
+exports.parseKindModifier = parseKindModifier;
 function parseKindModifier(kindModifiers) {
     return new Set(kindModifiers.split(/,|\s+/g));
 }
-exports.parseKindModifier = parseKindModifier;
 //# sourceMappingURL=modifiers.js.map

package/lib/utils/previewer.js

@@ -4,7 +4,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMarkdownDocumentation = exports.markdownDocumentation = exports.tagsMarkdownPreview = exports.plainWithLinks = void 0;
+exports.plainWithLinks = plainWithLinks;
+exports.tagsMarkdownPreview = tagsMarkdownPreview;
+exports.markdownDocumentation = markdownDocumentation;
+exports.addMarkdownDocumentation = addMarkdownDocumentation;
 function replaceLinks(text) {
     return text
         // Http(s) links
@@ -84,7 +87,6 @@ function getTagDocumentation(tag, fileNameToUri, getTextDocument) {
 function plainWithLinks(parts, fileNameToUri, getTextDocument) {
     return processInlineTags(convertLinkTags(parts, fileNameToUri, getTextDocument));
 }
-exports.plainWithLinks = plainWithLinks;
 /**
  * Convert `@link` inline tags to markdown links
  */
@@ -171,11 +173,9 @@ function convertLinkTags(parts, fileNameToUri, getTextDocument) {
 function tagsMarkdownPreview(tags, fileNameToUri, getTextDocument) {
     return tags.map(tag => getTagDocumentation(tag, fileNameToUri, getTextDocument)).join('  \n\n');
 }
-exports.tagsMarkdownPreview = tagsMarkdownPreview;
 function markdownDocumentation(documentation, tags, fileNameToUri, getTextDocument) {
     return addMarkdownDocumentation('', documentation, tags, fileNameToUri, getTextDocument);
 }
-exports.markdownDocumentation = markdownDocumentation;
 function addMarkdownDocumentation(out, documentation, tags, fileNameToUri, getTextDocument) {
     if (documentation) {
         out += plainWithLinks(documentation, fileNameToUri, getTextDocument);
@@ -188,5 +188,4 @@ function addMarkdownDocumentation(out, documentation, tags, fileNameToUri, getTe
     }
     return out;
 }
-exports.addMarkdownDocumentation = addMarkdownDocumentation;
 //# sourceMappingURL=previewer.js.map

package/lib/utils/snippetForFunctionCall.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.snippetForFunctionCall = void 0;
+exports.snippetForFunctionCall = snippetForFunctionCall;
 const PConst = require("../protocol.const");
 function snippetForFunctionCall(item, displayParts) {
     if (item.insertText && typeof item.insertText !== 'string') {
@@ -28,7 +28,6 @@ function snippetForFunctionCall(item, displayParts) {
         return snippet;
     }
 }
-exports.snippetForFunctionCall = snippetForFunctionCall;
 function getParameterListParts(displayParts) {
     const parts = [];
     let isInMethod = false;

package/lib/utils/typeConverters.d.ts

@@ -1,5 +1,5 @@
 import type * as ts from 'typescript';
 export declare namespace SymbolKind {
-    function fromProtocolScriptElementKind(kind: ts.ScriptElementKind): 2 | 5 | 6 | 7 | 9 | 10 | 11 | 12 | 13 | 15 | 22 | 26;
+    function fromProtocolScriptElementKind(kind: ts.ScriptElementKind): 2 | 5 | 10 | 22 | 11 | 6 | 7 | 13 | 12 | 9 | 26 | 15;
 }
 //# sourceMappingURL=typeConverters.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.51",
+	"version": "0.0.53",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -30,18 +30,18 @@
 	"dependencies": {
 		"path-browserify": "^1.0.1",
 		"semver": "^7.5.4",
-		"typescript-auto-import-cache": "^0.3.1",
+		"typescript-auto-import-cache": "^0.3.3",
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-nls": "^5.2.0",
 		"vscode-uri": "^3.0.8"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.3.0"
+		"@volar/language-service": "~2.3.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "7af242537b552e0fb4391a38fdeb8115580085dc"
+	"gitHead": "8c61d6a8acc354e68c726727f72be7d318c583da"
 }