From 371f08a5ea7cda436e0f88430e64f0a4c8a40a88 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Wed, 25 Dec 2024 13:07:40 +0100
Subject: [PATCH] CB-5448 pr fixes

---
 .../SQLEditor/useSqlDialectAutocompletion.ts  | 30 ++++---------------
 1 file changed, 6 insertions(+), 24 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
index 2a9d8a2748..b210a87a26 100644
--- a/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectAutocompletion.ts
+++ b/webapp/packages/plugin-sql-editor-new/src/SQLEditor/useSqlDialectAutocompletion.ts
@@ -10,7 +10,7 @@ import { useState } from 'react';
 import { createComplexLoader, useComplexLoader, useObjectRef } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { LocalizationService } from '@cloudbeaver/core-localization';
-import { GlobalConstants, isNotNullDefined } from '@cloudbeaver/core-utils';
+import { GlobalConstants } from '@cloudbeaver/core-utils';
 import type { Compartment, Completion, CompletionConfig, CompletionContext, CompletionResult, Extension } from '@cloudbeaver/plugin-codemirror6';
 import { type ISQLEditorData, type SQLProposal } from '@cloudbeaver/plugin-sql-editor';
 
@@ -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,
         })),
@@ -80,7 +82,7 @@ export function useSqlDialectAutocompletion(data: ISQLEditorData): [Compartment,
         const limitIsMet = optionsRef.data.hintsLimitIsMet;
 
         const result: CompletionResult = {
-          from: getFrom(proposals, word.from),
+          from: word.from,
           options: getOptionsFromProposals(context.explicit, word.text, proposals),
           update(current, from, to, context) {
             if (startPos > context.pos) {
@@ -147,23 +149,3 @@ export function useSqlDialectAutocompletion(data: ISQLEditorData): [Compartment,
 
   return useEditorAutocompletion(config);
 }
-
-function getFrom(proposals: SQLProposal[], defaultFrom: number): number {
-  if (!proposals.length) {
-    return defaultFrom;
-  }
-
-  const candidate = proposals.find(proposal => proposal.replacementOffset !== undefined)?.replacementOffset;
-
-  if (!isNotNullDefined(candidate)) {
-    return defaultFrom;
-  }
-
-  if (proposals.every(proposal => proposal.replacementOffset === candidate)) {
-    return candidate;
-  }
-
-  console.error('Inconsistent proposals replacementOffset. It is supposed to be the same for all proposals');
-
-  return defaultFrom;
-}