From 163828cff650a52bf794fe7aca59cd10ee616c7e Mon Sep 17 00:00:00 2001
From: Lyu Jason <jason.lyu@supergeo.com.tw>
Date: Thu, 10 Sep 2020 18:09:52 +0800
Subject: [PATCH 1/8] component documentaion comment snippet

---
 .../plugins/svelte/features/getCompletions.ts | 53 ++++++++++++++++---
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/packages/language-server/src/plugins/svelte/features/getCompletions.ts b/packages/language-server/src/plugins/svelte/features/getCompletions.ts
index a64e50989..2b8ea998c 100644
--- a/packages/language-server/src/plugins/svelte/features/getCompletions.ts
+++ b/packages/language-server/src/plugins/svelte/features/getCompletions.ts
@@ -1,3 +1,4 @@
+import { EOL } from 'os';
 import { SvelteDocument } from '../SvelteDocument';
 import {
     Position,
@@ -8,9 +9,20 @@ import {
 } from 'vscode-languageserver';
 import { SvelteTag, documentation, getLatestOpeningTag } from './SvelteTags';
 import { isInTag } from '../../../lib/documents';
-/**
- * Get completions for special svelte tags within moustache tags.
- */
+
+const HTML_COMMENT_START = '<!--';
+
+const componentCompletion = <CompletionItem>{
+    label: '@component',
+    insertText: `component${EOL}$1${EOL}`,
+    documentation: 'documentation for this component. ' +
+        'It will show up on hover. You can use markdown or code block here',
+    insertTextFormat: InsertTextFormat.Snippet,
+    kind: CompletionItemKind.Snippet,
+    sortText: '-1',
+    preselect: true,
+};
+
 export function getCompletions(
     svelteDoc: SvelteDocument,
     position: Position,
@@ -28,13 +40,40 @@ export function getCompletions(
     const notPreceededByOpeningBracket = !/[\s\S]*{\s*[#:/@]\w*$/.test(
         lastCharactersBeforePosition,
     );
-    if (isInStyleOrScript || notPreceededByOpeningBracket) {
+    if (isInStyleOrScript) {
         return null;
     }
 
-    const triggerCharacter = getTriggerCharacter(lastCharactersBeforePosition);
-    // return all, filtering with regards to user input will be done client side
-    return getCompletionsWithRegardToTriggerCharacter(triggerCharacter, svelteDoc, offset);
+    if (notPreceededByOpeningBracket) {
+        return getComponentDocumentationCompletions();
+    }
+
+    return getTagCompletionsWithinMoustache();
+
+    /**
+     * Get completions for special svelte tags within moustache tags.
+     */
+    function getTagCompletionsWithinMoustache() {
+        const triggerCharacter = getTriggerCharacter(lastCharactersBeforePosition);
+        // return all, filtering with regards to user input will be done client side
+        return getCompletionsWithRegardToTriggerCharacter(triggerCharacter, svelteDoc, offset);
+    }
+
+    function getComponentDocumentationCompletions() {
+        if (!lastCharactersBeforePosition.includes(HTML_COMMENT_START)) {
+            return null;
+        }
+
+        const commentStartIndex = lastCharactersBeforePosition.lastIndexOf(HTML_COMMENT_START);
+        const text = lastCharactersBeforePosition.substring(
+            commentStartIndex + HTML_COMMENT_START.length
+        ).trimLeft();
+
+        if (componentCompletion.label.includes(text)) {
+            return CompletionList.create([componentCompletion]);
+        }
+        return null;
+    }
 }
 
 /**

From eccba3e555a82332bbfcc18d07c680e3636abc07 Mon Sep 17 00:00:00 2001
From: Lyu Jason <b00605009@ntu.edu.tw>
Date: Tue, 15 Sep 2020 21:48:28 +0800
Subject: [PATCH 2/8] ts-directive completions

---
 .../plugins/typescript/TypeScriptPlugin.ts    | 23 +++++-
 .../typescript/features/CompletionProvider.ts | 22 +++---
 .../getDirectiveCommentCompletions.ts         | 79 +++++++++++++++++++
 3 files changed, 112 insertions(+), 12 deletions(-)
 create mode 100644 packages/language-server/src/plugins/typescript/features/getDirectiveCommentCompletions.ts

diff --git a/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts b/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts
index a1455a07a..8e689ed77 100644
--- a/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts
+++ b/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts
@@ -12,6 +12,7 @@ import {
     Range,
     SymbolInformation,
     WorkspaceEdit,
+    CompletionList,
 } from 'vscode-languageserver';
 import { Document, DocumentManager, mapSymbolInformationToOriginal } from '../../lib/documents';
 import { LSConfigManager, LSTypescriptConfig } from '../../ls-config';
@@ -42,6 +43,7 @@ import { RenameProviderImpl } from './features/RenameProvider';
 import { UpdateImportsProviderImpl } from './features/UpdateImportsProvider';
 import { LSAndTSDocResolver } from './LSAndTSDocResolver';
 import { convertToLocationRange, getScriptKindFromFileName, symbolKindFromString } from './utils';
+import { getDirectiveCommentCompletions } from './features/getDirectiveCommentCompletions';
 
 export class TypeScriptPlugin
     implements
@@ -168,7 +170,26 @@ export class TypeScriptPlugin
             return null;
         }
 
-        return this.completionProvider.getCompletions(document, position, completionContext);
+        const tsDirectiveCommentCompletions = getDirectiveCommentCompletions(
+            position,
+            document,
+            completionContext
+        );
+
+        const completions = await this.completionProvider.getCompletions(
+            document,
+            position,
+            completionContext
+        );
+
+        if (completions && tsDirectiveCommentCompletions) {
+            return CompletionList.create(
+                completions.items.concat(tsDirectiveCommentCompletions.items),
+                completions.isIncomplete
+            );
+        }
+
+        return completions ?? tsDirectiveCommentCompletions;
     }
 
     async resolveCompletion(
diff --git a/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts b/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts
index b222acf90..d855f887b 100644
--- a/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts
+++ b/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts
@@ -34,7 +34,7 @@ export interface CompletionEntryWithIdentifer extends ts.CompletionEntry, TextDo
 type validTriggerCharacter = '.' | '"' | "'" | '`' | '/' | '@' | '<' | '#';
 
 export class CompletionsProviderImpl implements CompletionsProvider<CompletionEntryWithIdentifer> {
-    constructor(private readonly lsAndTsDocResovler: LSAndTSDocResolver) {}
+    constructor(private readonly lsAndTsDocResolver: LSAndTSDocResolver) { }
 
     /**
      * The language service throws an error if the character is not a valid trigger character.
@@ -58,7 +58,7 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionEn
             return null;
         }
 
-        const { lang, tsDoc } = this.lsAndTsDocResovler.getLSAndTSDoc(document);
+        const { lang, tsDoc } = this.lsAndTsDocResolver.getLSAndTSDoc(document);
 
         const filePath = tsDoc.filePath;
         if (!filePath) {
@@ -136,7 +136,7 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionEn
         originalPosition: Position,
     ): AppCompletionItem<CompletionEntryWithIdentifer>[] {
         const snapshot = getComponentAtPosition(
-            this.lsAndTsDocResovler,
+            this.lsAndTsDocResolver,
             lang,
             doc,
             tsDoc,
@@ -236,7 +236,7 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionEn
         completionItem: AppCompletionItem<CompletionEntryWithIdentifer>,
     ): Promise<AppCompletionItem<CompletionEntryWithIdentifer>> {
         const { data: comp } = completionItem;
-        const { tsDoc, lang } = this.lsAndTsDocResovler.getLSAndTSDoc(document);
+        const { tsDoc, lang } = this.lsAndTsDocResolver.getLSAndTSDoc(document);
 
         const filePath = tsDoc.filePath;
 
@@ -333,16 +333,16 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionEn
 
         const { span } = change;
 
-        const virutalRange = convertRange(fragment, span);
+        const virtualRange = convertRange(fragment, span);
         let range: Range;
-        const isNewImport = isImport && virutalRange.start.character === 0;
+        const isNewImport = isImport && virtualRange.start.character === 0;
 
         // Since new import always can't be mapped, we'll have special treatment here
         //  but only hack this when there is multiple line in script
-        if (isNewImport && virutalRange.start.line > 1) {
-            range = this.mapRangeForNewImport(fragment, virutalRange);
+        if (isNewImport && virtualRange.start.line > 1) {
+            range = this.mapRangeForNewImport(fragment, virtualRange);
         } else {
-            range = mapRangeToOriginal(fragment, virutalRange);
+            range = mapRangeToOriginal(fragment, virtualRange);
         }
 
         // If range is somehow not mapped in parent,
@@ -372,8 +372,8 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionEn
     }
 
     private mapRangeForNewImport(fragment: SvelteSnapshotFragment, virtualRange: Range) {
-        const sourceMapableRange = this.offsetLinesAndMovetoStartOfLine(virtualRange, -1);
-        const mappableRange = mapRangeToOriginal(fragment, sourceMapableRange);
+        const sourceMappableRange = this.offsetLinesAndMovetoStartOfLine(virtualRange, -1);
+        const mappableRange = mapRangeToOriginal(fragment, sourceMappableRange);
         return this.offsetLinesAndMovetoStartOfLine(mappableRange, 1);
     }
 
diff --git a/packages/language-server/src/plugins/typescript/features/getDirectiveCommentCompletions.ts b/packages/language-server/src/plugins/typescript/features/getDirectiveCommentCompletions.ts
new file mode 100644
index 000000000..805193286
--- /dev/null
+++ b/packages/language-server/src/plugins/typescript/features/getDirectiveCommentCompletions.ts
@@ -0,0 +1,79 @@
+import { Document, isInTag } from '../../../lib/documents';
+import {
+    Position,
+    CompletionItemKind,
+    CompletionItem,
+    TextEdit,
+    Range,
+    CompletionList,
+    CompletionContext,
+} from 'vscode-languageserver';
+
+/**
+ * from https://github.com/microsoft/vscode/blob/157255fa4b0775c5ab8729565faf95927b610cac/extensions/typescript-language-features/src/languageFeatures/directiveCommentCompletions.ts#L19
+ */
+export const tsDirectives = [
+    {
+        value: '@ts-check',
+        description:
+            'Enables semantic checking in a JavaScript file. Must be at the top of a file.',
+    },
+    {
+        value: '@ts-nocheck',
+        description:
+            'Disables semantic checking in a JavaScript file. Must be at the top of a file.',
+    },
+    {
+        value: '@ts-ignore',
+        description: 'Suppresses @ts-check errors on the next line of a file.',
+    },
+    {
+        value: '@ts-expect-error',
+        description:
+            'Suppresses @ts-check errors on the next line of a file, expecting at least one to exist.',
+    },
+];
+
+/**
+ * from https://github.com/microsoft/vscode/blob/157255fa4b0775c5ab8729565faf95927b610cac/extensions/typescript-language-features/src/languageFeatures/directiveCommentCompletions.ts#L64
+ */
+export function getDirectiveCommentCompletions(
+    position: Position,
+    document: Document,
+    completionContext: CompletionContext | undefined,
+) {
+    // don't trigger until // @
+    if (completionContext?.triggerCharacter === '/') {
+        return null;
+    }
+
+    const inScript = isInTag(position, document.scriptInfo);
+    const inModule = isInTag(position, document.moduleScriptInfo);
+    if (!inModule && !inScript) {
+        return null;
+    }
+
+    const lineStart = document.offsetAt(Position.create(position.line, 0));
+    const offset = document.offsetAt(position);
+    const prefix = document.getText().slice(lineStart, offset);
+    const match = prefix.match(/^\s*\/\/+\s?(@[a-zA-Z-]*)?$/);
+
+    if (match) {
+        const startCharacter = Math.max(0, position.character - (match[1]?.length ?? 0));
+        const start = Position.create(position.line, startCharacter);
+
+        const items = tsDirectives.map<CompletionItem>(({ value, description }) => ({
+            detail: description,
+            label: value,
+            kind: CompletionItemKind.Snippet,
+            textEdit: TextEdit.replace(
+                Range.create(start, Position.create(start.line, start.character + value.length)),
+                value,
+            ),
+        }));
+
+        return CompletionList.create(items, false);
+    }
+
+    return null;
+}

From db5039a1d5919257e92e6dd11343618f875fa994 Mon Sep 17 00:00:00 2001
From: Lyu Jason <jason.lyu@supergeo.com.tw>
Date: Wed, 16 Sep 2020 17:50:36 +0800
Subject: [PATCH 3/8] test for component documentation snippet

---
 .../src/plugins/svelte/features/getCompletions.ts  |  7 ++++---
 .../plugins/svelte/features/getCompletions.test.ts | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/language-server/src/plugins/svelte/features/getCompletions.ts b/packages/language-server/src/plugins/svelte/features/getCompletions.ts
index 2b8ea998c..c935d4835 100644
--- a/packages/language-server/src/plugins/svelte/features/getCompletions.ts
+++ b/packages/language-server/src/plugins/svelte/features/getCompletions.ts
@@ -12,7 +12,7 @@ import { isInTag } from '../../../lib/documents';
 
 const HTML_COMMENT_START = '<!--';
 
-const componentCompletion = <CompletionItem>{
+const componentDocumentationCompletion: CompletionItem = {
     label: '@component',
     insertText: `component${EOL}$1${EOL}`,
     documentation: 'documentation for this component. ' +
@@ -20,6 +20,7 @@ const componentCompletion = <CompletionItem>{
     insertTextFormat: InsertTextFormat.Snippet,
     kind: CompletionItemKind.Snippet,
     sortText: '-1',
+    filterText: 'component',
     preselect: true,
 };
 
@@ -69,8 +70,8 @@ export function getCompletions(
             commentStartIndex + HTML_COMMENT_START.length
         ).trimLeft();
 
-        if (componentCompletion.label.includes(text)) {
-            return CompletionList.create([componentCompletion]);
+        if (componentDocumentationCompletion.label.includes(text)) {
+            return CompletionList.create([componentDocumentationCompletion], true);
         }
         return null;
     }
diff --git a/packages/language-server/test/plugins/svelte/features/getCompletions.test.ts b/packages/language-server/test/plugins/svelte/features/getCompletions.test.ts
index 9c9f28484..db69b29bb 100644
--- a/packages/language-server/test/plugins/svelte/features/getCompletions.test.ts
+++ b/packages/language-server/test/plugins/svelte/features/getCompletions.test.ts
@@ -1,4 +1,5 @@
 import * as assert from 'assert';
+import { EOL } from 'os';
 import { Position } from 'vscode-languageserver';
 import { getCompletions } from '../../../../src/plugins/svelte/features/getCompletions';
 import { SvelteDocument } from '../../../../src/plugins/svelte/SvelteDocument';
@@ -115,4 +116,17 @@ describe('SveltePlugin#getCompletions', () => {
             expectCompletionsFor('{#if}{/if}{#if}{#await}{/').toEqual(['await']);
         });
     });
+
+    it('should return completion for component documentation comment', () => {
+        const content = '<!--@';
+        const svelteDoc = new SvelteDocument(new Document('url', content));
+        const completions = getCompletions(
+            svelteDoc,
+            Position.create(0, content.length)
+        );
+        assert.deepStrictEqual(
+            completions?.items?.[0].insertText,
+            `component${EOL}$1${EOL}`
+        );
+    });
 });

From 36d4968fd8922bc488dcd3d468a91429d537537a Mon Sep 17 00:00:00 2001
From: Lyu Jason <b00605009@ntu.edu.tw>
Date: Sun, 20 Sep 2020 16:07:04 +0800
Subject: [PATCH 4/8] test for typescript directive comment completions

---
 .../getDirectiveCommentCompletions.test.ts    | 132 ++++++++++++++++++
 .../completions/ts-directive-comment.svelte   |   9 ++
 2 files changed, 141 insertions(+)
 create mode 100644 packages/language-server/test/plugins/typescript/features/getDirectiveCommentCompletions.test.ts
 create mode 100644 packages/language-server/test/plugins/typescript/testfiles/completions/ts-directive-comment.svelte

diff --git a/packages/language-server/test/plugins/typescript/features/getDirectiveCommentCompletions.test.ts b/packages/language-server/test/plugins/typescript/features/getDirectiveCommentCompletions.test.ts
new file mode 100644
index 000000000..01f7a4644
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/features/getDirectiveCommentCompletions.test.ts
@@ -0,0 +1,132 @@
+import path from 'path';
+import ts from 'typescript';
+import assert from 'assert';
+import { Document } from '../../../../src/lib/documents';
+import { pathToUrl } from '../../../../src/utils';
+import {
+    Position,
+    CompletionContext,
+    CompletionTriggerKind,
+    CompletionList,
+    TextEdit,
+} from 'vscode-languageserver';
+import { getDirectiveCommentCompletions } from '../../../../src/plugins/typescript/features/getDirectiveCommentCompletions';
+
+describe('can get typescript directive comment completions', () => {
+    function setup(
+        position: Position,
+        context: CompletionContext = { triggerKind: CompletionTriggerKind.Invoked },
+    ) {
+        const testDir = path.join(__dirname, '..');
+        const filePath = path.join(
+            testDir,
+            'testfiles',
+            'completions',
+            'ts-directive-comment.svelte',
+        );
+        const document = new Document(pathToUrl(filePath), ts.sys.readFile(filePath)!);
+        const result = getDirectiveCommentCompletions(position, document, context);
+
+        return result;
+    }
+
+    function testForScript(position: Position) {
+        const result = setup(position);
+        assert.deepStrictEqual(
+            result,
+            {
+                isIncomplete: false,
+                items: [
+                    {
+                        detail:
+                            'Enables semantic checking in a JavaScript file. Must be at the top of a file.',
+                        kind: 15,
+                        label: '@ts-check',
+                        textEdit: {
+                            newText: '@ts-check',
+                            range: {
+                                end: {
+                                    character: 11,
+                                    line: position.line,
+                                },
+                                start: {
+                                    character: 2,
+                                    line: position.line,
+                                },
+                            },
+                        },
+                    },
+                    {
+                        detail:
+                            'Disables semantic checking in a JavaScript file. Must be at the top of a file.',
+                        kind: 15,
+                        label: '@ts-nocheck',
+                        textEdit: {
+                            newText: '@ts-nocheck',
+                            range: {
+                                end: {
+                                    character: 13,
+                                    line: position.line,
+                                },
+                                start: {
+                                    character: 2,
+                                    line: position.line,
+                                },
+                            },
+                        },
+                    },
+                    {
+                        detail: 'Suppresses @ts-check errors on the next line of a file.',
+                        kind: 15,
+                        label: '@ts-ignore',
+                        textEdit: {
+                            newText: '@ts-ignore',
+                            range: {
+                                end: {
+                                    character: 12,
+                                    line: position.line,
+                                },
+                                start: {
+                                    character: 2,
+                                    line: position.line,
+                                },
+                            },
+                        },
+                    },
+                    {
+                        detail:
+                            'Suppresses @ts-check errors on the next line of a file, expecting at least one to exist.',
+                        kind: 15,
+                        label: '@ts-expect-error',
+                        textEdit: {
+                            newText: '@ts-expect-error',
+                            range: {
+                                end: {
+                                    character: 18,
+                                    line: position.line,
+                                },
+                                start: {
+                                    character: 2,
+                                    line: position.line,
+                                },
+                            },
+                        },
+                    },
+                ],
+            },
+        );
+    }
+
+    it('provides in instance scripts', () => {
+        testForScript(Position.create(1, 3));
+    });
+
+    it('provides in module scripts', () => {
+        testForScript(Position.create(5, 3));
+    });
+
+    it(`don't provide in markup`, () => {
+        const result = setup(Position.create(8, 3));
+        assert.deepStrictEqual(result, null);
+    });
+});
diff --git a/packages/language-server/test/plugins/typescript/testfiles/completions/ts-directive-comment.svelte b/packages/language-server/test/plugins/typescript/testfiles/completions/ts-directive-comment.svelte
new file mode 100644
index 000000000..17e81fafb
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/testfiles/completions/ts-directive-comment.svelte
@@ -0,0 +1,9 @@
+<script context="module">
+//@
+</script>
+
+<script>
+//@
+//       @
+</script>
+//@

From 24b640bc2c8945b925754eaaae63794810c51e3d Mon Sep 17 00:00:00 2001
From: Lyu Jason <jason.lyu@supergeo.com.tw>
Date: Wed, 23 Sep 2020 13:34:00 +0800
Subject: [PATCH 5/8] clean up, lint

---
 .../features/getDirectiveCommentCompletions.test.ts           | 4 +---
 .../testfiles/completions/ts-directive-comment.svelte         | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/language-server/test/plugins/typescript/features/getDirectiveCommentCompletions.test.ts b/packages/language-server/test/plugins/typescript/features/getDirectiveCommentCompletions.test.ts
index 01f7a4644..78a4be45c 100644
--- a/packages/language-server/test/plugins/typescript/features/getDirectiveCommentCompletions.test.ts
+++ b/packages/language-server/test/plugins/typescript/features/getDirectiveCommentCompletions.test.ts
@@ -7,8 +7,6 @@ import {
     Position,
     CompletionContext,
     CompletionTriggerKind,
-    CompletionList,
-    TextEdit,
 } from 'vscode-languageserver';
 import { getDirectiveCommentCompletions } from '../../../../src/plugins/typescript/features/getDirectiveCommentCompletions';
 
@@ -126,7 +124,7 @@ describe('can get typescript directive comment completions', () => {
     });
 
     it(`don't provide in markup`, () => {
-        const result = setup(Position.create(8, 3));
+        const result = setup(Position.create(7, 3));
         assert.deepStrictEqual(result, null);
     });
 });
diff --git a/packages/language-server/test/plugins/typescript/testfiles/completions/ts-directive-comment.svelte b/packages/language-server/test/plugins/typescript/testfiles/completions/ts-directive-comment.svelte
index 17e81fafb..bf7ac3521 100644
--- a/packages/language-server/test/plugins/typescript/testfiles/completions/ts-directive-comment.svelte
+++ b/packages/language-server/test/plugins/typescript/testfiles/completions/ts-directive-comment.svelte
@@ -4,6 +4,5 @@
 
 <script>
 //@
-//       @
 </script>
 //@

From 42d0cff5fa225d937cf72f2030b5b8e52b4216d6 Mon Sep 17 00:00:00 2001
From: "Lyu, Wei-Da" <36730922+jasonlyu123@users.noreply.github.com>
Date: Wed, 23 Sep 2020 15:16:15 +0800
Subject: [PATCH 6/8] wording

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .../src/plugins/svelte/features/getCompletions.ts             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/language-server/src/plugins/svelte/features/getCompletions.ts b/packages/language-server/src/plugins/svelte/features/getCompletions.ts
index c935d4835..fea2bbf47 100644
--- a/packages/language-server/src/plugins/svelte/features/getCompletions.ts
+++ b/packages/language-server/src/plugins/svelte/features/getCompletions.ts
@@ -15,8 +15,8 @@ const HTML_COMMENT_START = '<!--';
 const componentDocumentationCompletion: CompletionItem = {
     label: '@component',
     insertText: `component${EOL}$1${EOL}`,
-    documentation: 'documentation for this component. ' +
-        'It will show up on hover. You can use markdown or code block here',
+    documentation: 'Documentation for this component. ' +
+        'It will show up on hover. You can use markdown and code blocks here',
     insertTextFormat: InsertTextFormat.Snippet,
     kind: CompletionItemKind.Snippet,
     sortText: '-1',

From 0c4325369835123054b653da228d4875028ffa2c Mon Sep 17 00:00:00 2001
From: Lyu Jason <jason.lyu@supergeo.com.tw>
Date: Wed, 23 Sep 2020 15:17:56 +0800
Subject: [PATCH 7/8] code style

---
 .../getDirectiveCommentCompletions.ts         | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/language-server/src/plugins/typescript/features/getDirectiveCommentCompletions.ts b/packages/language-server/src/plugins/typescript/features/getDirectiveCommentCompletions.ts
index 805193286..98a53ec12 100644
--- a/packages/language-server/src/plugins/typescript/features/getDirectiveCommentCompletions.ts
+++ b/packages/language-server/src/plugins/typescript/features/getDirectiveCommentCompletions.ts
@@ -58,22 +58,21 @@ export function getDirectiveCommentCompletions(
     const prefix = document.getText().slice(lineStart, offset);
     const match = prefix.match(/^\s*\/\/+\s?(@[a-zA-Z-]*)?$/);
 
-    if (match) {
-        const startCharacter = Math.max(0, position.character - (match[1]?.length ?? 0));
-        const start = Position.create(position.line, startCharacter);
-
-        const items = tsDirectives.map<CompletionItem>(({ value, description }) => ({
-            detail: description,
-            label: value,
-            kind: CompletionItemKind.Snippet,
-            textEdit: TextEdit.replace(
-                Range.create(start, Position.create(start.line, start.character + value.length)),
-                value,
-            ),
-        }));
-
-        return CompletionList.create(items, false);
+    if (!match) {
+        return null;
     }
+    const startCharacter = Math.max(0, position.character - (match[1]?.length ?? 0));
+    const start = Position.create(position.line, startCharacter);
+
+    const items = tsDirectives.map<CompletionItem>(({ value, description }) => ({
+        detail: description,
+        label: value,
+        kind: CompletionItemKind.Snippet,
+        textEdit: TextEdit.replace(
+            Range.create(start, Position.create(start.line, start.character + value.length)),
+            value,
+        ),
+    }));
 
-    return null;
+    return CompletionList.create(items, false);
 }

From 23a7ce340e20ea980f4f19c2b834cbe47c3f91b8 Mon Sep 17 00:00:00 2001
From: Lyu Jason <jason.lyu@supergeo.com.tw>
Date: Wed, 23 Sep 2020 15:42:47 +0800
Subject: [PATCH 8/8] no isIncomplete

---
 .../src/plugins/svelte/features/getCompletions.ts               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/language-server/src/plugins/svelte/features/getCompletions.ts b/packages/language-server/src/plugins/svelte/features/getCompletions.ts
index fea2bbf47..10f0819b5 100644
--- a/packages/language-server/src/plugins/svelte/features/getCompletions.ts
+++ b/packages/language-server/src/plugins/svelte/features/getCompletions.ts
@@ -71,7 +71,7 @@ export function getCompletions(
         ).trimLeft();
 
         if (componentDocumentationCompletion.label.includes(text)) {
-            return CompletionList.create([componentDocumentationCompletion], true);
+            return CompletionList.create([componentDocumentationCompletion], false);
         }
         return null;
     }