From dc2f7d53b4e08c5735ab0749c862f8c7b571b77c Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 14 Feb 2025 10:38:28 +0100
Subject: [PATCH] Unify and clean code

---
 .../common/CodeEditor/CodeEditor.svelte       |  3 +-
 .../src/components/common/CodeEditor/index.ts | 22 +++++++--
 .../common/bindings/BindingPanel.svelte       | 48 +++++--------------
 3 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
index f96b8d10f3..6381773d24 100644
--- a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
+++ b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
@@ -43,7 +43,8 @@
   } from "@codemirror/commands"
   import { setDiagnostics } from "@codemirror/lint"
   import type { Diagnostic } from "@codemirror/lint"
-  import { Compartment, EditorState, Extension } from "@codemirror/state"
+  import { Compartment, EditorState } from "@codemirror/state"
+  import type { Extension } from "@codemirror/state"
   import { javascript } from "@codemirror/lang-javascript"
   import { EditorModes } from "./"
   import { themeStore } from "@/stores/portal"
diff --git a/packages/builder/src/components/common/CodeEditor/index.ts b/packages/builder/src/components/common/CodeEditor/index.ts
index 4db4d610b8..8c81f03213 100644
--- a/packages/builder/src/components/common/CodeEditor/index.ts
+++ b/packages/builder/src/components/common/CodeEditor/index.ts
@@ -137,9 +137,13 @@ export const hbAutocomplete = (
   baseCompletions: BindingCompletionOption[]
 ): BindingCompletion => {
   function coreCompletion(context: CompletionContext) {
-    let bindingStart = context.matchBefore(EditorModes.Handlebars.match)
+    if (!baseCompletions.length) {
+      return null
+    }
 
-    let options = baseCompletions || []
+    const bindingStart = context.matchBefore(EditorModes.Handlebars.match)
+
+    const options = baseCompletions
 
     if (!bindingStart) {
       return null
@@ -150,7 +154,7 @@ export const hbAutocomplete = (
       return null
     }
     const query = bindingStart.text.replace(match[0], "")
-    let filtered = bindingFilter(options, query)
+    const filtered = bindingFilter(options, query)
 
     return {
       from: bindingStart.from + match[0].length,
@@ -170,8 +174,12 @@ export const jsAutocomplete = (
   baseCompletions: BindingCompletionOption[]
 ): BindingCompletion => {
   function coreCompletion(context: CompletionContext) {
-    let jsBinding = wrappedAutocompleteMatch(context)
-    let options = baseCompletions || []
+    if (!baseCompletions.length) {
+      return null
+    }
+
+    const jsBinding = wrappedAutocompleteMatch(context)
+    const options = baseCompletions
 
     if (jsBinding) {
       // Accommodate spaces
@@ -210,6 +218,10 @@ function setAutocomplete(
   options: BindingCompletionOption[]
 ): BindingCompletion {
   return function (context: CompletionContext) {
+    if (!options.length) {
+      return null
+    }
+
     if (wrappedAutocompleteMatch(context)) {
       return null
     }
diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 2de5a89bdc..3d99204926 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -70,8 +70,6 @@
   let expressionLogs: Log[] | undefined
   let expressionError: string | undefined
   let evaluating = false
-  let completions: BindingCompletion[] = []
-  let autocompleteOptions: BindingCompletionOption[] = []
 
   $: useSnippets = allowSnippets && !$licensing.isFreePlan
   $: editorModeOptions = getModeOptions(allowHBS, allowJS)
@@ -92,41 +90,18 @@
   $: requestEval(runtimeExpression, context, snippets)
   $: bindingHelpers = new BindingHelpers(getCaretPosition, insertAtPos)
 
-  function getOptions(
-    mode: typeof editorMode,
-    bindings: EnrichedBinding[]
-  ): [BindingCompletionOption[], BindingCompletion[]] {
-    const autocompleteOptions = []
-    const completions = []
+  $: bindingOptions = bindingsToCompletions(bindings, editorMode)
+  $: helperOptions = allowHelpers ? getHelperCompletions(editorMode) : []
+  $: snippetsOptions =
+    usingJS && useSnippets && snippets?.length ? snippets : []
 
-    const bindingOptions = bindingsToCompletions(bindings, editorMode)
-    const helperOptions = getHelperCompletions(mode)
-
-    if (mode.name === "handlebars") {
-      autocompleteOptions.push(...bindingOptions)
-      autocompleteOptions.push(...helperOptions)
-
-      completions.push(hbAutocomplete(autocompleteOptions))
-    } else if (mode.name === "javascript") {
-      if (bindingOptions.length) {
-        completions.push(jsAutocomplete(bindingOptions))
-      }
-
-      if (allowHelpers) {
-        completions.push(jsHelperAutocomplete(helperOptions))
-      }
-      if (useSnippets && snippets?.length) {
-        completions.push(snippetAutoComplete(snippets))
-      }
-    }
-
-    return [autocompleteOptions, completions]
-  }
-
-  $: [autocompleteOptions, completions] = getOptions(
-    editorMode,
-    enrichedBindings
-  )
+  $: completions = !usingJS
+    ? [hbAutocomplete([...bindingOptions, ...helperOptions])]
+    : [
+        jsAutocomplete(bindingOptions),
+        jsHelperAutocomplete(helperOptions),
+        snippetAutoComplete(snippetsOptions),
+      ]
 
   $: {
     // Ensure a valid side panel option is always selected
@@ -373,7 +348,6 @@
               bind:getCaretPosition
               bind:insertAtPos
               {completions}
-              options={autocompleteOptions}
               autofocus={autofocusEditor}
               placeholder={placeholder ||
                 "Add bindings by typing {{ or use the menu on the right"}