Flx vuejs#1678 vuejs#2173

cereschen · Aug 20, 2020 · 76e5573 · 76e5573
1 parent 833c374
commit 76e5573
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/server/src/modes/template/services/htmlCompletion.ts b/server/src/modes/template/services/htmlCompletion.ts
@@ -33,7 +33,7 @@ export function doComplete(
 
   const offset = document.offsetAt(position);
   const node = htmlDocument.findNodeBefore(offset);
-  if (!node || node.isInterpolation) {
+  if (!node || (node.isInterpolation && offset <= node.end)) {
     return result;
   }
 
@@ -285,11 +285,15 @@ export function doComplete(
         break;
       case TokenType.AttributeValue:
         if (scanner.getTokenOffset() <= offset && offset <= scanner.getTokenEnd()) {
-          return collectAttributeValueSuggestions(
-            currentAttributeName,
-            scanner.getTokenOffset(),
-            scanner.getTokenEnd()
-          );
+          if (currentAttributeName === 'style') {
+            return emmet.doComplete(document, position, 'css', emmetConfig);
+          } else {
+            return collectAttributeValueSuggestions(
+              currentAttributeName,
+              scanner.getTokenOffset(),
+              scanner.getTokenEnd()
+            );
+          }
         }
         break;
       case TokenType.Whitespace: