volar-service-html 0.0.33 → 0.0.35

package/index.d.ts

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

package/index.js

@@ -96,7 +96,7 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
                     disposable.dispose();
                 },
                 provide: {
-                    'html/htmlDocument': (document) => {
+                    'html/htmlDocument': document => {
                         if (matchDocument(documentSelector, document)) {
                             return getHtmlDocument(document);
                         }
@@ -111,7 +111,7 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
                     });
                 },
                 provideRenameRange(document, position) {
-                    return worker(document, (htmlDocument) => {
+                    return worker(document, htmlDocument => {
                         const offset = document.offsetAt(position);
                         return htmlLs
                             .findDocumentHighlights(document, position, htmlDocument)
@@ -120,7 +120,7 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
                     });
                 },
                 provideRenameEdits(document, position, newName) {
-                    return worker(document, (htmlDocument) => {
+                    return worker(document, htmlDocument => {
                         return htmlLs.doRename(document, position, newName, htmlDocument);
                     });
                 },
@@ -131,7 +131,7 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
                     });
                 },
                 provideDocumentHighlights(document, position) {
-                    return worker(document, (htmlDocument) => {
+                    return worker(document, htmlDocument => {
                         return htmlLs.findDocumentHighlights(document, position, htmlDocument);
                     });
                 },
@@ -141,7 +141,7 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
                     });
                 },
                 provideDocumentSymbols(document) {
-                    return worker(document, (htmlDocument) => {
+                    return worker(document, htmlDocument => {
                         return htmlLs.findDocumentSymbols2(document, htmlDocument);
                     });
                 },
@@ -255,10 +255,11 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
                     });
                 },
                 provideLinkedEditingRanges(document, position) {
-                    return worker(document, (htmlDocument) => {
+                    return worker(document, htmlDocument => {
                         const ranges = htmlLs.findLinkedEditingRanges(document, position, htmlDocument);
-                        if (!ranges)
+                        if (!ranges) {
                             return;
+                        }
                         return { ranges };
                     });
                 },
@@ -302,11 +303,13 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
                 return doc;
             }
             async function worker(document, callback) {
-                if (!matchDocument(documentSelector, document))
+                if (!matchDocument(documentSelector, document)) {
                     return;
+                }
                 const htmlDocument = getHtmlDocument(document);
-                if (!htmlDocument)
+                if (!htmlDocument) {
                     return;
+                }
                 await (initializing ??= initialize());
                 return callback(htmlDocument);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-html",
-	"version": "0.0.33",
+	"version": "0.0.35",
 	"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.1.0"
+		"@volar/language-service": "~2.2.0-alpha.0"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "d04c9ea5f5b58c5e0b6db9a65a8aba1a5a2ed9ef"
+	"gitHead": "cbd8ef0ada6eae9656286535599c9b289134d1e3"
 }