Skip to content

Release/2.70.3 #5097

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

Closed
wants to merge 3 commits into from
Closed

Release/2.70.3 #5097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f129e3
fix(ui): prevent the app from crashing when Redis commands are not pa…
valkirilov Oct 21, 2025
02d43a8
fix(ui): split setup for the supportbed commands by the monaco editor
valkirilov Oct 21, 2025
19e3c8a
fix(ui): split setup for the supportbed commands by the monaco editor
valkirilov Oct 21, 2025
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
15 changes: 11 additions & 4 deletions redisinsight/ui/src/components/monaco-editor/components/dedicated-editor/DedicatedEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,17 @@
selectedLang.completionProvider?.(keywords, functions)!,
).dispose

monaco.languages.setMonarchTokensProvider(
selectedLang.language,
selectedLang.tokensProvider?.(keywords, functions)!,
)
try {
monaco.languages.setMonarchTokensProvider(
selectedLang.language,
selectedLang.tokensProvider?.(keywords, functions)!,
)
} catch (exception) {
console.error(
`Monaco ${selectedLang.language} language setup error: `,
exception,
)

Check warning on line 206 in redisinsight/ui/src/components/monaco-editor/components/dedicated-editor/DedicatedEditor.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🧾 Statement is not covered 

Warning! Not covered statement
}
}

const onChangeLanguageSelect = (id: string) => {
Expand Down
25 changes: 17 additions & 8 deletions redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,23 @@
name?.startsWith(ModuleCommandPrefix.RediSearch),
)

monaco.languages.setMonarchTokensProvider(
MonacoLanguage.RediSearch,
getRediSearchSubRedisMonarchTokensProvider(REDIS_SEARCH_COMMANDS),
)
monaco.languages.setMonarchTokensProvider(
MonacoLanguage.Redis,
getRedisMonarchTokensProvider(REDIS_COMMANDS),
)
try {
monaco.languages.setMonarchTokensProvider(
MonacoLanguage.RediSearch,
getRediSearchSubRedisMonarchTokensProvider(REDIS_SEARCH_COMMANDS),
)
} catch (exception) {
console.error('Monaco RediSearch language setup error: ', exception)

Check warning on line 76 in redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🧾 Statement is not covered 

Warning! Not covered statement
}

Check warning on line 77 in redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🧾 Statement is not covered 

Warning! Not covered statement

try {
monaco.languages.setMonarchTokensProvider(
MonacoLanguage.Redis,
getRedisMonarchTokensProvider(REDIS_COMMANDS),
)
} catch (exception) {
console.error('Monaco Redis language setup error: ', exception)

Check warning on line 85 in redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🧾 Statement is not covered 

Warning! Not covered statement
}

Check warning on line 86 in redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🧾 Statement is not covered 

Warning! Not covered statement
}

return null
Expand Down
Loading