volar-service-typescript 0.0.1 → 0.0.3

package/out/index.d.ts

@@ -1,11 +1,12 @@
-import { InjectionKey, Service } from '@volar/language-service';
+import type { 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 interface Provide {
+    'typescript/typescript': () => typeof import('typescript/lib/tsserverlibrary');
+    'typescript/sourceFile': (_: TextDocument) => ts.SourceFile | undefined;
+    'typescript/languageService': (_: TextDocument) => ts.LanguageService | undefined;
+    'typescript/languageServiceHost': (_: TextDocument) => ts.LanguageServiceHost | undefined;
+    'typescript/textDocument': (uri: string) => TextDocument | undefined;
+}
 declare const _default: () => Service;
 export default _default;

package/out/index.js

@@ -23,8 +23,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rulesInjectionKey = 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");
@@ -55,7 +53,7 @@ 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.default = () => (contextOrNull, modules) => {
     const jsDocTriggerCharacter = '*';
     const directiveCommentTriggerCharacter = '@';
@@ -116,6 +114,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 +142,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: {
+            'typescript/typescript': () => ts,
+            'typescript/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);
+                }
             },
+            'typescript/languageService': document => {
+                const sourceFile = getSemanticServiceSourceFile(document.uri);
+                if (sourceFile) {
+                    return semanticCtx.typescript.languageService;
+                }
+                prepareSyntacticService(document);
+                return syntacticCtx.typescript.languageService;
+            },
+            'typescript/languageServiceHost': document => {
+                const sourceFile = getSemanticServiceSourceFile(document.uri);
+                if (sourceFile) {
+                    return semanticCtx.typescript.languageServiceHost;
+                }
+                prepareSyntacticService(document);
+                return syntacticCtx.typescript.languageServiceHost;
+            },
+            'typescript/textDocument': semanticCtx.getTextDocument,
         },
         ...triggerCharacters,
         triggerCharacters: [
@@ -392,7 +390,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/services/tsconfig.d.ts

@@ -1,4 +1,4 @@
-import * as vscode from '@volar/language-service';
+import * as vscode from 'vscode-languageserver-protocol';
 import { SharedContext } from '../types';
 export declare function register(ctx: SharedContext): {
     provideDocumentLinks: (document: vscode.TextDocument, _token: vscode.CancellationToken) => vscode.DocumentLink[];

package/out/services/tsconfig.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
 const jsonc = __importStar(require("jsonc-parser"));
 const minimatch_1 = require("minimatch");
-const vscode = __importStar(require("@volar/language-service"));
+const vscode = __importStar(require("vscode-languageserver-protocol"));
 const vscode_uri_1 = require("vscode-uri");
 function mapChildren(node, f) {
     return node && node.type === 'array' && node.children

package/out/shared.d.ts

@@ -1,4 +1,4 @@
-import { TextDocument } from 'vscode-languageserver-textdocument';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 export declare function getConfigTitle(document: TextDocument): string;
 export declare function isTsDocument(document: TextDocument): boolean;
 export declare function isJsonDocument(document: TextDocument): boolean;

package/out/types.d.ts

@@ -1,4 +1,4 @@
-import { ServiceContext } from "@volar/language-service";
+import type { ServiceContext } from '@volar/language-service';
 export type SharedContext = ServiceContext & {
     typescript: NonNullable<ServiceContext['typescript']>;
     ts: typeof import('typescript/lib/tsserverlibrary');

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.3",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -24,8 +24,5 @@
 		"vscode-nls": "^5.2.0",
 		"vscode-uri": "^3.0.7"
 	},
-	"peerDependencies": {
-		"@volar/language-service": "*"
-	},
-	"gitHead": "5bf5152f076f25cb1ddbc7aa6978a8d1c7009fd6"
+	"gitHead": "28896539331e31b4ef1064b6839ea0924d5d28d0"
 }