volar-service-html 0.0.2 → 0.0.4

package/out/index.d.ts

@@ -1,17 +1,14 @@
-import { ServiceContext, Service, InjectionKey } from '@volar/language-service';
+import type { Service } from '@volar/language-service';
 import * as html from 'vscode-html-languageservice';
-import { TextDocument } from 'vscode-languageserver-textdocument';
-export declare const injectionKeys: {
-    htmlDocument: InjectionKey<[TextDocument], html.HTMLDocument>;
-    languageService: InjectionKey<[], html.LanguageService>;
-};
-export declare function getHtmlDocument(document: TextDocument): html.HTMLDocument;
-export interface PluginInstance extends ReturnType<Service> {
-    getHtmlLs: () => html.LanguageService;
-    updateCustomData(extraData: html.IHTMLDataProvider[]): void;
+import type { TextDocument } from 'vscode-languageserver-textdocument';
+export interface Provide {
+    'html/htmlDocument': (document: TextDocument) => html.HTMLDocument | undefined;
+    'html/languageService': () => html.LanguageService;
+    'html/updateCustomData': (extraData: html.IHTMLDataProvider[]) => void;
 }
+export declare function getHtmlDocument(document: TextDocument): html.HTMLDocument;
 declare const _default: (options?: {
     validLang?: string;
     disableCustomData?: boolean;
-}) => (context: ServiceContext | undefined) => PluginInstance;
+}) => Service<Provide>;
 export default _default;

package/out/index.js

@@ -23,17 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHtmlDocument = exports.injectionKeys = void 0;
-const language_service_1 = require("@volar/language-service");
+exports.getHtmlDocument = 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.injectionKeys = {
-    htmlDocument: 'html/htmlDocument',
-    languageService: 'html/languageService',
-};
 function getHtmlDocument(document) {
     const cache = htmlDocuments.get(document);
     if (cache) {
@@ -62,16 +56,15 @@ exports.default = (options = {}) => (context) => {
     });
     return {
         provide: {
-            ...(0, language_service_1.defineProvide)(exports.injectionKeys.htmlDocument, document => {
+            'html/htmlDocument': (document) => {
                 if (document.languageId === (options.validLang ?? 'html')) {
                     return getHtmlDocument(document);
                 }
-            }),
-            ...(0, language_service_1.defineProvide)(exports.injectionKeys.languageService, () => htmlLs),
+            },
+            'html/languageService': () => htmlLs,
+            'html/updateCustomData': updateExtraCustomData,
         },
         triggerCharacters,
-        getHtmlLs: () => htmlLs,
-        updateCustomData: updateExtraCustomData,
         async provideCompletionItems(document, position) {
             return worker(document, async (htmlDocument) => {
                 const configs = await context.env.getConfiguration?.('html.completion');
@@ -147,11 +140,14 @@ exports.default = (options = {}) => (context) => {
                     const content = document.getText();
                     if (endPos.character === 0 && endPos.line > 0 && endOffset !== content.length) {
                         // if selection ends after a new line, exclude that new line
-                        const prevLineStart = document.offsetAt(vscode.Position.create(endPos.line - 1, 0));
+                        const prevLineStart = document.offsetAt({ line: endPos.line - 1, character: 0 });
                         while (isEOL(content, endOffset - 1) && endOffset > prevLineStart) {
                             endOffset--;
                         }
-                        formatRange = vscode.Range.create(formatRange.start, document.positionAt(endOffset));
+                        formatRange = {
+                            start: formatRange.start,
+                            end: document.positionAt(endOffset),
+                        };
                     }
                 }
                 return htmlLs.format(document, formatRange, {
@@ -286,8 +282,16 @@ function isNewlineCharacter(charCode) {
 }
 function provideFileSymbolsInternal(document, node, symbols) {
     const name = nodeToName(node);
-    const range = vscode.Range.create(document.positionAt(node.start), document.positionAt(node.end));
-    const symbol = vscode.DocumentSymbol.create(name, undefined, vscode.SymbolKind.Field, range, range);
+    const range = {
+        start: document.positionAt(node.start),
+        end: document.positionAt(node.end),
+    };
+    const symbol = {
+        name,
+        kind: 8,
+        range,
+        selectionRange: range,
+    };
     symbols.push(symbol);
     node.children.forEach(child => {
         symbol.children ??= [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-html",
-	"version": "0.0.2",
+	"version": "0.0.4",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,17 +13,10 @@
 		"directory": "packages/html"
 	},
 	"dependencies": {
-		"vscode-html-languageservice": "^5.0.4",
-		"vscode-languageserver-protocol": "^3.17.3",
-		"vscode-languageserver-textdocument": "^1.0.8"
-	},
-	"peerDependencies": {
-		"@volar/language-service": "*"
+		"vscode-html-languageservice": "^5.0.4"
 	},
-	"peerDependenciesMeta": {
-		"@volar/language-service": {
-			"optional": true
-		}
+	"devDependencies": {
+		"vscode-languageserver-textdocument": "^1.0.8"
 	},
-	"gitHead": "19482084693c7349f461dc75ec52ee6917739c51"
+	"gitHead": "f5d49495d6698761f4df8c9ef2747cc01fc777d6"
 }