volar-service-html 0.0.64 → 0.0.66

package/index.d.ts

@@ -16,8 +16,6 @@ export declare function create({ documentSelector, configurationSections, useDef
     };
     useDefaultDataProvider?: boolean;
     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>;

package/index.js

@@ -306,28 +306,26 @@ function create({ documentSelector = ['html'], configurationSections = {
                         return { ranges };
                     });
                 },
-                async provideAutoInsertSnippet(document, selection, change) {
+                async provideAutoInsertSnippet(document, selection, lastChange) {
                     // selection must at end of change
-                    if (document.offsetAt(selection) !== change.rangeOffset + change.text.length) {
+                    if (document.offsetAt(selection) !== lastChange.rangeOffset + lastChange.text.length) {
                         return;
                     }
                     return worker(document, async (htmlDocument) => {
-                        if (change.rangeLength === 0 && change.text.endsWith('=')) {
-                            const enabled = await context.env.getConfiguration?.(configurationSections.autoCreateQuotes) ?? true;
-                            if (enabled) {
-                                const completionConfiguration = await getCompletionConfiguration(document, context);
-                                const text = htmlLs.doQuoteComplete(document, selection, htmlDocument, completionConfiguration);
-                                if (text) {
-                                    return text;
+                        if (lastChange.rangeLength === 0 && !/\n/.test(lastChange.text)) {
+                            if (lastChange.text.endsWith('=')) {
+                                const enabled = await context.env.getConfiguration?.(configurationSections.autoCreateQuotes) ?? true;
+                                if (enabled) {
+                                    const completionConfiguration = await getCompletionConfiguration(document, context);
+                                    const text = htmlLs.doQuoteComplete(document, selection, htmlDocument, completionConfiguration);
+                                    return text ?? undefined;
                                 }
                             }
-                        }
-                        if (change.rangeLength === 0 && (change.text.endsWith('>') || change.text.endsWith('/'))) {
-                            const enabled = await context.env.getConfiguration?.(configurationSections.autoClosingTags) ?? true;
-                            if (enabled) {
-                                const text = htmlLs.doTagComplete(document, selection, htmlDocument);
-                                if (text) {
-                                    return text;
+                            if (lastChange.text.endsWith('>') || lastChange.text.endsWith('/')) {
+                                const enabled = await context.env.getConfiguration?.(configurationSections.autoClosingTags) ?? true;
+                                if (enabled) {
+                                    const text = htmlLs.doTagComplete(document, selection, htmlDocument);
+                                    return text ?? undefined;
                                 }
                             }
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-html",
-	"version": "0.0.64",
+	"version": "0.0.66",
 	"description": "Integrate vscode-languageservice-html into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/html",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -39,5 +39,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "54e88dafd9bd29cec0e921cfd6c0425b9e222e53"
+	"gitHead": "7113cd822bff8839f54ec8dfb3cb9c0486716230"
 }