@astrojs/language-server 0.23.2 → 0.24.1

package/dist/plugins/typescript/features/CompletionsProvider.js

@@ -1,47 +1,41 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.codeActionChangeToTextEdit = exports.CompletionsProviderImpl = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
-const utils_1 = require("../../../core/documents/utils");
 const documents_1 = require("../../../core/documents");
-const typescript_1 = __importStar(require("typescript"));
-const vscode_languageserver_2 = require("vscode-languageserver");
-const utils_2 = require("../utils");
-const utils_3 = require("../../../utils");
+const utils_1 = require("../../../core/documents/utils");
+const utils_2 = require("../../../utils");
 const previewer_1 = require("../previewer");
+const utils_3 = require("../utils");
 const utils_4 = require("./utils");
 // `import {...} from '..'` or `import ... from '..'`
 // Note: Does not take into account if import is within a comment.
 const scriptImportRegex = /\bimport\s+{([^}]*?)}\s+?from\s+['"`].+?['"`]|\bimport\s+(\w+?)\s+from\s+['"`].+?['"`]/g;
+// When Svelte components are imported, we have to reference the svelte2tsx's types to properly type the component
+// An unfortunate downside of this is that it polutes completions, so let's filter those internal types manually
+const svelte2tsxTypes = new Set([
+    'Svelte2TsxComponent',
+    'Svelte2TsxComponentConstructorParameters',
+    'SvelteComponentConstructor',
+    'SvelteActionReturnType',
+    'SvelteTransitionConfig',
+    'SvelteTransitionReturnType',
+    'SvelteAnimationReturnType',
+    'SvelteWithOptionalProps',
+    'SvelteAllProps',
+    'SveltePropsAnyFallback',
+    'SvelteSlotsAnyFallback',
+    'SvelteRestProps',
+    'SvelteSlots',
+    'SvelteStore',
+]);
 class CompletionsProviderImpl {
     constructor(languageServiceManager, configManager) {
         this.languageServiceManager = languageServiceManager;
         this.configManager = configManager;
         this.validTriggerCharacters = ['.', '"', "'", '`', '/', '@', '<', '#'];
+        this.ts = languageServiceManager.docContext.ts;
     }
     isValidTriggerCharacter(character) {
         return this.validTriggerCharacters.includes(character);
@@ -65,7 +59,7 @@ class CompletionsProviderImpl {
         const offset = document.offsetAt(position);
         const node = html.findNodeAt(offset);
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        let filePath = (0, utils_2.toVirtualAstroFilePath)(tsDoc.filePath);
+        let filePath = (0, utils_3.toVirtualAstroFilePath)(tsDoc.filePath);
         let completions;
         const isCompletionInsideFrontmatter = (0, utils_1.isInsideFrontmatter)(document.getText(), offset);
         const isCompletionInsideExpression = (0, utils_1.isInsideExpression)(document.getText(), node.start, offset);
@@ -73,7 +67,7 @@ class CompletionsProviderImpl {
         const formatOptions = await this.configManager.getTSFormatConfig(document);
         let scriptTagIndex = undefined;
         if (node.tag === 'script') {
-            const { filePath: scriptFilePath, offset: scriptOffset, index: scriptIndex, } = (0, utils_2.getScriptTagSnapshot)(tsDoc, document, node, position);
+            const { filePath: scriptFilePath, offset: scriptOffset, index: scriptIndex, } = (0, utils_3.getScriptTagSnapshot)(tsDoc, document, node, position);
             filePath = scriptFilePath;
             scriptTagIndex = scriptIndex;
             completions = lang.getCompletionsAtPosition(scriptFilePath, scriptOffset, {
@@ -114,11 +108,11 @@ class CompletionsProviderImpl {
         const fragment = await tsDoc.createFragment();
         const existingImports = this.getExistingImports(document);
         const completionItems = completions.entries
-            .filter(isValidCompletion)
+            .filter((completion) => this.isValidCompletion(completion, this.ts))
             .map((entry) => this.toCompletionItem(fragment, entry, filePath, offset, isCompletionInsideFrontmatter, scriptTagIndex, existingImports))
-            .filter(utils_3.isNotNullOrUndefined)
+            .filter(utils_2.isNotNullOrUndefined)
             .map((comp) => this.fixTextEditRange(wordRangeStartPosition, comp));
-        const completionList = vscode_languageserver_2.CompletionList.create(completionItems, true);
+        const completionList = vscode_languageserver_1.CompletionList.create(completionItems, true);
         this.lastCompletion = { key: document.getFilePath() || '', position, completionList };
         return completionList;
     }
@@ -151,7 +145,7 @@ class CompletionsProviderImpl {
         const isInsideScriptTag = data.scriptTagIndex !== undefined;
         let scriptTagSnapshot;
         if (isInsideScriptTag) {
-            const { snapshot } = (0, utils_2.getScriptTagSnapshot)(tsDoc, document, document.scriptTags[data.scriptTagIndex].container);
+            const { snapshot } = (0, utils_3.getScriptTagSnapshot)(tsDoc, document, document.scriptTags[data.scriptTagIndex].container);
             scriptTagSnapshot = snapshot;
         }
         if (actions) {
@@ -163,7 +157,7 @@ class CompletionsProviderImpl {
                             textChange.span.start = fragment.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(textChange.span.start)));
                         });
                     }
-                    edit.push(...change.textChanges.map((textChange) => codeActionChangeToTextEdit(document, fragment, isInsideScriptTag, textChange)));
+                    edit.push(...change.textChanges.map((textChange) => codeActionChangeToTextEdit(document, fragment, isInsideScriptTag, textChange, this.ts)));
                 }
             }
             item.additionalTextEdits = (item.additionalTextEdits ?? []).concat(edit);
@@ -179,13 +173,13 @@ class CompletionsProviderImpl {
             return null;
         }
         if (isAstroComponent) {
-            item.label = (0, utils_2.removeAstroComponentSuffix)(comp.name);
+            item.label = (0, utils_3.removeAstroComponentSuffix)(comp.name);
             // Set component imports as file completion, that way we get cool icons
             item.kind = vscode_languageserver_protocol_1.CompletionItemKind.File;
             item.detail = comp.data?.moduleSpecifier;
         }
         else {
-            item.kind = (0, utils_2.scriptElementKindToCompletionItemKind)(comp.kind);
+            item.kind = (0, utils_3.scriptElementKindToCompletionItemKind)(comp.kind, this.ts);
         }
         // TS may suggest another component even if there already exists an import with the same.
         // This happens because internally, components get suffixed with __AstroComponent_
@@ -194,7 +188,7 @@ class CompletionsProviderImpl {
         }
         if (comp.kindModifiers) {
             const kindModifiers = new Set(comp.kindModifiers.split(/,|\s+/g));
-            if (kindModifiers.has(typescript_1.ScriptElementKindModifier.optionalModifier)) {
+            if (kindModifiers.has(this.ts.ScriptElementKindModifier.optionalModifier)) {
                 if (!item.insertText) {
                     item.insertText = item.label;
                 }
@@ -203,7 +197,7 @@ class CompletionsProviderImpl {
                 }
                 item.label += '?';
             }
-            if (kindModifiers.has(typescript_1.ScriptElementKindModifier.deprecatedModifier)) {
+            if (kindModifiers.has(this.ts.ScriptElementKindModifier.deprecatedModifier)) {
                 item.tags = [vscode_languageserver_1.CompletionItemTag.Deprecated];
             }
         }
@@ -211,14 +205,14 @@ class CompletionsProviderImpl {
         // if (comp.sourceDisplay) {
         // 	item.labelDetails = { description: ts.displayPartsToString(comp.sourceDisplay) };
         // }
-        item.commitCharacters = (0, utils_2.getCommitCharactersForScriptElement)(comp.kind);
+        item.commitCharacters = (0, utils_3.getCommitCharactersForScriptElement)(comp.kind, this.ts);
         item.sortText = comp.sortText;
         item.preselect = comp.isRecommended;
         if (comp.replacementSpan) {
-            item.insertText = comp.insertText ? (0, utils_2.removeAstroComponentSuffix)(comp.insertText) : undefined;
+            item.insertText = comp.insertText ? (0, utils_3.removeAstroComponentSuffix)(comp.insertText) : undefined;
             item.insertTextFormat = comp.isSnippet ? vscode_languageserver_1.InsertTextFormat.Snippet : vscode_languageserver_1.InsertTextFormat.PlainText;
             item.textEdit = comp.replacementSpan
-                ? vscode_languageserver_1.TextEdit.replace((0, utils_2.convertRange)(fragment, comp.replacementSpan), item.insertText ?? item.label)
+                ? vscode_languageserver_1.TextEdit.replace((0, utils_3.convertRange)(fragment, comp.replacementSpan), item.insertText ?? item.label)
                 : undefined;
         }
         return {
@@ -234,14 +228,14 @@ class CompletionsProviderImpl {
     }
     getCompletionDocument(compDetail) {
         const { sourceDisplay, documentation: tsDocumentation, displayParts } = compDetail;
-        let detail = (0, utils_2.removeAstroComponentSuffix)(typescript_1.default.displayPartsToString(displayParts));
+        let detail = (0, utils_3.removeAstroComponentSuffix)(this.ts.displayPartsToString(displayParts));
         if (sourceDisplay) {
-            const importPath = typescript_1.default.displayPartsToString(sourceDisplay);
+            const importPath = this.ts.displayPartsToString(sourceDisplay);
             detail = importPath;
         }
         const documentation = {
             kind: 'markdown',
-            value: (0, previewer_1.getMarkdownDocumentation)(tsDocumentation, compDetail.tags),
+            value: (0, previewer_1.getMarkdownDocumentation)(tsDocumentation, compDetail.tags, this.ts),
         };
         return {
             documentation,
@@ -290,29 +284,39 @@ class CompletionsProviderImpl {
                 (triggerCharacter === '.' && (0, utils_4.isPartOfImportStatement)(document.getText(), position))));
     }
     getExistingImports(document) {
-        const rawImports = (0, utils_3.getRegExpMatches)(scriptImportRegex, document.getText()).map((match) => (match[1] ?? match[2]).split(','));
+        const rawImports = (0, utils_2.getRegExpMatches)(scriptImportRegex, document.getText()).map((match) => (match[1] ?? match[2]).split(','));
         const tidiedImports = rawImports.flat().map((match) => match.trim());
         return new Set(tidiedImports);
     }
     isAstroComponentImport(className) {
         return className.endsWith('__AstroComponent_');
     }
+    isValidCompletion(completion, ts) {
+        // Remove completion for default exported function
+        const isDefaultExport = completion.name === 'default' && completion.kindModifiers == ts.ScriptElementKindModifier.exportedModifier;
+        // Remove completion for svelte2tsx internal types
+        const isSvelte2tsxCompletion = completion.name.startsWith('__sveltets_') || svelte2tsxTypes.has(completion.name);
+        if (isDefaultExport || isSvelte2tsxCompletion) {
+            return false;
+        }
+        return true;
+    }
 }
 exports.CompletionsProviderImpl = CompletionsProviderImpl;
-function codeActionChangeToTextEdit(document, fragment, isInsideScriptTag, change) {
-    change.newText = (0, utils_2.removeAstroComponentSuffix)(change.newText);
+function codeActionChangeToTextEdit(document, fragment, isInsideScriptTag, change, ts) {
+    change.newText = (0, utils_3.removeAstroComponentSuffix)(change.newText);
     const { span } = change;
     let range;
-    const virtualRange = (0, utils_2.convertRange)(fragment, span);
+    const virtualRange = (0, utils_3.convertRange)(fragment, span);
     range = (0, documents_1.mapRangeToOriginal)(fragment, virtualRange);
     if (!isInsideScriptTag) {
         // If we don't have a frontmatter already, create one with the import
         const frontmatterState = document.astroMeta.frontmatter.state;
         if (frontmatterState === null) {
-            return vscode_languageserver_1.TextEdit.replace(vscode_languageserver_1.Range.create(vscode_languageserver_1.Position.create(0, 0), vscode_languageserver_1.Position.create(0, 0)), `---${typescript_1.default.sys.newLine}${change.newText}---${typescript_1.default.sys.newLine}${typescript_1.default.sys.newLine}`);
+            return vscode_languageserver_1.TextEdit.replace(vscode_languageserver_1.Range.create(vscode_languageserver_1.Position.create(0, 0), vscode_languageserver_1.Position.create(0, 0)), `---${ts.sys.newLine}${change.newText}---${ts.sys.newLine}${ts.sys.newLine}`);
         }
         if (!(0, utils_1.isInsideFrontmatter)(document.getText(), document.offsetAt(range.start))) {
-            range = (0, utils_2.ensureFrontmatterInsert)(range, document);
+            range = (0, utils_3.ensureFrontmatterInsert)(range, document);
         }
         // First import in a file will wrongly have a newline before it due to how the frontmatter is replaced by a comment
         if (range.start.line === 1 && (change.newText.startsWith('\n') || change.newText.startsWith('\r\n'))) {
@@ -324,37 +328,9 @@ function codeActionChangeToTextEdit(document, fragment, isInsideScriptTag, chang
         const isNewImport = !existingLine.trim().startsWith('import');
         // Avoid putting new imports on the same line as the script tag opening
         if (!(change.newText.startsWith('\n') || change.newText.startsWith('\r\n')) && isNewImport) {
-            change.newText = typescript_1.default.sys.newLine + change.newText;
+            change.newText = ts.sys.newLine + change.newText;
         }
     }
     return vscode_languageserver_1.TextEdit.replace(range, change.newText);
 }
 exports.codeActionChangeToTextEdit = codeActionChangeToTextEdit;
-// When Svelte components are imported, we have to reference the svelte2tsx's types to properly type the component
-// An unfortunate downside of this is that it polutes completions, so let's filter those internal types manually
-const svelte2tsxTypes = new Set([
-    'Svelte2TsxComponent',
-    'Svelte2TsxComponentConstructorParameters',
-    'SvelteComponentConstructor',
-    'SvelteActionReturnType',
-    'SvelteTransitionConfig',
-    'SvelteTransitionReturnType',
-    'SvelteAnimationReturnType',
-    'SvelteWithOptionalProps',
-    'SvelteAllProps',
-    'SveltePropsAnyFallback',
-    'SvelteSlotsAnyFallback',
-    'SvelteRestProps',
-    'SvelteSlots',
-    'SvelteStore',
-]);
-function isValidCompletion(completion) {
-    // Remove completion for default exported function
-    const isDefaultExport = completion.name === 'default' && completion.kindModifiers == typescript_1.ScriptElementKindModifier.exportedModifier;
-    // Remove completion for svelte2tsx internal types
-    const isSvelte2tsxCompletion = completion.name.startsWith('__sveltets_') || svelte2tsxTypes.has(completion.name);
-    if (isDefaultExport || isSvelte2tsxCompletion) {
-        return false;
-    }
-    return true;
-}

package/dist/plugins/typescript/features/DefinitionsProvider.d.ts

@@ -1,7 +1,7 @@
-import { Position, LocationLink } from 'vscode-languageserver-types';
-import { AstroDocument } from '../../../core/documents';
-import { DefinitionsProvider } from '../../interfaces';
-import { LanguageServiceManager } from '../LanguageServiceManager';
+import { LocationLink, Position } from 'vscode-languageserver-types';
+import type { AstroDocument } from '../../../core/documents';
+import type { DefinitionsProvider } from '../../interfaces';
+import type { LanguageServiceManager } from '../LanguageServiceManager';
 export declare class DefinitionsProviderImpl implements DefinitionsProvider {
     private languageServiceManager;
     constructor(languageServiceManager: LanguageServiceManager);

package/dist/plugins/typescript/features/DiagnosticsProvider.d.ts

@@ -1,8 +1,8 @@
-import { CancellationToken } from 'vscode-languageserver';
+import { CancellationToken, DiagnosticSeverity } from 'vscode-languageserver';
 import { Diagnostic } from 'vscode-languageserver-types';
 import { AstroDocument } from '../../../core/documents';
-import { DiagnosticsProvider } from '../../interfaces';
-import { LanguageServiceManager } from '../LanguageServiceManager';
+import type { DiagnosticsProvider } from '../../interfaces';
+import type { LanguageServiceManager } from '../LanguageServiceManager';
 export declare enum DiagnosticCodes {
     SPREAD_EXPECTED = 1005,
     IS_NOT_A_MODULE = 2306,
@@ -15,8 +15,10 @@ export declare enum DiagnosticCodes {
     JSX_ELEMENT_NO_CALL = 2604
 }
 export declare class DiagnosticsProviderImpl implements DiagnosticsProvider {
-    private readonly languageServiceManager;
+    private languageServiceManager;
+    private ts;
     constructor(languageServiceManager: LanguageServiceManager);
     getDiagnostics(document: AstroDocument, _cancellationToken?: CancellationToken): Promise<Diagnostic[]>;
     private getTagBoundaries;
+    mapSeverity(category: ts.DiagnosticCategory): DiagnosticSeverity;
 }

package/dist/plugins/typescript/features/DiagnosticsProvider.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiagnosticsProviderImpl = exports.DiagnosticCodes = void 0;
-const typescript_1 = __importDefault(require("typescript"));
+const vscode_languageserver_1 = require("vscode-languageserver");
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const documents_1 = require("../../../core/documents");
 const utils_1 = require("../utils");
@@ -25,6 +22,7 @@ var DiagnosticCodes;
 class DiagnosticsProviderImpl {
     constructor(languageServiceManager) {
         this.languageServiceManager = languageServiceManager;
+        this.ts = languageServiceManager.docContext.ts;
     }
     async getDiagnostics(document, _cancellationToken) {
         // Don't return diagnostics for files inside node_modules. These are considered read-only
@@ -47,9 +45,9 @@ class DiagnosticsProviderImpl {
                 // file due to some internal cache inside TS that would cause it to being mapped twice in some cases
                 .map((diagnostic) => ({
                 range: (0, utils_1.convertRange)(scriptTagSnapshot, diagnostic),
-                severity: (0, utils_1.mapSeverity)(diagnostic.category),
+                severity: this.mapSeverity(diagnostic.category),
                 source: 'ts',
-                message: typescript_1.default.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
+                message: this.ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
                 code: diagnostic.code,
                 tags: getDiagnosticTag(diagnostic),
             }))
@@ -62,15 +60,15 @@ class DiagnosticsProviderImpl {
             ...lang.getSuggestionDiagnostics(filePath),
             ...lang.getSemanticDiagnostics(filePath),
         ].filter((diag) => {
-            return isNoWithinBoundary(scriptBoundaries, diag);
+            return isNoWithinBoundary(scriptBoundaries, diag, this.ts);
         });
         return [
             ...diagnostics
                 .map((diagnostic) => ({
                 range: (0, utils_1.convertRange)(tsDoc, diagnostic),
-                severity: (0, utils_1.mapSeverity)(diagnostic.category),
+                severity: this.mapSeverity(diagnostic.category),
                 source: 'ts',
-                message: typescript_1.default.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
+                message: this.ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
                 code: diagnostic.code,
                 tags: getDiagnosticTag(diagnostic),
             }))
@@ -99,24 +97,36 @@ class DiagnosticsProviderImpl {
         if (!sourceFile) {
             return boundaries;
         }
-        function findTags(parent) {
-            typescript_1.default.forEachChild(parent, (node) => {
-                if (typescript_1.default.isJsxElement(node)) {
+        function findTags(parent, ts) {
+            ts.forEachChild(parent, (node) => {
+                if (ts.isJsxElement(node)) {
                     let tagName = node.openingElement.tagName.getText();
                     switch (tagName) {
                         case 'script': {
-                            typescript_1.default.getLineAndCharacterOfPosition(sourceFile, node.getStart());
+                            ts.getLineAndCharacterOfPosition(sourceFile, node.getStart());
                             boundaries.script.push([node.getStart(), node.getEnd()]);
                             break;
                         }
                     }
                 }
-                findTags(node);
+                findTags(node, ts);
             });
         }
-        findTags(sourceFile);
+        findTags(sourceFile, this.ts);
         return boundaries;
     }
+    mapSeverity(category) {
+        switch (category) {
+            case this.ts.DiagnosticCategory.Error:
+                return vscode_languageserver_1.DiagnosticSeverity.Error;
+            case this.ts.DiagnosticCategory.Warning:
+                return vscode_languageserver_1.DiagnosticSeverity.Warning;
+            case this.ts.DiagnosticCategory.Suggestion:
+                return vscode_languageserver_1.DiagnosticSeverity.Hint;
+            case this.ts.DiagnosticCategory.Message:
+                return vscode_languageserver_1.DiagnosticSeverity.Information;
+        }
+    }
 }
 exports.DiagnosticsProviderImpl = DiagnosticsProviderImpl;
 function isWithinBoundaries(boundaries, start) {
@@ -127,7 +137,7 @@ function isWithinBoundaries(boundaries, start) {
     }
     return false;
 }
-function diagnosticIsWithinBoundaries(sourceFile, boundaries, diagnostic) {
+function diagnosticIsWithinBoundaries(sourceFile, boundaries, diagnostic, ts) {
     if ('start' in diagnostic) {
         if (diagnostic.start == null)
             return false;
@@ -136,11 +146,11 @@ function diagnosticIsWithinBoundaries(sourceFile, boundaries, diagnostic) {
     if (!sourceFile)
         return false;
     let startRange = diagnostic.range.start;
-    let pos = typescript_1.default.getPositionOfLineAndCharacter(sourceFile, startRange.line, startRange.character);
+    let pos = ts.getPositionOfLineAndCharacter(sourceFile, startRange.line, startRange.character);
     return isWithinBoundaries(boundaries, pos);
 }
-function isNoWithinBoundary(boundaries, diagnostic) {
-    return !diagnosticIsWithinBoundaries(undefined, boundaries, diagnostic);
+function isNoWithinBoundary(boundaries, diagnostic, ts) {
+    return !diagnosticIsWithinBoundaries(undefined, boundaries, diagnostic, ts);
 }
 function mapRange(fragment, _document) {
     return (diagnostic) => {

package/dist/plugins/typescript/features/DocumentSymbolsProvider.d.ts

@@ -1,9 +1,10 @@
 import { SymbolInformation } from 'vscode-languageserver-types';
 import { AstroDocument } from '../../../core/documents';
-import { DocumentSymbolsProvider } from '../../interfaces';
-import { LanguageServiceManager } from '../LanguageServiceManager';
+import type { DocumentSymbolsProvider } from '../../interfaces';
+import type { LanguageServiceManager } from '../LanguageServiceManager';
 export declare class DocumentSymbolsProviderImpl implements DocumentSymbolsProvider {
     private languageServiceManager;
+    private ts;
     constructor(languageServiceManager: LanguageServiceManager);
     getDocumentSymbols(document: AstroDocument): Promise<SymbolInformation[]>;
     private collectSymbols;

package/dist/plugins/typescript/features/DocumentSymbolsProvider.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentSymbolsProviderImpl = void 0;
-const typescript_1 = require("typescript");
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const documents_1 = require("../../../core/documents");
 const utils_1 = require("../utils");
-const vscode_languageserver_types_2 = require("vscode-languageserver-types");
 class DocumentSymbolsProviderImpl {
     constructor(languageServiceManager) {
         this.languageServiceManager = languageServiceManager;
+        this.ts = languageServiceManager.docContext.ts;
     }
     async getDocumentSymbols(document) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
@@ -54,10 +53,10 @@ class DocumentSymbolsProviderImpl {
             const symbol = vscode_languageserver_types_1.SymbolInformation.create(item.text, (0, utils_1.symbolKindFromString)(item.kind), vscode_languageserver_types_1.Range.create(fragment.positionAt(span.start), fragment.positionAt(span.start + span.length)), fragment.getURL(), container);
             // TypeScript gives us kind modifiers as a string instead of an array
             const kindModifiers = new Set(item.kindModifiers.split(/,|\s+/g));
-            if (kindModifiers.has(typescript_1.ScriptElementKindModifier.deprecatedModifier)) {
+            if (kindModifiers.has(this.ts.ScriptElementKindModifier.deprecatedModifier)) {
                 if (!symbol.tags)
                     symbol.tags = [];
-                symbol.tags.push(vscode_languageserver_types_2.SymbolTag.Deprecated);
+                symbol.tags.push(vscode_languageserver_types_1.SymbolTag.Deprecated);
             }
             cb(symbol);
         }

package/dist/plugins/typescript/features/FoldingRangesProvider.d.ts

@@ -1,9 +1,12 @@
+import type ts from 'typescript';
 import { FoldingRange } from 'vscode-languageserver';
-import { AstroDocument } from '../../../core/documents';
-import { FoldingRangesProvider } from '../../interfaces';
-import { LanguageServiceManager } from '../LanguageServiceManager';
+import type { AstroDocument } from '../../../core/documents';
+import type { FoldingRangesProvider } from '../../interfaces';
+import type { LanguageServiceManager } from '../LanguageServiceManager';
 export declare class FoldingRangesProviderImpl implements FoldingRangesProvider {
-    private readonly languageServiceManager;
+    private languageServiceManager;
+    private ts;
     constructor(languageServiceManager: LanguageServiceManager);
     getFoldingRanges(document: AstroDocument): Promise<FoldingRange[] | null>;
+    transformFoldingRangeKind(tsKind: ts.OutliningSpanKind): "imports" | "comment" | "region" | undefined;
 }

package/dist/plugins/typescript/features/FoldingRangesProvider.js

@@ -1,15 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FoldingRangesProviderImpl = void 0;
-const typescript_1 = __importDefault(require("typescript"));
 const vscode_languageserver_1 = require("vscode-languageserver");
 const utils_1 = require("../utils");
 class FoldingRangesProviderImpl {
     constructor(languageServiceManager) {
         this.languageServiceManager = languageServiceManager;
+        this.ts = languageServiceManager.docContext.ts;
     }
     async getFoldingRanges(document) {
         const html = document.html;
@@ -38,22 +35,22 @@ class FoldingRangesProviderImpl {
             if (start.line === end.line && start.character === end.character) {
                 continue;
             }
-            foldingRanges.push(vscode_languageserver_1.FoldingRange.create(start.line, end.line, start.character, end.character, transformFoldingRangeKind(span.kind)));
+            foldingRanges.push(vscode_languageserver_1.FoldingRange.create(start.line, end.line, start.character, end.character, this.transformFoldingRangeKind(span.kind)));
         }
         return foldingRanges;
     }
-}
-exports.FoldingRangesProviderImpl = FoldingRangesProviderImpl;
-function transformFoldingRangeKind(tsKind) {
-    switch (tsKind) {
-        case typescript_1.default.OutliningSpanKind.Comment:
-            return vscode_languageserver_1.FoldingRangeKind.Comment;
-        case typescript_1.default.OutliningSpanKind.Imports:
-            return vscode_languageserver_1.FoldingRangeKind.Imports;
-        case typescript_1.default.OutliningSpanKind.Region:
-            return vscode_languageserver_1.FoldingRangeKind.Region;
+    transformFoldingRangeKind(tsKind) {
+        switch (tsKind) {
+            case this.ts.OutliningSpanKind.Comment:
+                return vscode_languageserver_1.FoldingRangeKind.Comment;
+            case this.ts.OutliningSpanKind.Imports:
+                return vscode_languageserver_1.FoldingRangeKind.Imports;
+            case this.ts.OutliningSpanKind.Region:
+                return vscode_languageserver_1.FoldingRangeKind.Region;
+        }
     }
 }
+exports.FoldingRangesProviderImpl = FoldingRangesProviderImpl;
 // https://github.com/microsoft/vscode/blob/bed61166fb604e519e82e4d1d1ed839bc45d65f8/extensions/typescript-language-features/src/languageFeatures/folding.ts#L61-L73
 function adjustFoldingEnd(start, end, document) {
     // workaround for #47240

package/dist/plugins/typescript/features/HoverProvider.d.ts

@@ -1,9 +1,10 @@
-import type { LanguageServiceManager } from '../LanguageServiceManager';
-import { Hover, Position } from 'vscode-languageserver';
+import type { Hover, Position } from 'vscode-languageserver';
 import { AstroDocument } from '../../../core/documents';
-import { HoverProvider } from '../../interfaces';
+import type { HoverProvider } from '../../interfaces';
+import type { LanguageServiceManager } from '../LanguageServiceManager';
 export declare class HoverProviderImpl implements HoverProvider {
-    private readonly languageServiceManager;
+    private languageServiceManager;
+    private ts;
     constructor(languageServiceManager: LanguageServiceManager);
     doHover(document: AstroDocument, position: Position): Promise<Hover | null>;
 }

package/dist/plugins/typescript/features/HoverProvider.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HoverProviderImpl = void 0;
-const typescript_1 = __importDefault(require("typescript"));
 const documents_1 = require("../../../core/documents");
 const previewer_1 = require("../previewer");
 const utils_1 = require("../utils");
@@ -12,6 +8,7 @@ const partsMap = new Map([['JSX attribute', 'HTML attribute']]);
 class HoverProviderImpl {
     constructor(languageServiceManager) {
         this.languageServiceManager = languageServiceManager;
+        this.ts = languageServiceManager.docContext.ts;
     }
     async doHover(document, position) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
@@ -40,8 +37,8 @@ class HoverProviderImpl {
             text: partsMap.has(value.text) ? partsMap.get(value.text) : value.text,
             kind: value.kind,
         }));
-        const declaration = typescript_1.default.displayPartsToString(displayParts);
-        const documentation = (0, previewer_1.getMarkdownDocumentation)(info.documentation, info.tags);
+        const declaration = this.ts.displayPartsToString(displayParts);
+        const documentation = (0, previewer_1.getMarkdownDocumentation)(info.documentation, info.tags, this.ts);
         // https://microsoft.github.io/language-server-protocol/specification#textDocument_hover
         const contents = ['```typescript', declaration, '```']
             .concat(documentation ? ['---', documentation] : [])

package/dist/plugins/typescript/features/InlayHintsProvider.d.ts

@@ -1,12 +1,13 @@
 import { InlayHint } from 'vscode-languageserver';
-import { AstroDocument } from '../../../core/documents';
-import { InlayHintsProvider } from '../../interfaces';
-import { LanguageServiceManager } from '../LanguageServiceManager';
 import { Range } from 'vscode-languageserver-types';
-import { ConfigManager } from '../../../core/config';
+import type { ConfigManager } from '../../../core/config';
+import type { AstroDocument } from '../../../core/documents';
+import type { InlayHintsProvider } from '../../interfaces';
+import type { LanguageServiceManager } from '../LanguageServiceManager';
 export declare class InlayHintsProviderImpl implements InlayHintsProvider {
     private languageServiceManager;
     private configManager;
+    private ts;
     constructor(languageServiceManager: LanguageServiceManager, configManager: ConfigManager);
     getInlayHints(document: AstroDocument, range: Range): Promise<InlayHint[]>;
 }

package/dist/plugins/typescript/features/InlayHintsProvider.js

@@ -1,17 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InlayHintsProviderImpl = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
-const utils_1 = require("../utils");
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
-const typescript_1 = __importDefault(require("typescript"));
+const utils_1 = require("../utils");
 class InlayHintsProviderImpl {
     constructor(languageServiceManager, configManager) {
         this.languageServiceManager = languageServiceManager;
         this.configManager = configManager;
+        this.ts = languageServiceManager.docContext.ts;
     }
     async getInlayHints(document, range) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
@@ -19,12 +16,12 @@ class InlayHintsProviderImpl {
         const fragment = await tsDoc.createFragment();
         const start = fragment.offsetAt(fragment.getGeneratedPosition(range.start));
         const end = fragment.offsetAt(fragment.getGeneratedPosition(range.end));
-        const tsPreferences = await this.configManager.getTSInlayHintsPreferences(document);
+        const tsPreferences = await this.configManager.getTSPreferences(document);
         const inlayHints = lang.provideInlayHints(filePath, { start, length: end - start }, tsPreferences);
         return inlayHints.map((hint) => {
-            const result = vscode_languageserver_1.InlayHint.create(fragment.getOriginalPosition(fragment.positionAt(hint.position)), hint.text, hint.kind === typescript_1.default.InlayHintKind.Type
+            const result = vscode_languageserver_1.InlayHint.create(fragment.getOriginalPosition(fragment.positionAt(hint.position)), hint.text, hint.kind === this.ts.InlayHintKind.Type
                 ? vscode_languageserver_types_1.InlayHintKind.Type
-                : hint.kind === typescript_1.default.InlayHintKind.Parameter
+                : hint.kind === this.ts.InlayHintKind.Parameter
                     ? vscode_languageserver_types_1.InlayHintKind.Parameter
                     : undefined);
             result.paddingLeft = hint.whitespaceBefore;