From eadb9fc1d95ae09ac228b71dc47d919ad309ba96 Mon Sep 17 00:00:00 2001
From: Roman Sergeenko <roman.sergeenko@softeq.com>
Date: Fri, 25 Oct 2024 14:03:44 +0200
Subject: [PATCH] #RI-6170 - fix word pattern #RI-6246 - fix read more link

---
 redisinsight/ui/src/constants/monaco/monacoRedis.ts   |  2 +-
 .../pages/workbench/components/query/Query/Query.tsx  |  2 ++
 .../ui/src/pages/workbench/utils/suggestions.ts       | 11 +++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/redisinsight/ui/src/constants/monaco/monacoRedis.ts b/redisinsight/ui/src/constants/monaco/monacoRedis.ts
index fe04e76ae4..25925611ae 100644
--- a/redisinsight/ui/src/constants/monaco/monacoRedis.ts
+++ b/redisinsight/ui/src/constants/monaco/monacoRedis.ts
@@ -1,7 +1,7 @@
 import { monaco as monacoEditor } from 'react-monaco-editor'
 
 export const redisLanguageConfig: monacoEditor.languages.LanguageConfiguration = {
-  wordPattern: /(#?-?\d*\.\d\w*%?)|([@#!.:]?[\w-?]+%?)|[@#!.]/g,
+  wordPattern: /\w+\.?(\w?)+/g,
   comments: {
     lineComment: '//',
     // blockComment: ['/*', '*/'],
diff --git a/redisinsight/ui/src/pages/workbench/components/query/Query/Query.tsx b/redisinsight/ui/src/pages/workbench/components/query/Query/Query.tsx
index 803549fa50..ea98aa5f06 100644
--- a/redisinsight/ui/src/pages/workbench/components/query/Query/Query.tsx
+++ b/redisinsight/ui/src/pages/workbench/components/query/Query/Query.tsx
@@ -528,6 +528,8 @@ const Query = (props: Props) => {
 
   const setupMonacoRedisLang = (monaco: typeof monacoEditor) => {
     disposeCompletionItemProvider = monaco.languages.registerCompletionItemProvider(MonacoLanguage.Redis, {
+      // refactor/remove trigger function (TODO: after apply suggestion need trigger again)
+      // triggerCharacters: [' '], // Dot and space will trigger suggestions
       provideCompletionItems: (): monacoEditor.languages.CompletionList => ({ suggestions: suggestionsRef.current })
     }).dispose
 
diff --git a/redisinsight/ui/src/pages/workbench/utils/suggestions.ts b/redisinsight/ui/src/pages/workbench/utils/suggestions.ts
index 9e443d3f06..997e0186d3 100644
--- a/redisinsight/ui/src/pages/workbench/utils/suggestions.ts
+++ b/redisinsight/ui/src/pages/workbench/utils/suggestions.ts
@@ -2,7 +2,14 @@ import { monaco } from 'react-monaco-editor'
 import * as monacoEditor from 'monaco-editor'
 import { findIndex } from 'lodash'
 import { RedisResponseBuffer } from 'uiSrc/slices/interfaces'
-import { bufferToString, formatLongName, generateArgsForInsertText, getCommandMarkdown, Nullable } from 'uiSrc/utils'
+import {
+  bufferToString,
+  formatLongName,
+  generateArgsForInsertText,
+  getCommandMarkdown,
+  getDocUrlForCommand,
+  Nullable
+} from 'uiSrc/utils'
 import { FoundCommandArgument } from 'uiSrc/pages/workbench/types'
 import {
   DefinedArgumentName,
@@ -117,7 +124,7 @@ export const getCommandsSuggestions = (commands: IRedisCommand[], range: monaco.
     detail: generateDetail(command),
     insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
     documentation: {
-      value: getCommandMarkdown(command as any)
+      value: getCommandMarkdown(command as any, command.name ? getDocUrlForCommand(command.name) : '')
     },
     sortText: getSortingForCommand(command)
   }))