volar-service-typescript 0.0.0 → 0.0.2

package/out/index.d.ts

@@ -1,3 +1,12 @@
-import type { Service } from '@volar/language-service';
+import { InjectionKey, Service } from '@volar/language-service';
+import type * as ts from 'typescript/lib/tsserverlibrary';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
+export declare const injectionKeys: {
+    typescript: InjectionKey<[], typeof import('typescript/lib/tsserverlibrary')>;
+    sourceFile: InjectionKey<[TextDocument], ts.SourceFile>;
+    languageService: InjectionKey<[TextDocument], ts.LanguageService>;
+    languageServiceHost: InjectionKey<[TextDocument], ts.LanguageServiceHost>;
+    textDocument: InjectionKey<[uri: string], TextDocument>;
+};
 declare const _default: () => Service;
 export default _default;

package/out/index.js

@@ -23,6 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.injectionKeys = void 0;
+const language_service_1 = require("@volar/language-service");
 const semver = __importStar(require("semver"));
 const vscode = __importStar(require("vscode-languageserver-protocol"));
 const shared_1 = require("./shared");
@@ -53,6 +55,13 @@ const signatureHelp = __importStar(require("./services/signatureHelp"));
 const typeDefinitions = __importStar(require("./services/typeDefinition"));
 const workspaceSymbols = __importStar(require("./services/workspaceSymbol"));
 const tsconfig = __importStar(require("./services/tsconfig"));
+exports.injectionKeys = {
+    typescript: 'typescript/typescript',
+    sourceFile: 'typescript/sourceFile',
+    languageService: 'typescript/languageService',
+    languageServiceHost: 'typescript/languageServiceHost',
+    textDocument: 'typescript/textDocument',
+};
 exports.default = () => (contextOrNull, modules) => {
     const jsDocTriggerCharacter = '*';
     const directiveCommentTriggerCharacter = '@';
@@ -72,7 +81,7 @@ exports.default = () => (contextOrNull, modules) => {
     }
     const context = contextOrNull;
     if (!modules?.typescript) {
-        console.warn('[volar-service-typescript] context.typescript not found, @volar/typescript plugin disabled. Make sure you have provide tsdk in language client.');
+        console.warn('[volar-service-typescript] context.typescript not found, volar-service-typescript is disabled. Make sure you have provide tsdk in language client.');
         return {};
     }
     const ts = modules.typescript;
@@ -113,6 +122,7 @@ exports.default = () => (contextOrNull, modules) => {
     const callHierarchy = _callHierarchy.register(semanticCtx);
     const tsconfigRequests = tsconfig.register(semanticCtx);
     let syntacticHostCtx = {
+        document: undefined,
         fileName: '',
         fileVersion: 0,
         snapshot: ts.ScriptSnapshot.fromString(''),
@@ -140,35 +150,42 @@ exports.default = () => (contextOrNull, modules) => {
     const doFormatting = formatting.register(syntacticCtx);
     const getFoldingRanges = foldingRanges.register(syntacticCtx);
     return {
+        provide: {
+            ...(0, language_service_1.defineProvide)(exports.injectionKeys.typescript, () => ts),
+            ...(0, language_service_1.defineProvide)(exports.injectionKeys.sourceFile, document => {
+                if ((0, shared_1.isTsDocument)(document)) {
+                    const sourceFile = getSemanticServiceSourceFile(document.uri);
+                    if (sourceFile) {
+                        return sourceFile;
+                    }
+                    prepareSyntacticService(document);
+                    return syntacticCtx.typescript.languageService.getProgram()?.getSourceFile(syntacticHostCtx.fileName);
+                }
+            }),
+            ...(0, language_service_1.defineProvide)(exports.injectionKeys.languageService, document => {
+                const sourceFile = getSemanticServiceSourceFile(document.uri);
+                if (sourceFile) {
+                    return semanticCtx.typescript.languageService;
+                }
+                prepareSyntacticService(document);
+                return syntacticCtx.typescript.languageService;
+            }),
+            ...(0, language_service_1.defineProvide)(exports.injectionKeys.languageServiceHost, document => {
+                const sourceFile = getSemanticServiceSourceFile(document.uri);
+                if (sourceFile) {
+                    return semanticCtx.typescript.languageServiceHost;
+                }
+                prepareSyntacticService(document);
+                return syntacticCtx.typescript.languageServiceHost;
+            }),
+            ...(0, language_service_1.defineProvide)(exports.injectionKeys.textDocument, semanticCtx.getTextDocument),
+        },
         ...triggerCharacters,
         triggerCharacters: [
             ...basicTriggerCharacters,
             jsDocTriggerCharacter,
             directiveCommentTriggerCharacter,
         ],
-        resolveRuleContext(ruleCtx, type) {
-            if ((0, shared_1.isTsDocument)(ruleCtx.document)) {
-                let sourceFile;
-                if (type === 'format' || type === 'syntax') {
-                    prepareSyntacticService(ruleCtx.document);
-                    sourceFile = syntacticCtx.typescript.languageService.getProgram()?.getSourceFile(syntacticHostCtx.fileName);
-                }
-                else {
-                    sourceFile = semanticCtx.typescript.languageService.getProgram()?.getSourceFile(context.env.uriToFileName(ruleCtx.document.uri));
-                }
-                if (sourceFile) {
-                    ruleCtx.typescript = {
-                        sourceFile,
-                        getTextDocument: syntacticCtx.getTextDocument,
-                        ...syntacticCtx.typescript,
-                    };
-                }
-                else {
-                    console.warn('[volar-service-typescript] sourceFile not found', ruleCtx.document.uri);
-                }
-            }
-            return ruleCtx;
-        },
         provideAutoInsertionEdit(document, position, ctx) {
             if ((document.languageId === 'javascriptreact' || document.languageId === 'typescriptreact')
                 && ctx.lastChange.text.endsWith('>')) {
@@ -381,7 +398,16 @@ exports.default = () => (contextOrNull, modules) => {
             return tsconfigRequests.resolve(link, token);
         },
     };
+    function getSemanticServiceSourceFile(uri) {
+        const sourceFile = semanticCtx.typescript.languageService.getProgram()?.getSourceFile(context.env.uriToFileName(uri));
+        if (sourceFile) {
+            return sourceFile;
+        }
+    }
     function prepareSyntacticService(document) {
+        if (syntacticHostCtx.document === document && syntacticHostCtx.fileVersion === document.version) {
+            return;
+        }
         syntacticHostCtx.fileName = context.env.uriToFileName(document.uri);
         syntacticHostCtx.fileVersion = document.version;
         if (context.documents.isVirtualFileUri(document.uri)) {

package/package.json

@@ -1,10 +1,9 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.0",
+	"version": "0.0.2",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
-		"rules.d.ts",
 		"out/**/*.js",
 		"out/**/*.d.ts"
 	],
@@ -28,5 +27,5 @@
 	"peerDependencies": {
 		"@volar/language-service": "*"
 	},
-	"gitHead": "1011561ac4bbf79c53c3b80c27692569bf861519"
+	"gitHead": "19482084693c7349f461dc75ec52ee6917739c51"
 }

package/rules.d.ts

@@ -1,13 +0,0 @@
-import type * as ts from 'typescript/lib/tsserverlibrary';
-import type { TextDocument } from 'vscode-languageserver-textdocument';
-
-declare module '@volar/language-service' {
-	interface RuleContext {
-		typescript?: {
-			sourceFile: ts.SourceFile;
-			getTextDocument(uri: string): TextDocument | undefined;
-			languageService: ts.LanguageService;
-			languageServiceHost: ts.LanguageServiceHost;
-		}
-	}
-}