From dab10d79fed0df42a9bd7817a86d79a698a7ffdd Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Sat, 10 Aug 2024 07:09:23 -0700 Subject: [PATCH] Don't show unnamed variables in autocomplete --- .../components/core/Editor/autocomplete.ts | 35 ------------------- .../components/core/Editor/twig/completion.ts | 1 + 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 src-web/components/core/Editor/autocomplete.ts diff --git a/src-web/components/core/Editor/autocomplete.ts b/src-web/components/core/Editor/autocomplete.ts deleted file mode 100644 index 0ad8b584..00000000 --- a/src-web/components/core/Editor/autocomplete.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { closeCompletion, startCompletion } from '@codemirror/autocomplete'; -import { EditorView } from 'codemirror'; -import { debounce } from '../../../lib/debounce'; - -/* - * Debounce autocomplete until user stops typing for `millis` milliseconds. - */ -export function debouncedAutocompletionDisplay({ millis }: { millis: number }) { - // TODO: Figure out how to show completion without setting context.explicit = true - const debouncedStartCompletion = debounce(function (view: EditorView) { - startCompletion(view); - }, millis); - - return EditorView.updateListener.of(({ view, docChanged }) => { - // const completions = currentCompletions(view.state); - // const status = completionStatus(view.state); - - if (!view.hasFocus) { - debouncedStartCompletion.cancel(); - closeCompletion(view); - return; - } - - if (view.state.doc.length === 0) { - debouncedStartCompletion.cancel(); - closeCompletion(view); - return; - } - - // If the document hasn't changed, we don't need to do anything - if (docChanged) { - debouncedStartCompletion(view); - } - }); -} diff --git a/src-web/components/core/Editor/twig/completion.ts b/src-web/components/core/Editor/twig/completion.ts index e609748b..3938e910 100644 --- a/src-web/components/core/Editor/twig/completion.ts +++ b/src-web/components/core/Editor/twig/completion.ts @@ -40,6 +40,7 @@ export function twigCompletion({ options }: TwigCompletionConfig) { validFor: () => true, // Not really sure why this is all it needs from: toMatch.from, options: options + .filter((v) => v.name.trim()) .map((v) => ({ label: toStartOfVariable ? `${openTag}${v.name}${closeTag}` : v.name, apply: `${openTag}${v.name}${closeTag}`,