@volar/typescript 2.1.4 → 2.1.5-patch.2

package/lib/node/decorateLanguageService.js

@@ -29,19 +29,92 @@ function decorateLanguageService(files, languageService) {
         }
     };
     // methods
-    const { findReferences, findRenameLocations, getCompletionEntryDetails, getCompletionsAtPosition, getDefinitionAndBoundSpan, getDefinitionAtPosition, getFileReferences, getImplementationAtPosition, getQuickInfoAtPosition, getReferencesAtPosition, getSemanticDiagnostics, getSyntacticDiagnostics, getSuggestionDiagnostics, getTypeDefinitionAtPosition, getEncodedSemanticClassifications, getDocumentHighlights, getApplicableRefactors, getEditsForRefactor, getRenameInfo, getCodeFixesAtPosition, prepareCallHierarchy, provideCallHierarchyIncomingCalls, provideCallHierarchyOutgoingCalls, provideInlayHints, organizeImports, } = languageService;
+    const { findReferences, findRenameLocations, getCompletionEntryDetails, getCompletionsAtPosition, getDefinitionAndBoundSpan, getDefinitionAtPosition, getFileReferences, getFormattingEditsForDocument, getFormattingEditsForRange, getFormattingEditsAfterKeystroke, getImplementationAtPosition, getLinkedEditingRangeAtPosition, getQuickInfoAtPosition, getReferencesAtPosition, getSemanticDiagnostics, getSyntacticDiagnostics, getSuggestionDiagnostics, getTypeDefinitionAtPosition, getEncodedSemanticClassifications, getDocumentHighlights, getApplicableRefactors, getEditsForFileRename, getEditsForRefactor, getRenameInfo, getCodeFixesAtPosition, prepareCallHierarchy, provideCallHierarchyIncomingCalls, provideCallHierarchyOutgoingCalls, provideInlayHints, organizeImports, } = languageService;
+    languageService.getFormattingEditsForDocument = (fileName, options) => {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
+            if (!map.mappings.some(mapping => (0, language_core_1.isFormattingEnabled)(mapping.data))) {
+                return [];
+            }
+            const edits = getFormattingEditsForDocument(fileName, options);
+            return edits
+                .map(edit => (0, transform_1.transformTextChange)(sourceFile, map, edit, language_core_1.isFormattingEnabled))
+                .filter(utils_1.notEmpty);
+        }
+        else {
+            return getFormattingEditsForDocument(fileName, options);
+        }
+    };
+    languageService.getFormattingEditsForRange = (fileName, start, end, options) => {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
+            const generateStart = (0, transform_1.toGeneratedOffset)(sourceFile, map, start, language_core_1.isFormattingEnabled);
+            const generateEnd = (0, transform_1.toGeneratedOffset)(sourceFile, map, end, language_core_1.isFormattingEnabled);
+            if (generateStart !== undefined && generateEnd !== undefined) {
+                const edits = getFormattingEditsForRange(fileName, generateStart, generateEnd, options);
+                return edits
+                    .map(edit => (0, transform_1.transformTextChange)(sourceFile, map, edit, language_core_1.isFormattingEnabled))
+                    .filter(utils_1.notEmpty);
+            }
+            return [];
+        }
+        else {
+            return getFormattingEditsForRange(fileName, start, end, options);
+        }
+    };
+    languageService.getFormattingEditsAfterKeystroke = (fileName, position, key, options) => {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isFormattingEnabled);
+            if (generatePosition !== undefined) {
+                const edits = getFormattingEditsAfterKeystroke(fileName, generatePosition, key, options);
+                return edits
+                    .map(edit => (0, transform_1.transformTextChange)(sourceFile, map, edit, language_core_1.isFormattingEnabled))
+                    .filter(utils_1.notEmpty);
+            }
+            return [];
+        }
+        else {
+            return getFormattingEditsAfterKeystroke(fileName, position, key, options);
+        }
+    };
+    languageService.getEditsForFileRename = (oldFilePath, newFilePath, formatOptions, preferences) => {
+        const edits = getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences);
+        return edits
+            .map(edit => (0, transform_1.transformFileTextChanges)(files, edit, language_core_1.isCodeActionsEnabled))
+            .filter(utils_1.notEmpty);
+    };
+    languageService.getLinkedEditingRangeAtPosition = (fileName, position) => {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isLinkedEditingEnabled);
+            if (generatePosition !== undefined) {
+                const info = getLinkedEditingRangeAtPosition(fileName, generatePosition);
+                if (info) {
+                    return {
+                        ranges: info.ranges
+                            .map(span => (0, transform_1.transformTextSpan)(sourceFile, map, span, language_core_1.isLinkedEditingEnabled))
+                            .filter(utils_1.notEmpty),
+                        wordPattern: info.wordPattern,
+                    };
+                }
+            }
+        }
+        else {
+            return getLinkedEditingRangeAtPosition(fileName, position);
+        }
+    };
     languageService.prepareCallHierarchy = (fileName, position) => {
         const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualCode) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
-                    const item = prepareCallHierarchy(fileName, generateOffset + sourceFile.snapshot.getLength());
-                    if (Array.isArray(item)) {
-                        return item.map(item => (0, transform_1.transformCallHierarchyItem)(files, item, language_core_1.isCallHierarchyEnabled));
-                    }
-                    else if (item) {
-                        return (0, transform_1.transformCallHierarchyItem)(files, item, language_core_1.isCallHierarchyEnabled);
-                    }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isCallHierarchyEnabled);
+            if (generatePosition !== undefined) {
+                const item = prepareCallHierarchy(fileName, generatePosition);
+                if (Array.isArray(item)) {
+                    return item.map(item => (0, transform_1.transformCallHierarchyItem)(files, item, language_core_1.isCallHierarchyEnabled));
+                }
+                else if (item) {
+                    return (0, transform_1.transformCallHierarchyItem)(files, item, language_core_1.isCallHierarchyEnabled);
                 }
             }
         }
@@ -53,10 +126,9 @@ function decorateLanguageService(files, languageService) {
         let calls = [];
         const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualCode) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
-                    calls = provideCallHierarchyIncomingCalls(fileName, generateOffset + sourceFile.snapshot.getLength());
-                }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isCallHierarchyEnabled);
+            if (generatePosition !== undefined) {
+                calls = provideCallHierarchyIncomingCalls(fileName, generatePosition);
             }
         }
         else {
@@ -78,10 +150,9 @@ function decorateLanguageService(files, languageService) {
         let calls = [];
         const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualCode) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
-                    calls = provideCallHierarchyOutgoingCalls(fileName, generateOffset + sourceFile.snapshot.getLength());
-                }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isCallHierarchyEnabled);
+            if (generatePosition !== undefined) {
+                calls = provideCallHierarchyOutgoingCalls(fileName, generatePosition);
             }
         }
         else {
@@ -91,7 +162,9 @@ function decorateLanguageService(files, languageService) {
             .map(call => {
             const to = (0, transform_1.transformCallHierarchyItem)(files, call.to, language_core_1.isCallHierarchyEnabled);
             const fromSpans = call.fromSpans
-                .map(span => (0, transform_1.transformSpan)(files, fileName, span, language_core_1.isCallHierarchyEnabled)?.textSpan)
+                .map(span => sourceFile
+                ? (0, transform_1.transformTextSpan)(sourceFile, map, span, language_core_1.isCallHierarchyEnabled)
+                : span)
                 .filter(utils_1.notEmpty);
             return {
                 to,
@@ -109,17 +182,16 @@ function decorateLanguageService(files, languageService) {
     languageService.getQuickInfoAtPosition = (fileName, position) => {
         const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualCode) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isHoverEnabled)(mapping.data)) {
-                    const result = getQuickInfoAtPosition(fileName, generateOffset + sourceFile.snapshot.getLength());
-                    if (result) {
-                        const textSpan = (0, transform_1.transformSpan)(files, fileName, result.textSpan, language_core_1.isHoverEnabled)?.textSpan;
-                        if (textSpan) {
-                            return {
-                                ...result,
-                                textSpan,
-                            };
-                        }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isHoverEnabled);
+            if (generatePosition !== undefined) {
+                const result = getQuickInfoAtPosition(fileName, generatePosition);
+                if (result) {
+                    const textSpan = (0, transform_1.transformTextSpan)(sourceFile, map, result.textSpan, language_core_1.isHoverEnabled);
+                    if (textSpan) {
+                        return {
+                            ...result,
+                            textSpan,
+                        };
                     }
                 }
             }
@@ -160,16 +232,15 @@ function decorateLanguageService(files, languageService) {
     languageService.getApplicableRefactors = (fileName, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions) => {
         const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualCode) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos)) {
-                if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
-                    const por = typeof positionOrRange === 'number'
-                        ? generateOffset + sourceFile.snapshot.getLength()
-                        : {
-                            pos: generateOffset + sourceFile.snapshot.getLength(),
-                            end: generateOffset + positionOrRange.end - positionOrRange.pos + sourceFile.snapshot.getLength(),
-                        };
-                    return getApplicableRefactors(fileName, por, preferences, triggerReason, kind, includeInteractiveActions);
-                }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
+            if (generatePosition !== undefined) {
+                const por = typeof positionOrRange === 'number'
+                    ? generatePosition
+                    : {
+                        pos: generatePosition,
+                        end: generatePosition + positionOrRange.end - positionOrRange.pos,
+                    };
+                return getApplicableRefactors(fileName, por, preferences, triggerReason, kind, includeInteractiveActions);
             }
             return [];
         }
@@ -181,16 +252,17 @@ function decorateLanguageService(files, languageService) {
         let edits;
         const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualCode) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos)) {
-                if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
-                    const por = typeof positionOrRange === 'number'
-                        ? generateOffset + sourceFile.snapshot.getLength()
-                        : {
-                            pos: generateOffset + sourceFile.snapshot.getLength(),
-                            end: generateOffset + positionOrRange.end - positionOrRange.pos + sourceFile.snapshot.getLength(),
-                        };
-                    edits = getEditsForRefactor(fileName, formatOptions, por, refactorName, actionName, preferences);
-                }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, typeof positionOrRange === 'number'
+                ? positionOrRange
+                : positionOrRange.pos, language_core_1.isCodeActionsEnabled);
+            if (generatePosition !== undefined) {
+                const por = typeof positionOrRange === 'number'
+                    ? generatePosition
+                    : {
+                        pos: generatePosition,
+                        end: generatePosition + positionOrRange.end - positionOrRange.pos,
+                    };
+                edits = getEditsForRefactor(fileName, formatOptions, por, refactorName, actionName, preferences);
             }
         }
         else {
@@ -206,20 +278,19 @@ function decorateLanguageService(files, languageService) {
     languageService.getRenameInfo = (fileName, position, options) => {
         const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualCode) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isRenameEnabled)(mapping.data)) {
-                    const info = getRenameInfo(fileName, generateOffset + sourceFile.snapshot.getLength(), options);
-                    if (info.canRename) {
-                        const span = (0, transform_1.transformSpan)(files, fileName, info.triggerSpan, language_core_1.isRenameEnabled);
-                        if (span) {
-                            info.triggerSpan = span.textSpan;
-                            return info;
-                        }
-                    }
-                    else {
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isRenameEnabled);
+            if (generatePosition !== undefined) {
+                const info = getRenameInfo(fileName, generatePosition, options);
+                if (info.canRename) {
+                    const span = (0, transform_1.transformTextSpan)(sourceFile, map, info.triggerSpan, language_core_1.isRenameEnabled);
+                    if (span) {
+                        info.triggerSpan = span;
                         return info;
                     }
                 }
+                else {
+                    return info;
+                }
             }
             return {
                 canRename: false,
@@ -234,16 +305,10 @@ function decorateLanguageService(files, languageService) {
         let fixes = [];
         const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualCode) {
-            for (const [generateStart, mapping] of map.getGeneratedOffsets(start)) {
-                if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
-                    for (const [generateEnd, mapping] of map.getGeneratedOffsets(end)) {
-                        if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
-                            fixes = getCodeFixesAtPosition(fileName, generateStart + sourceFile.snapshot.getLength(), generateEnd + sourceFile.snapshot.getLength(), errorCodes, formatOptions, preferences);
-                            break;
-                        }
-                    }
-                    break;
-                }
+            const generateStart = (0, transform_1.toGeneratedOffset)(sourceFile, map, start, language_core_1.isCodeActionsEnabled);
+            const generateEnd = (0, transform_1.toGeneratedOffset)(sourceFile, map, end, language_core_1.isCodeActionsEnabled);
+            if (generateStart !== undefined && generateEnd !== undefined) {
+                fixes = getCodeFixesAtPosition(fileName, generateStart, generateEnd, errorCodes, formatOptions, preferences);
             }
         }
         else {
@@ -277,16 +342,10 @@ function decorateLanguageService(files, languageService) {
             const result = getEncodedSemanticClassifications(fileName, { start, length: end - start }, format);
             const spans = [];
             for (let i = 0; i < result.spans.length; i += 3) {
-                for (const [sourceStart, mapping] of map.getSourceOffsets(result.spans[i] - sourceFile.snapshot.getLength())) {
-                    if ((0, language_core_1.isSemanticTokensEnabled)(mapping.data)) {
-                        for (const [sourceEnd, mapping] of map.getSourceOffsets(result.spans[i] + result.spans[i + 1] - sourceFile.snapshot.getLength())) {
-                            if ((0, language_core_1.isSemanticTokensEnabled)(mapping.data)) {
-                                spans.push(sourceStart, sourceEnd - sourceStart, result.spans[i + 2]);
-                                break;
-                            }
-                        }
-                        break;
-                    }
+                const sourceStart = (0, transform_1.toSourceOffset)(sourceFile, map, result.spans[i], language_core_1.isSemanticTokensEnabled);
+                const sourceEnd = (0, transform_1.toSourceOffset)(sourceFile, map, result.spans[i] + result.spans[i + 1], language_core_1.isSemanticTokensEnabled);
+                if (sourceStart !== undefined && sourceEnd !== undefined) {
+                    spans.push(sourceStart, sourceEnd - sourceStart, result.spans[i + 2]);
                 }
             }
             result.spans = spans;
@@ -423,24 +482,29 @@ function decorateLanguageService(files, languageService) {
         if (virtualCode) {
             let mainResult;
             let additionalResults = [];
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
-                    const isAdditional = typeof mapping.data.completion === 'object' && mapping.data.completion.isAdditional;
-                    if (!isAdditional && mainResult) {
-                        continue;
+            let isAdditional;
+            const generatedOffset = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, data => {
+                if (!(0, language_core_1.isCompletionEnabled)(data)) {
+                    return false;
+                }
+                isAdditional = typeof data.completion === 'object' && data.completion.isAdditional;
+                if (!isAdditional && mainResult) {
+                    return false;
+                }
+                return true;
+            });
+            if (generatedOffset !== undefined) {
+                const result = getCompletionsAtPosition(fileName, generatedOffset, options, formattingSettings);
+                if (result) {
+                    for (const entry of result.entries) {
+                        entry.replacementSpan = entry.replacementSpan && (0, transform_1.transformTextSpan)(sourceFile, map, entry.replacementSpan, language_core_1.isCompletionEnabled);
                     }
-                    const result = getCompletionsAtPosition(fileName, generateOffset + sourceFile.snapshot.getLength(), options, formattingSettings);
-                    if (result) {
-                        for (const entry of result.entries) {
-                            entry.replacementSpan = (0, transform_1.transformSpan)(files, fileName, entry.replacementSpan, language_core_1.isCompletionEnabled)?.textSpan;
-                        }
-                        result.optionalReplacementSpan = (0, transform_1.transformSpan)(files, fileName, result.optionalReplacementSpan, language_core_1.isCompletionEnabled)?.textSpan;
-                        if (isAdditional) {
-                            additionalResults.push(result);
-                        }
-                        else {
-                            mainResult = result;
-                        }
+                    result.optionalReplacementSpan = result.optionalReplacementSpan && (0, transform_1.transformTextSpan)(sourceFile, map, result.optionalReplacementSpan, language_core_1.isCompletionEnabled);
+                    if (isAdditional) {
+                        additionalResults.push(result);
+                    }
+                    else {
+                        mainResult = result;
                     }
                 }
             }
@@ -465,11 +529,9 @@ function decorateLanguageService(files, languageService) {
         let details;
         const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualCode) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-                if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
-                    details = getCompletionEntryDetails(fileName, generateOffset + sourceFile.snapshot.getLength(), entryName, formatOptions, source, preferences, data);
-                    break;
-                }
+            const generatePosition = (0, transform_1.toGeneratedOffset)(sourceFile, map, position, language_core_1.isCompletionEnabled);
+            if (generatePosition !== undefined) {
+                details = getCompletionEntryDetails(fileName, generatePosition, entryName, formatOptions, source, preferences, data);
             }
         }
         else {
@@ -504,14 +566,12 @@ function decorateLanguageService(files, languageService) {
             const result = provideInlayHints(fileName, { start, length: end - start }, preferences);
             const hints = [];
             for (const hint of result) {
-                for (const [sourcePosition, mapping] of map.getSourceOffsets(hint.position - sourceFile.snapshot.getLength())) {
-                    if ((0, language_core_1.isInlayHintsEnabled)(mapping.data)) {
-                        hints.push({
-                            ...hint,
-                            position: sourcePosition,
-                        });
-                        break;
-                    }
+                const sourcePosition = (0, transform_1.toSourceOffset)(sourceFile, map, hint.position, language_core_1.isInlayHintsEnabled);
+                if (sourcePosition !== undefined) {
+                    hints.push({
+                        ...hint,
+                        position: sourcePosition,
+                    });
                 }
             }
             return hints;
@@ -532,9 +592,9 @@ function decorateLanguageService(files, languageService) {
         const processedFilePositions = new Set();
         const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualCode) {
-            for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
+            for (const [generatedOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if (filter(mapping.data)) {
-                    process(fileName, generateOffset + sourceFile.snapshot.getLength());
+                    process(fileName, generatedOffset + sourceFile.snapshot.getLength());
                 }
             }
         }

package/lib/node/decorateLanguageServiceHost.js

@@ -58,28 +58,24 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
         };
     }
     languageServiceHost.getScriptSnapshot = fileName => {
-        if (exts.some(ext => fileName.endsWith(ext))) {
-            updateScript(fileName);
-            return scripts.get(fileName)?.snapshot;
+        const virtualScript = updateVirtualScript(fileName);
+        if (virtualScript) {
+            return virtualScript.snapshot;
         }
         return getScriptSnapshot(fileName);
     };
     if (getScriptKind) {
         languageServiceHost.getScriptKind = fileName => {
-            if (exts.some(ext => fileName.endsWith(ext))) {
-                updateScript(fileName);
-                const script = scripts.get(fileName);
-                if (script) {
-                    return script.kind;
-                }
-                return ts.ScriptKind.Deferred;
+            const virtualScript = updateVirtualScript(fileName);
+            if (virtualScript) {
+                return virtualScript.kind;
             }
             return getScriptKind(fileName);
         };
     }
-    function updateScript(fileName) {
+    function updateVirtualScript(fileName) {
         const version = languageServiceHost.getScriptVersion(fileName);
-        if (version !== scripts.get(fileName)?.version) {
+        if (version !== scripts.get(fileName)?.[0]) {
             let extension = '.ts';
             let snapshotSnapshot;
             let scriptKind = ts.ScriptKind.TS;
@@ -106,14 +102,18 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
                 extraProjectVersion++;
                 virtualFiles.delete(fileName);
             }
-            scripts.set(fileName, {
-                version,
-                extension,
-                snapshot: snapshotSnapshot,
-                kind: scriptKind,
-            });
+            if (snapshotSnapshot) {
+                scripts.set(fileName, [
+                    version,
+                    {
+                        extension,
+                        snapshot: snapshotSnapshot,
+                        kind: scriptKind,
+                    }
+                ]);
+            }
         }
-        return scripts.get(fileName);
+        return scripts.get(fileName)?.[1];
     }
 }
 exports.decorateLanguageServiceHost = decorateLanguageServiceHost;

package/lib/node/transform.d.ts

@@ -1,4 +1,4 @@
-import { FileRegistry, CodeInformation } from '@volar/language-core';
+import { FileRegistry, CodeInformation, SourceMap, SourceFile } from '@volar/language-core';
 import type * as ts from 'typescript';
 export declare function transformCallHierarchyItem(files: FileRegistry, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
 export declare function transformDiagnostic<T extends ts.Diagnostic>(files: FileRegistry, diagnostic: T): T | undefined;
@@ -8,3 +8,7 @@ export declare function transformSpan(files: FileRegistry, fileName: string | un
     fileName: string;
     textSpan: ts.TextSpan;
 } | undefined;
+export declare function transformTextChange(sourceFile: SourceFile, map: SourceMap<CodeInformation>, textChange: ts.TextChange, filter: (data: CodeInformation) => boolean): ts.TextChange | undefined;
+export declare function transformTextSpan(sourceFile: SourceFile, map: SourceMap<CodeInformation>, textSpan: ts.TextSpan, filter: (data: CodeInformation) => boolean): ts.TextSpan | undefined;
+export declare function toSourceOffset(sourceFile: SourceFile, map: SourceMap, position: number, filter: (data: CodeInformation) => boolean): number | undefined;
+export declare function toGeneratedOffset(sourceFile: SourceFile, map: SourceMap, position: number, filter: (data: CodeInformation) => boolean): number | undefined;

package/lib/node/transform.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
+exports.toGeneratedOffset = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
 const language_core_1 = require("@volar/language-core");
 const utils_1 = require("./utils");
 const transformedDiagnostics = new WeakMap();
@@ -28,12 +28,12 @@ function transformDiagnostic(files, diagnostic) {
             && diagnostic.length !== undefined) {
             const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, diagnostic.file.fileName);
             if (virtualCode) {
-                const sourceRange = transformRange(sourceFile, map, diagnostic.start, diagnostic.start + diagnostic.length, language_core_1.shouldReportDiagnostics);
-                if (sourceRange) {
+                const sourceSpan = transformTextSpan(sourceFile, map, { start: diagnostic.start, length: diagnostic.length }, language_core_1.shouldReportDiagnostics);
+                if (sourceSpan) {
                     transformedDiagnostics.set(diagnostic, {
                         ...diagnostic,
-                        start: sourceRange[0],
-                        length: sourceRange[1] - sourceRange[0],
+                        start: sourceSpan.start,
+                        length: sourceSpan.length,
                     });
                 }
             }
@@ -98,22 +98,16 @@ function transformDocumentSpan(files, documentSpan, filter, shouldFallback) {
 }
 exports.transformDocumentSpan = transformDocumentSpan;
 function transformSpan(files, fileName, textSpan, filter) {
-    if (!fileName) {
-        return;
-    }
-    if (!textSpan) {
+    if (!fileName || !textSpan) {
         return;
     }
     const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
     if (virtualFile) {
-        const sourceRange = transformRange(sourceFile, map, textSpan.start, textSpan.start + textSpan.length, filter);
-        if (sourceRange) {
+        const sourceSpan = transformTextSpan(sourceFile, map, textSpan, filter);
+        if (sourceSpan) {
             return {
                 fileName,
-                textSpan: {
-                    start: sourceRange[0],
-                    length: sourceRange[1] - sourceRange[0],
-                },
+                textSpan: sourceSpan,
             };
         }
     }
@@ -125,15 +119,43 @@ function transformSpan(files, fileName, textSpan, filter) {
     }
 }
 exports.transformSpan = transformSpan;
-function transformRange(sourceFile, map, start, end, filter) {
-    for (const sourceStart of map.getSourceOffsets(start - sourceFile.snapshot.getLength())) {
-        if (filter(sourceStart[1].data)) {
-            for (const sourceEnd of map.getSourceOffsets(end - sourceFile.snapshot.getLength())) {
-                if (sourceEnd[0] >= sourceStart[0] && filter(sourceEnd[1].data)) {
-                    return [sourceStart[0], sourceEnd[0]];
-                }
-            }
+function transformTextChange(sourceFile, map, textChange, filter) {
+    const sourceSpan = transformTextSpan(sourceFile, map, textChange.span, filter);
+    if (sourceSpan) {
+        return {
+            newText: textChange.newText,
+            span: sourceSpan,
+        };
+    }
+}
+exports.transformTextChange = transformTextChange;
+function transformTextSpan(sourceFile, map, textSpan, filter) {
+    const start = textSpan.start;
+    const end = textSpan.start + textSpan.length;
+    const sourceStart = toSourceOffset(sourceFile, map, start, filter);
+    const sourceEnd = toSourceOffset(sourceFile, map, end, filter);
+    if (sourceStart !== undefined && sourceEnd !== undefined && sourceEnd >= sourceStart) {
+        return {
+            start: sourceStart,
+            length: sourceEnd - sourceStart,
+        };
+    }
+}
+exports.transformTextSpan = transformTextSpan;
+function toSourceOffset(sourceFile, map, position, filter) {
+    for (const [sourceOffset, mapping] of map.getSourceOffsets(position - sourceFile.snapshot.getLength())) {
+        if (filter(mapping.data)) {
+            return sourceOffset;
+        }
+    }
+}
+exports.toSourceOffset = toSourceOffset;
+function toGeneratedOffset(sourceFile, map, position, filter) {
+    for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
+        if (filter(mapping.data)) {
+            return generateOffset + sourceFile.snapshot.getLength();
         }
     }
 }
+exports.toGeneratedOffset = toGeneratedOffset;
 //# sourceMappingURL=transform.js.map

package/lib/protocol/createSys.js

@@ -17,36 +17,31 @@ function createSys(ts, env, currentDirectory) {
     };
     const promises = new Set();
     const fileWatcher = env.onDidChangeWatchedFiles?.(({ changes }) => {
+        version++;
         for (const change of changes) {
             const fileName = env.typescript.uriToFileName(change.uri);
             const dirName = path.dirname(fileName);
             const baseName = path.basename(fileName);
-            const dir = getDir(dirName);
-            if (dir.files.has(baseName) || dir.requestedRead) { // is requested file or directory
-                version++;
-                if (change.type === 1 || change.type === 2) {
-                    dir.files.set(normalizeFileId(baseName), {
-                        name: baseName,
-                        stat: {
-                            type: 1,
-                            ctime: Date.now(),
-                            mtime: Date.now(),
-                            size: -1,
-                        },
-                        requestedStat: false,
-                        requestedText: false,
-                    });
-                }
-                else if (change.type === 3) {
-                    dir.files.set(normalizeFileId(baseName), {
-                        name: baseName,
-                        stat: undefined,
-                        text: undefined,
-                        requestedStat: true,
-                        requestedText: true,
-                    });
-                }
-            }
+            const fileExists = change.type === 1
+                || change.type === 2;
+            const dir = getDir(dirName, fileExists);
+            dir.files.set(normalizeFileId(baseName), fileExists ? {
+                name: baseName,
+                stat: {
+                    type: 1,
+                    ctime: Date.now(),
+                    mtime: Date.now(),
+                    size: -1,
+                },
+                requestedStat: false,
+                requestedText: false,
+            } : {
+                name: baseName,
+                stat: undefined,
+                text: undefined,
+                requestedStat: true,
+                requestedText: true,
+            });
         }
     });
     return {
@@ -335,7 +330,7 @@ function createSys(ts, env, currentDirectory) {
         }
         return updated;
     }
-    function getDir(dirName) {
+    function getDir(dirName, markExists = false) {
         const dirNames = [];
         let currentDirPath = dirName;
         let currentDirName = path.basename(currentDirPath);
@@ -350,6 +345,10 @@ function createSys(ts, env, currentDirectory) {
         for (let i = dirNames.length - 1; i >= 0; i--) {
             const nextDirName = dirNames[i];
             currentDir = getDirFromDir(currentDir, nextDirName);
+            if (markExists && !currentDir.exists) {
+                currentDir.exists = true;
+                version++;
+            }
         }
         return currentDir;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.1.4",
+	"version": "2.1.5-patch.2",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,13 +12,12 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.1.4",
+		"@volar/language-core": "2.1.5",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.1.4"
-	},
-	"gitHead": "cc46289ff6be015ee41a1896fdaef6aa68cee755"
+		"@volar/language-service": "2.1.5"
+	}
 }