From 7d67feb42f500061473dec36bab700ceecca07d4 Mon Sep 17 00:00:00 2001 From: Roman Sergeenko Date: Wed, 30 Oct 2024 15:24:54 +0100 Subject: [PATCH 1/4] #RI-6277 - fix incorrect highlighting fix comments --- redisinsight/ui/src/pages/workbench/utils/monaco.ts | 2 +- .../ui/src/pages/workbench/utils/searchSuggestions.ts | 8 ++++++++ .../src/utils/monaco/monacoRedisMonarchTokensProvider.ts | 2 +- .../monaco/monarchTokens/redisearchTokensSubRedis.ts | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/redisinsight/ui/src/pages/workbench/utils/monaco.ts b/redisinsight/ui/src/pages/workbench/utils/monaco.ts index de7be34b2c..f110e5693a 100644 --- a/redisinsight/ui/src/pages/workbench/utils/monaco.ts +++ b/redisinsight/ui/src/pages/workbench/utils/monaco.ts @@ -61,7 +61,7 @@ export const getRediSearchSignutureProvider = (options: Maybe<{ const parentToken = token.token || token.arguments?.[0]?.token const parentTokenPosition = parentToken ? label.indexOf(parentToken) : 0 const wordRegex = new RegExp(`\\b${arg}\\b`, 'g') - const startPosition = wordRegex.exec(label.slice(parentTokenPosition))?.index || 0 + const startPosition = (wordRegex.exec(label.slice(parentTokenPosition))?.index || 0) + parentTokenPosition signaturePosition = [startPosition, startPosition + arg.length] } diff --git a/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts b/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts index 0d408b170f..46dbaa22df 100644 --- a/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts +++ b/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts @@ -36,6 +36,14 @@ export const findSuggestionsByArg = ( const { prevCursorChar } = cursor const [beforeOffsetArgs, [currentOffsetArg]] = args + const startCommentIndex = beforeOffsetArgs.findIndex((el) => el.startsWith('//')) + if (startCommentIndex > -1) { + return { + suggestions: asSuggestionsRef([]), + helpWidget: { isOpen: false } + } + } + const scopedList = command.name ? listOfCommands.filter(({ token }) => token === command?.name) : listOfCommands diff --git a/redisinsight/ui/src/utils/monaco/monacoRedisMonarchTokensProvider.ts b/redisinsight/ui/src/utils/monaco/monacoRedisMonarchTokensProvider.ts index ee62d07d51..fb31efa1e8 100644 --- a/redisinsight/ui/src/utils/monaco/monacoRedisMonarchTokensProvider.ts +++ b/redisinsight/ui/src/utils/monaco/monacoRedisMonarchTokensProvider.ts @@ -49,7 +49,7 @@ export const getRedisMonarchTokensProvider = (commands: IRedisCommand[]): monaco ], whitespace: [ [/\s+/, 'white'], - [/\/\/.*$/, 'comment'], + [/\/\/.*/, 'comment'], ], numbers: [ [/0[xX][0-9a-fA-F]*/, 'number'], diff --git a/redisinsight/ui/src/utils/monaco/monarchTokens/redisearchTokensSubRedis.ts b/redisinsight/ui/src/utils/monaco/monarchTokens/redisearchTokensSubRedis.ts index a28e4264de..55ff84ac55 100644 --- a/redisinsight/ui/src/utils/monaco/monarchTokens/redisearchTokensSubRedis.ts +++ b/redisinsight/ui/src/utils/monaco/monarchTokens/redisearchTokensSubRedis.ts @@ -100,7 +100,7 @@ export const getRediSearchSubRedisMonarchTokensProvider = ( ], whitespace: [ [/\s+/, 'white'], - [/\/\/.*$/, 'comment'], + [/\/\/.*/, 'comment'], ], numbers: [ [/0[xX][0-9a-fA-F]*/, 'number'], From 167f9b26b1f964887578c836112a0183189dce9f Mon Sep 17 00:00:00 2001 From: Roman Sergeenko Date: Wed, 30 Oct 2024 15:27:31 +0100 Subject: [PATCH 2/4] #RI-6277 - add current argument for check comment --- redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts b/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts index 46dbaa22df..1149e7b3b2 100644 --- a/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts +++ b/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts @@ -36,7 +36,7 @@ export const findSuggestionsByArg = ( const { prevCursorChar } = cursor const [beforeOffsetArgs, [currentOffsetArg]] = args - const startCommentIndex = beforeOffsetArgs.findIndex((el) => el.startsWith('//')) + const startCommentIndex = [...beforeOffsetArgs, currentOffsetArg].findIndex((el) => el.startsWith('//')) if (startCommentIndex > -1) { return { suggestions: asSuggestionsRef([]), From 84a398d430f89a1a6fb1483a15a1d5a36b43ba6a Mon Sep 17 00:00:00 2001 From: vlad-dargel Date: Wed, 30 Oct 2024 17:02:42 +0100 Subject: [PATCH 3/4] Revert "#RI-6277 - add current argument for check comment" This reverts commit 167f9b26b1f964887578c836112a0183189dce9f. --- redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts b/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts index 1149e7b3b2..46dbaa22df 100644 --- a/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts +++ b/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts @@ -36,7 +36,7 @@ export const findSuggestionsByArg = ( const { prevCursorChar } = cursor const [beforeOffsetArgs, [currentOffsetArg]] = args - const startCommentIndex = [...beforeOffsetArgs, currentOffsetArg].findIndex((el) => el.startsWith('//')) + const startCommentIndex = beforeOffsetArgs.findIndex((el) => el.startsWith('//')) if (startCommentIndex > -1) { return { suggestions: asSuggestionsRef([]), From 643feb28aa101d58b98c982c20fc6cf02f8cdd26 Mon Sep 17 00:00:00 2001 From: Roman Sergeenko Date: Wed, 30 Oct 2024 17:08:14 +0100 Subject: [PATCH 4/4] #RI-6277 - add current argument for check comment --- redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts b/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts index 46dbaa22df..941b2c1b26 100644 --- a/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts +++ b/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts @@ -37,7 +37,7 @@ export const findSuggestionsByArg = ( const [beforeOffsetArgs, [currentOffsetArg]] = args const startCommentIndex = beforeOffsetArgs.findIndex((el) => el.startsWith('//')) - if (startCommentIndex > -1) { + if (startCommentIndex > -1 || currentOffsetArg?.startsWith('//')) { return { suggestions: asSuggestionsRef([]), helpWidget: { isOpen: false }