volar-service-html 0.0.3 → 0.0.5

package/out/index.d.ts

@@ -1,9 +1,10 @@
 import type { Service } from '@volar/language-service';
 import * as html from 'vscode-html-languageservice';
-import { TextDocument } from 'vscode-languageserver-textdocument';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 export interface Provide {
     'html/htmlDocument': (document: TextDocument) => html.HTMLDocument | undefined;
     'html/languageService': () => html.LanguageService;
+    'html/documentContext': () => html.DocumentContext;
     'html/updateCustomData': (extraData: html.IHTMLDataProvider[]) => void;
 }
 export declare function getHtmlDocument(document: TextDocument): html.HTMLDocument;

package/out/index.js

@@ -25,8 +25,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHtmlDocument = void 0;
 const html = __importStar(require("vscode-html-languageservice"));
-const vscode = __importStar(require("vscode-languageserver-protocol"));
 const path = __importStar(require("path"));
+const vscode_uri_1 = require("vscode-uri");
 const parserLs = html.getLanguageService();
 const htmlDocuments = new WeakMap();
 function getHtmlDocument(document) {
@@ -51,7 +51,33 @@ exports.default = (options = {}) => (context) => {
     let shouldUpdateCustomData = true;
     let customData = [];
     let extraData = [];
-    const htmlLs = html.getLanguageService({ fileSystemProvider: context.env.fileSystemProvider });
+    const fileSystemProvider = {
+        stat: async (uri) => await context.env.fs?.stat(uri) ?? {
+            type: html.FileType.Unknown,
+            ctime: 0,
+            mtime: 0,
+            size: 0,
+        },
+        readDirectory: async (uri) => context.env.fs?.readDirectory(uri) ?? [],
+    };
+    const documentContext = {
+        resolveReference(ref, base) {
+            if (ref.match(/^\w[\w\d+.-]*:/)) {
+                // starts with a schema
+                return ref;
+            }
+            if (ref[0] === '/') { // resolve absolute path against the current workspace folder
+                return base + ref;
+            }
+            const baseUri = vscode_uri_1.URI.parse(base);
+            const baseUriDir = baseUri.path.endsWith('/') ? baseUri : vscode_uri_1.Utils.dirname(baseUri);
+            return vscode_uri_1.Utils.resolvePath(baseUriDir, ref).toString(true);
+        },
+    };
+    const htmlLs = html.getLanguageService({
+        fileSystemProvider,
+        clientCapabilities: context.env.clientCapabilities,
+    });
     context.env.onDidChangeConfiguration?.(() => {
         shouldUpdateCustomData = true;
     });
@@ -63,18 +89,14 @@ exports.default = (options = {}) => (context) => {
                 }
             },
             'html/languageService': () => htmlLs,
+            'html/documentContext': () => documentContext,
             'html/updateCustomData': updateExtraCustomData,
         },
         triggerCharacters,
         async provideCompletionItems(document, position) {
             return worker(document, async (htmlDocument) => {
                 const configs = await context.env.getConfiguration?.('html.completion');
-                if (context.env.documentContext) {
-                    return htmlLs.doComplete2(document, position, htmlDocument, context.env.documentContext, configs);
-                }
-                else {
-                    return htmlLs.doComplete(document, position, htmlDocument, configs);
-                }
+                return htmlLs.doComplete2(document, position, htmlDocument, documentContext, configs);
             });
         },
         provideRenameRange(document, position) {
@@ -104,9 +126,7 @@ exports.default = (options = {}) => (context) => {
         },
         provideDocumentLinks(document) {
             return worker(document, () => {
-                if (!context.env.documentContext)
-                    return;
-                return htmlLs.findDocumentLinks(document, context.env.documentContext);
+                return htmlLs.findDocumentLinks(document, documentContext);
             });
         },
         provideDocumentSymbols(document) {
@@ -141,11 +161,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, {
@@ -280,8 +303,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.3",
+	"version": "0.0.5",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -14,8 +14,10 @@
 	},
 	"dependencies": {
 		"vscode-html-languageservice": "^5.0.4",
-		"vscode-languageserver-protocol": "^3.17.3",
+		"vscode-uri": "^3.0.7"
+	},
+	"devDependencies": {
 		"vscode-languageserver-textdocument": "^1.0.8"
 	},
-	"gitHead": "28896539331e31b4ef1064b6839ea0924d5d28d0"
+	"gitHead": "7b58234769e16ccb8eed0e6eb03f58ed24b7df40"
 }