do not suggest lang when editing attributes (#469)

Author: tanhauhau

packages/language-server/src/plugins/html/HTMLPlugin.ts

@@ -6,6 +6,7 @@ import {
     Position,
     SymbolInformation,
     CompletionItem,
+    CompletionItemKind,
 } from 'vscode-languageserver';
 import {
     DocumentManager,
@@ -21,6 +22,7 @@ export class HTMLPlugin implements HoverProvider, CompletionsProvider {
     private configManager: LSConfigManager;
     private lang = getLanguageService({ customDataProviders: [svelteHtmlDataProvider] });
     private documents = new WeakMap<Document, HTMLDocument>();
+    private styleScriptTemplate = new Set(['template', 'style', 'script']);
 
     constructor(docManager: DocumentManager, configManager: LSConfigManager) {
         this.configManager = configManager;
@@ -84,8 +86,10 @@ export class HTMLPlugin implements HoverProvider, CompletionsProvider {
     }
 
     private getLangCompletions(completions: CompletionItem[]): CompletionItem[] {
-        const styleScriptTemplateCompletions = completions.filter((completion) =>
-            ['template', 'style', 'script'].includes(completion.label),
+        const styleScriptTemplateCompletions = completions.filter(
+            (completion) =>
+                completion.kind === CompletionItemKind.Property &&
+                this.styleScriptTemplate.has(completion.label),
         );
         const langCompletions: CompletionItem[] = [];
         addLangCompletion('script', ['ts']);

packages/language-server/test/plugins/html/HTMLPlugin.test.ts

@@ -91,4 +91,23 @@ describe('HTML Plugin', () => {
         const tagCompletion = plugin.doTagComplete(document, Position.create(0, 21));
         assert.strictEqual(tagCompletion, '$0</div>');
     });
+
+    it('does provide lang in completions', async () => {
+        const { plugin, document } = setup('<sty');
+
+        const completions = plugin.getCompletions(document, Position.create(0, 4));
+        assert.ok(Array.isArray(completions && completions.items));
+        assert.ok(completions!.items.find((item) => item.label === 'style (lang="less")'));
+    });
+
+    it('does not provide lang in completions for attributes', async () => {
+        const { plugin, document } = setup('<div sty');
+
+        const completions = plugin.getCompletions(document, Position.create(0, 8));
+        assert.ok(Array.isArray(completions && completions.items));
+        assert.strictEqual(
+            completions!.items.find((item) => item.label === 'style (lang="less")'),
+            undefined,
+        );
+    });
 });