volar-service-html 0.0.46 → 0.0.48

package/index.d.ts

@@ -1,4 +1,4 @@
-import type { Disposable, DocumentSelector, FormattingOptions, ProviderResult, ServiceContext, LanguageServicePlugin } from '@volar/language-service';
+import type { Disposable, DocumentSelector, FormattingOptions, ProviderResult, LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
 import * as html from 'vscode-html-languageservice';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 export interface Provide {
@@ -6,17 +6,17 @@ export interface Provide {
     'html/languageService': () => html.LanguageService;
     'html/documentContext': () => html.DocumentContext;
 }
-export declare function create({ documentSelector, useDefaultDataProvider, getDocumentContext, isFormattingEnabled, isAutoCreateQuotesEnabled, isAutoClosingTagsEnabled, getFormattingOptions, getCompletionConfiguration, getHoverSettings, getCustomData, onDidChangeCustomData, }?: {
+export declare function create({ documentSelector, useDefaultDataProvider, getDocumentContext, isFormattingEnabled, getFormattingOptions, getCompletionConfiguration, getHoverSettings, getCustomData, onDidChangeCustomData, }?: {
     documentSelector?: DocumentSelector;
     useDefaultDataProvider?: boolean;
-    isFormattingEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
-    isAutoCreateQuotesEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
-    isAutoClosingTagsEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
-    getDocumentContext?(context: ServiceContext): html.DocumentContext;
-    getFormattingOptions?(document: TextDocument, options: FormattingOptions, context: ServiceContext): ProviderResult<html.HTMLFormatConfiguration>;
-    getCompletionConfiguration?(document: TextDocument, context: ServiceContext): ProviderResult<html.CompletionConfiguration | undefined>;
-    getHoverSettings?(document: TextDocument, context: ServiceContext): ProviderResult<html.HoverSettings | undefined>;
-    getCustomData?(context: ServiceContext): ProviderResult<html.IHTMLDataProvider[]>;
-    onDidChangeCustomData?(listener: () => void, context: ServiceContext): Disposable;
+    isFormattingEnabled?(document: TextDocument, context: LanguageServiceContext): ProviderResult<boolean>;
+    isAutoCreateQuotesEnabled?(document: TextDocument, context: LanguageServiceContext): ProviderResult<boolean>;
+    isAutoClosingTagsEnabled?(document: TextDocument, context: LanguageServiceContext): ProviderResult<boolean>;
+    getDocumentContext?(context: LanguageServiceContext): html.DocumentContext;
+    getFormattingOptions?(document: TextDocument, options: FormattingOptions, context: LanguageServiceContext): ProviderResult<html.HTMLFormatConfiguration>;
+    getCompletionConfiguration?(document: TextDocument, context: LanguageServiceContext): ProviderResult<html.CompletionConfiguration | undefined>;
+    getHoverSettings?(document: TextDocument, context: LanguageServiceContext): ProviderResult<html.HoverSettings | undefined>;
+    getCustomData?(context: LanguageServiceContext): ProviderResult<html.IHTMLDataProvider[]>;
+    onDidChangeCustomData?(listener: () => void, context: LanguageServiceContext): Disposable;
 }): LanguageServicePlugin;
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -7,32 +7,28 @@ const vscode_uri_1 = require("vscode-uri");
 function create({ documentSelector = ['html'], useDefaultDataProvider = true, getDocumentContext = context => {
     return {
         resolveReference(ref, base) {
-            const decoded = context.decodeEmbeddedDocumentUri(base);
+            let baseUri = vscode_uri_1.URI.parse(base);
+            const decoded = context.decodeEmbeddedDocumentUri(baseUri);
             if (decoded) {
-                base = decoded[0];
+                baseUri = decoded[0];
             }
             if (ref.match(/^\w[\w\d+.-]*:/)) {
                 // starts with a schema
                 return ref;
             }
-            if (ref[0] === '/') { // resolve absolute path against the current workspace folder
-                let folderUri = context.env.workspaceFolder;
+            if (ref[0] === '/' && context.env.workspaceFolders.length) { // resolve absolute path against the current workspace folder
+                let folderUri = context.env.workspaceFolders[0].toString();
                 if (!folderUri.endsWith('/')) {
                     folderUri += '/';
                 }
                 return folderUri + ref.substring(1);
             }
-            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);
         },
     };
 }, isFormattingEnabled = async (_document, context) => {
     return await context.env.getConfiguration?.('html.format.enable') ?? true;
-}, isAutoCreateQuotesEnabled = async (_document, context) => {
-    return await context.env.getConfiguration?.('html.autoCreateQuotes') ?? true;
-}, isAutoClosingTagsEnabled = async (_document, context) => {
-    return await context.env.getConfiguration?.('html.autoClosingTags') ?? true;
 }, getFormattingOptions = async (_document, options, context) => {
     const formatSettings = {
         ...options,
@@ -55,15 +51,18 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
     const customData = await context.env.getConfiguration?.('html.customData') ?? [];
     const newData = [];
     for (const customDataPath of customData) {
-        const uri = vscode_uri_1.Utils.resolvePath(vscode_uri_1.URI.parse(context.env.workspaceFolder), customDataPath);
-        const json = await context.env.fs?.readFile?.(uri.toString());
-        if (json) {
-            try {
-                const data = JSON.parse(json);
-                newData.push(html.newHTMLDataProvider(customDataPath, data));
-            }
-            catch (error) {
-                console.error(error);
+        for (const workspaceFolder of context.env.workspaceFolders) {
+            const uri = vscode_uri_1.Utils.resolvePath(workspaceFolder, customDataPath);
+            const json = await context.env.fs?.readFile?.(uri);
+            if (json) {
+                try {
+                    const data = JSON.parse(json);
+                    newData.push(html.newHTMLDataProvider(customDataPath, data));
+                }
+                catch (error) {
+                    console.error(error);
+                }
+                break;
             }
         }
     }
@@ -76,16 +75,43 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
         },
     };
 }, } = {}) {
+    const configurationSections = {
+        autoCreateQuotes: 'html.autoCreateQuotes',
+        autoClosingTags: 'html.autoClosingTags',
+    };
     return {
         name: 'html',
-        // https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/html-language-features/server/src/htmlServer.ts#L183
-        triggerCharacters: ['.', ':', '<', '"', '=', '/'],
+        capabilities: {
+            completionProvider: {
+                // https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/html-language-features/server/src/htmlServer.ts#L183
+                triggerCharacters: ['.', ':', '<', '"', '=', '/'],
+            },
+            renameProvider: {
+                prepareProvider: true,
+            },
+            hoverProvider: true,
+            documentHighlightProvider: true,
+            documentLinkProvider: {},
+            documentSymbolProvider: true,
+            foldingRangeProvider: true,
+            selectionRangeProvider: true,
+            documentFormattingProvider: true,
+            linkedEditingRangeProvider: true,
+            autoInsertionProvider: {
+                triggerCharacters: ['=', '>', '/'],
+                configurationSections: [
+                    configurationSections.autoCreateQuotes,
+                    configurationSections.autoClosingTags,
+                    configurationSections.autoClosingTags,
+                ],
+            },
+        },
         create(context) {
             const htmlDocuments = new WeakMap();
             const fileSystemProvider = {
-                stat: async (uri) => await context.env.fs?.stat(uri)
+                stat: async (uri) => await context.env.fs?.stat(vscode_uri_1.URI.parse(uri))
                     ?? { type: html.FileType.Unknown, ctime: 0, mtime: 0, size: 0 },
-                readDirectory: async (uri) => await context.env.fs?.readDirectory(uri) ?? [],
+                readDirectory: async (uri) => await context.env.fs?.readDirectory(vscode_uri_1.URI.parse(uri)) ?? [],
             };
             const documentContext = getDocumentContext(context);
             const htmlLs = html.getLanguageService({
@@ -267,14 +293,14 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
                         return { ranges };
                     });
                 },
-                async provideAutoInsertionEdit(document, selection, change) {
+                async provideAutoInsertSnippet(document, selection, change) {
                     // selection must at end of change
                     if (document.offsetAt(selection) !== change.rangeOffset + change.text.length) {
                         return;
                     }
                     return worker(document, async (htmlDocument) => {
                         if (change.rangeLength === 0 && change.text.endsWith('=')) {
-                            const enabled = await isAutoCreateQuotesEnabled(document, context);
+                            const enabled = await context.env.getConfiguration?.('html.autoCreateQuotes') ?? true;
                             if (enabled) {
                                 const completionConfiguration = await getCompletionConfiguration(document, context);
                                 const text = htmlLs.doQuoteComplete(document, selection, htmlDocument, completionConfiguration);
@@ -284,7 +310,7 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
                             }
                         }
                         if (change.rangeLength === 0 && (change.text.endsWith('>') || change.text.endsWith('/'))) {
-                            const enabled = await isAutoClosingTagsEnabled(document, context);
+                            const enabled = await context.env.getConfiguration?.('html.autoClosingTags') ?? true;
                             if (enabled) {
                                 const text = htmlLs.doTagComplete(document, selection, htmlDocument);
                                 if (text) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-html",
-	"version": "0.0.46",
+	"version": "0.0.48",
 	"description": "Integrate vscode-languageservice-html into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/html",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -32,12 +32,12 @@
 		"@types/node": "latest"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.2.3"
+		"@volar/language-service": "~2.3.0-alpha.0"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "a5bc7172ea25a43dd403a1b7c926a297f70750ec"
+	"gitHead": "6a80c92133e154907a79eefa05603f63994214c3"
 }