From 9f129e3a138a1e5cd17a8da1ee1e24f104227b0c Mon Sep 17 00:00:00 2001 From: Valentin Kirilov Date: Tue, 21 Oct 2025 10:58:23 +0300 Subject: [PATCH 1/3] fix(ui): prevent the app from crashing when Redis commands are not pasrable for some reason --- .../monaco-laguages/MonacoLanguages.tsx | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx b/redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx index 50f2f60815..bc92a43f6c 100644 --- a/redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx +++ b/redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx @@ -67,14 +67,18 @@ const MonacoLanguages = () => { 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), + ) + monaco.languages.setMonarchTokensProvider( + MonacoLanguage.Redis, + getRedisMonarchTokensProvider(REDIS_COMMANDS), + ) + } catch (exception) { + console.error('Monaco languages setup error: ', exception) + } } return null From 02d43a899f52fb95e1ef184b127a2d61c716dc44 Mon Sep 17 00:00:00 2001 From: Valentin Kirilov Date: Tue, 21 Oct 2025 13:14:44 +0300 Subject: [PATCH 2/3] fix(ui): split setup for the supportbed commands by the monaco editor --- .../ui/src/components/monaco-laguages/MonacoLanguages.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx b/redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx index bc92a43f6c..6b0f71916b 100644 --- a/redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx +++ b/redisinsight/ui/src/components/monaco-laguages/MonacoLanguages.tsx @@ -72,12 +72,17 @@ const MonacoLanguages = () => { MonacoLanguage.RediSearch, getRediSearchSubRedisMonarchTokensProvider(REDIS_SEARCH_COMMANDS), ) + } catch (exception) { + console.error('Monaco RediSearch language setup error: ', exception) + } + + try { monaco.languages.setMonarchTokensProvider( MonacoLanguage.Redis, getRedisMonarchTokensProvider(REDIS_COMMANDS), ) } catch (exception) { - console.error('Monaco languages setup error: ', exception) + console.error('Monaco Redis language setup error: ', exception) } } From 19e3c8a452b1fdc6825f67a688b0bc2258c4116e Mon Sep 17 00:00:00 2001 From: Valentin Kirilov Date: Tue, 21 Oct 2025 13:14:44 +0300 Subject: [PATCH 3/3] fix(ui): split setup for the supportbed commands by the monaco editor re #RI-7627 --- .../dedicated-editor/DedicatedEditor.tsx | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/redisinsight/ui/src/components/monaco-editor/components/dedicated-editor/DedicatedEditor.tsx b/redisinsight/ui/src/components/monaco-editor/components/dedicated-editor/DedicatedEditor.tsx index 4f5e341bbb..de0c57d816 100644 --- a/redisinsight/ui/src/components/monaco-editor/components/dedicated-editor/DedicatedEditor.tsx +++ b/redisinsight/ui/src/components/monaco-editor/components/dedicated-editor/DedicatedEditor.tsx @@ -194,10 +194,17 @@ const DedicatedEditor = (props: Props) => { 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, + ) + } } const onChangeLanguageSelect = (id: string) => {