Skip to content

#RI-6170 - fix word pattern #4014

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 1 commit into from
Oct 25, 2024
Merged

#RI-6170 - fix word pattern #4014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/constants/monaco/monacoRedis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: ['/*', '*/'],
Expand Down
2 changes: 2 additions & 0 deletions redisinsight/ui/src/pages/workbench/components/query/Query/Query.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 9 additions & 2 deletions redisinsight/ui/src/pages/workbench/utils/suggestions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
}))
Expand Down