Merge branch 'devel' into 3911-ai-command

dbeaver · Dec 30, 2024 · 930fde6 · 930fde6
2 parents af3895a + efd0be6
commit 930fde6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectAutocompletion.ts b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectAutocompletion.ts
@@ -24,7 +24,7 @@ const CLOSE_CHARACTERS = /[\s()[\]{};:>,=\\*]/;
 const COMPLETION_WORD = /[\w*]*/;
 
 export function useSqlDialectAutocompletion(data: ISQLEditorData): [Compartment, Extension] {
-  const { closeCompletion, useEditorAutocompletion } = useComplexLoader(codemirrorComplexLoader);
+  const { closeCompletion, useEditorAutocompletion, insertCompletionText } = useComplexLoader(codemirrorComplexLoader);
   const localizationService = useService(LocalizationService);
   const optionsRef = useObjectRef({ data });
 
@@ -56,7 +56,9 @@ export function useSqlDialectAutocompletion(data: ISQLEditorData): [Compartment,
       return [
         ...filteredProposals.map<SqlCompletion>(proposal => ({
           label: proposal.displayString,
-          apply: proposal.replacementString,
+          apply: (view, completion, from, to) => {
+            view.dispatch(insertCompletionText(view.state, proposal.replacementString, proposal.replacementOffset, to));
+          },
           boost: proposal.score,
           icon: proposal.icon,
         })),