Skip to content

Release/2.60.0 to latest #4037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 31, 2024
Merged

Release/2.60.0 to latest #4037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d67feb
#RI-6277 - fix incorrect highlighting
rsergeenko Oct 30, 2024
167f9b2
#RI-6277 - add current argument for check comment
rsergeenko Oct 30, 2024
84a398d
Revert "#RI-6277 - add current argument for check comment"
vlad-dargel Oct 30, 2024
643feb2
#RI-6277 - add current argument for check comment
rsergeenko Oct 30, 2024
298f42c
Merge pull request #4034 from RedisInsight/fe/bugfix/release/2.60.0
vlad-dargel Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion redisinsight/ui/src/pages/workbench/utils/monaco.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}

Expand Down
8 changes: 8 additions & 0 deletions redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ export const findSuggestionsByArg = (
const { prevCursorChar } = cursor
const [beforeOffsetArgs, [currentOffsetArg]] = args

const startCommentIndex = beforeOffsetArgs.findIndex((el) => el.startsWith('//'))
if (startCommentIndex > -1 || currentOffsetArg?.startsWith('//')) {
return {
suggestions: asSuggestionsRef([]),
helpWidget: { isOpen: false }
}
}

const scopedList = command.name
? listOfCommands.filter(({ token }) => token === command?.name)
: listOfCommands
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/ui/src/utils/monaco/monacoRedisMonarchTokensProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const getRedisMonarchTokensProvider = (commands: IRedisCommand[]): monaco
],
whitespace: [
[/\s+/, 'white'],
[/\/\/.*$/, 'comment'],
[/\/\/.*/, 'comment'],
],
numbers: [
[/0[xX][0-9a-fA-F]*/, 'number'],
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/ui/src/utils/monaco/monarchTokens/redisearchTokensSubRedis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export const getRediSearchSubRedisMonarchTokensProvider = (
],
whitespace: [
[/\s+/, 'white'],
[/\/\/.*$/, 'comment'],
[/\/\/.*/, 'comment'],
],
numbers: [
[/0[xX][0-9a-fA-F]*/, 'number'],
Expand Down
Loading