volar-service-typescript 0.0.1 → 0.0.2

package/out/index.d.ts

@@ -1,11 +1,12 @@
 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 rulesInjectionKey: InjectionKey<{
-    sourceFile: ts.SourceFile;
-    languageService: ts.LanguageService;
-    languageServiceHost: ts.LanguageServiceHost;
-    getTextDocument(uri: string): TextDocument | undefined;
-}>;
+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,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rulesInjectionKey = void 0;
+exports.injectionKeys = void 0;
 const language_service_1 = require("@volar/language-service");
 const semver = __importStar(require("semver"));
 const vscode = __importStar(require("vscode-languageserver-protocol"));
@@ -55,7 +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.rulesInjectionKey = Symbol();
+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 = '@';
@@ -116,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(''),
@@ -143,36 +150,35 @@ exports.default = () => (contextOrNull, modules) => {
     const doFormatting = formatting.register(syntacticCtx);
     const getFoldingRanges = foldingRanges.register(syntacticCtx);
     return {
-        rules: {
-            provide: {
-                [exports.rulesInjectionKey](document, type) {
-                    if ((0, shared_1.isTsDocument)(document)) {
-                        if (type === language_service_1.RuleType.Format || type === language_service_1.RuleType.Syntax) {
-                            prepareSyntacticService(document);
-                            const sourceFile = syntacticCtx.typescript.languageService.getProgram()?.getSourceFile(syntacticHostCtx.fileName);
-                            if (sourceFile) {
-                                return {
-                                    sourceFile,
-                                    languageService: syntacticCtx.typescript.languageService,
-                                    languageServiceHost: syntacticCtx.typescript.languageServiceHost,
-                                    getTextDocument: syntacticCtx.getTextDocument,
-                                };
-                            }
-                        }
-                        else {
-                            const sourceFile = semanticCtx.typescript.languageService.getProgram()?.getSourceFile(context.env.uriToFileName(document.uri));
-                            if (sourceFile) {
-                                return {
-                                    sourceFile,
-                                    languageService: semanticCtx.typescript.languageService,
-                                    languageServiceHost: semanticCtx.typescript.languageServiceHost,
-                                    getTextDocument: semanticCtx.getTextDocument,
-                                };
-                            }
-                        }
+        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: [
@@ -392,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/out/utils/typeConverters.d.ts

@@ -1,4 +1,4 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
 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;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -27,5 +27,5 @@
 	"peerDependencies": {
 		"@volar/language-service": "*"
 	},
-	"gitHead": "5bf5152f076f25cb1ddbc7aa6978a8d1c7009fd6"
+	"gitHead": "19482084693c7349f461dc75ec52ee6917739c51"
 }