(fix) don't trigger auto close for arrow functions

Fixes sveltejs#89
dummdidumm · May 16, 2020 · ff46c7e · ff46c7e
1 parent 89ebffc
commit ff46c7e
Showing 1 changed file with 26 additions and 15 deletions.
diff --git a/packages/svelte-vscode/src/html/autoClose.ts b/packages/svelte-vscode/src/html/autoClose.ts
@@ -6,16 +6,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import {
-    window,
-    workspace,
-    Disposable,
-    TextDocument,
-    Position,
-    SnippetString,
-} from 'vscode';
+import { window, workspace, Disposable, TextDocument, Position, SnippetString } from 'vscode';
 
-import { TextDocumentContentChangeEvent } from "vscode-languageserver-protocol";
+import { TextDocumentContentChangeEvent } from 'vscode-languageserver-protocol';
 
 export function activateTagClosing(
     tagProvider: (document: TextDocument, position: Position) => Thenable<string>,
@@ -24,7 +17,7 @@ export function activateTagClosing(
 ): Disposable {
     const disposables: Disposable[] = [];
     workspace.onDidChangeTextDocument(
-        event => onDidChangeTextDocument(event.document, event.contentChanges),
+        (event) => onDidChangeTextDocument(event.document, event.contentChanges),
         null,
         disposables,
     );
@@ -67,17 +60,35 @@ export function activateTagClosing(
         }
         const lastChange = changes[changes.length - 1];
         const lastCharacter = lastChange.text[lastChange.text.length - 1];
-        if ("range" in lastChange && (lastChange.rangeLength ?? 0) > 0 || (lastCharacter !== '>' && lastCharacter !== '/')) {
+        if (
+            ('range' in lastChange && (lastChange.rangeLength ?? 0) > 0) ||
+            (lastCharacter !== '>' && lastCharacter !== '/')
+        ) {
             return;
         }
-        const rangeStart = "range" in lastChange ? lastChange.range.start : new Position(0, document.getText().length);
+
+        const docContent = document.getText();
+
+        // VSCode has this property, but it's not in the standard typings
+        const offsetOfPrevCharacter = (<any>lastChange).rangeOffset - 1;
+        const previousCharacter =
+            lastChange.text[lastChange.text.length - 2] || docContent[offsetOfPrevCharacter];
+        // handle false positive of arrow function inside moustache tag so that this
+        // <div {() =>
+        // does not trigger auto close
+        if (previousCharacter === '=') {
+            return;
+        }
+
+        const rangeStart =
+            'range' in lastChange ? lastChange.range.start : new Position(0, docContent.length);
         const version = document.version;
         timeout = setTimeout(() => {
             const position = new Position(
                 rangeStart.line,
                 rangeStart.character + lastChange.text.length,
             );
-            tagProvider(document, position).then(text => {
+            tagProvider(document, position).then((text) => {
                 if (text && isEnabled) {
                     const activeEditor = window.activeTextEditor;
                     if (activeEditor) {
@@ -86,11 +97,11 @@ export function activateTagClosing(
                             const selections = activeEditor.selections;
                             if (
                                 selections.length &&
-                                selections.some(s => s.active.isEqual(position))
+                                selections.some((s) => s.active.isEqual(position))
                             ) {
                                 activeEditor.insertSnippet(
                                     new SnippetString(text),
-                                    selections.map(s => s.active),
+                                    selections.map((s) => s.active),
                                 );
                             } else {
                                 activeEditor.insertSnippet(new SnippetString(text), position);