volar-service-html 0.0.0 → 0.0.1

package/out/index.d.ts

@@ -1,6 +1,10 @@
-import type { ServiceContext, Service } from '@volar/language-service';
+import type { ServiceContext, Service, InjectionKey } from '@volar/language-service';
 import * as html from 'vscode-html-languageservice';
 import { TextDocument } from 'vscode-languageserver-textdocument';
+export declare const rulesInjectionKey: InjectionKey<{
+    htmlDocument: html.HTMLDocument;
+    languageService: html.LanguageService;
+}>;
 export declare function getHtmlDocument(document: TextDocument): html.HTMLDocument;
 export interface PluginInstance extends ReturnType<Service> {
     getHtmlLs: () => html.LanguageService;

package/out/index.js

@@ -23,12 +23,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHtmlDocument = void 0;
+exports.getHtmlDocument = exports.rulesInjectionKey = void 0;
 const html = __importStar(require("vscode-html-languageservice"));
 const vscode = __importStar(require("vscode-languageserver-protocol"));
 const path = __importStar(require("path"));
 const parserLs = html.getLanguageService();
 const htmlDocuments = new WeakMap();
+exports.rulesInjectionKey = Symbol();
 function getHtmlDocument(document) {
     const cache = htmlDocuments.get(document);
     if (cache) {
@@ -56,18 +57,22 @@ exports.default = (options = {}) => (context) => {
         shouldUpdateCustomData = true;
     });
     return {
-        triggerCharacters,
-        async resolveRuleContext(context) {
-            if (options.validLang === 'html') {
-                await worker(context.document, (htmlDocument) => {
-                    context.html = {
-                        document: htmlDocument,
+        rules: {
+            provide: {
+                [exports.rulesInjectionKey](document) {
+                    if (document.languageId !== (options.validLang ?? 'html'))
+                        return;
+                    const htmlDocument = getHtmlDocument(document);
+                    if (!htmlDocument)
+                        return;
+                    return {
+                        htmlDocument,
                         languageService: htmlLs,
                     };
-                });
-            }
-            return context;
+                },
+            },
         },
+        triggerCharacters,
         getHtmlLs: () => htmlLs,
         updateCustomData: updateExtraCustomData,
         async provideCompletionItems(document, position) {

package/package.json

@@ -1,10 +1,9 @@
 {
 	"name": "volar-service-html",
-	"version": "0.0.0",
+	"version": "0.0.1",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
-		"rules.d.ts",
 		"out/**/*.js",
 		"out/**/*.d.ts"
 	],
@@ -26,5 +25,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "1011561ac4bbf79c53c3b80c27692569bf861519"
+	"gitHead": "5bf5152f076f25cb1ddbc7aa6978a8d1c7009fd6"
 }

package/rules.d.ts

@@ -1,10 +0,0 @@
-import * as html from 'vscode-html-languageservice';
-
-declare module '@volar/language-service' {
-	interface RuleContext {
-		html?: {
-			document: html.HTMLDocument;
-			languageService: html.LanguageService;
-		}
-	}
-}