(fix) emmet completions for sass (#414)

#399
sveltejs · Aug 4, 2020 · 1695e38 · 1695e38
1 parent fd3c8f0
commit 1695e38
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/language-server/src/plugins/css/CSSPlugin.ts b/packages/language-server/src/plugins/css/CSSPlugin.ts
@@ -1,4 +1,4 @@
-import { getEmmetCompletionParticipants } from 'vscode-emmet-helper';
+import { getEmmetCompletionParticipants, doComplete as doEmmetComplete } from 'vscode-emmet-helper';
 import {
     Color,
     ColorInformation,
@@ -119,10 +119,16 @@ export class CSSPlugin
         }
 
         const cssDocument = this.getCSSDoc(document);
-        if (!cssDocument.isInGenerated(position) || isSASS(cssDocument)) {
+        if (!cssDocument.isInGenerated(position)) {
             return null;
         }
 
+        if (isSASS(cssDocument)) {
+            // the css language service does not support sass, still we can use
+            // the emmet helper directly to at least get emmet completions
+            return doEmmetComplete(document, position, 'sass', {});
+        }
+
         const type = extractLanguage(cssDocument);
         const lang = getLanguageService(type);
         const emmetResults: CompletionList = {

diff --git a/packages/svelte-vscode/package.json b/packages/svelte-vscode/package.json
@@ -230,7 +230,9 @@
                     "text.html": "html",
                     "text.pug": "jade",
                     "source.css": "css",
+                    "source.css.less": "less",
                     "source.css.scss": "scss",
+                    "source.sass": "sass",
                     "source.js": "javascript",
                     "source.ts": "typescript"
                 }