volar-service-html 0.0.37 → 0.0.39

package/index.js

@@ -263,25 +263,26 @@ function create({ documentSelector = ['html'], useDefaultDataProvider = true, ge
                         return { ranges };
                     });
                 },
-                async provideAutoInsertionEdit(document, position, lastChange) {
+                async provideAutoInsertionEdit(document, selection, change) {
+                    // selection must at end of change
+                    if (document.offsetAt(selection) !== change.rangeOffset + change.text.length) {
+                        return;
+                    }
                     return worker(document, async (htmlDocument) => {
-                        const lastCharacter = lastChange.text[lastChange.text.length - 1];
-                        const rangeLengthIsZero = lastChange.range.start.line === lastChange.range.end.line
-                            && lastChange.range.start.character === lastChange.range.end.character;
-                        if (rangeLengthIsZero && lastCharacter === '=') {
+                        if (change.rangeLength === 0 && change.text.endsWith('=')) {
                             const enabled = await isAutoCreateQuotesEnabled(document, context);
                             if (enabled) {
                                 const completionConfiguration = await getCompletionConfiguration(document, context);
-                                const text = htmlLs.doQuoteComplete(document, position, htmlDocument, completionConfiguration);
+                                const text = htmlLs.doQuoteComplete(document, selection, htmlDocument, completionConfiguration);
                                 if (text) {
                                     return text;
                                 }
                             }
                         }
-                        if (rangeLengthIsZero && (lastCharacter === '>' || lastCharacter === '/')) {
+                        if (change.rangeLength === 0 && (change.text.endsWith('>') || change.text.endsWith('/'))) {
                             const enabled = await isAutoClosingTagsEnabled(document, context);
                             if (enabled) {
-                                const text = htmlLs.doTagComplete(document, position, htmlDocument);
+                                const text = htmlLs.doTagComplete(document, selection, htmlDocument);
                                 if (text) {
                                     return text;
                                 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-html",
-	"version": "0.0.37",
+	"version": "0.0.39",
 	"description": "Integrate vscode-languageservice-html into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/html",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -24,7 +24,7 @@
 		"url": "https://github.com/johnsoncodehk"
 	},
 	"dependencies": {
-		"vscode-html-languageservice": "^5.1.0",
+		"vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462",
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-uri": "^3.0.8"
 	},
@@ -32,12 +32,12 @@
 		"@types/node": "latest"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.2.0-alpha.1"
+		"@volar/language-service": "~2.2.0-alpha.4"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "ee14afba19f419a31c4b70e5a34f88cefb59ac49"
+	"gitHead": "69bf117b9fddb1d485396d484948485183c6d40a"
 }