Merge pull request #98 from RedisInsight/feature/bugfix

#RI-2150, #RI-2079, #RI-2151

Author: egor-zalenski

redisinsight/ui/src/components/query/Query/Query.tsx

@@ -114,11 +114,13 @@ const Query = (props: Props) => {
     }
   }
 
-  const onKeyDownMonaco = (e:monacoEditor.IKeyboardEvent) => {
+  const onKeyDownMonaco = (e: monacoEditor.IKeyboardEvent) => {
+    // trigger parameter hints
     if (
       e.keyCode === monaco.KeyCode.Tab
-      || e.keyCode === monaco.KeyCode.Space
       || e.keyCode === monaco.KeyCode.Enter
+      || (e.keyCode === monaco.KeyCode.Space && e.ctrlKey && e.shiftKey)
+      || (e.keyCode === monaco.KeyCode.Space && !e.ctrlKey && !e.shiftKey)
     ) {
       onTriggerParameterHints()
     }

redisinsight/ui/src/constants/monacoRedis.ts

@@ -1,6 +1,7 @@
 import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api'
 
 export const redisLanguageConfig: monacoEditor.languages.LanguageConfiguration = {
+  wordPattern: /(#?-?\d*\.\d\w*%?)|([@#!.:]?[\w-?]+%?)|[@#!.]/g,
   comments: {
     lineComment: '//',
     // blockComment: ['/*', '*/'],

redisinsight/ui/src/styles/base/_monaco.scss

@@ -26,6 +26,10 @@
   }
 }
 
+.monaco-editor .accessibilityHelpWidget {
+  overflow: auto;
+}
+
 .monaco-glyph-run-command {
   color: var(--rsSubmitBtn);
   opacity: .5 !important;

redisinsight/ui/src/utils/monacoRedisMonarchTokensProvider.ts

@@ -31,6 +31,7 @@ export const getRedisMonarchTokensProvider = (commands: string[]): monacoEditor.
         { include: '@numbers' },
         { include: '@strings' },
         { include: '@scopes' },
+        { include: '@keyword' },
         [/[;,.]/, 'delimiter'],
         [/[()]/, '@brackets'],
         [
@@ -47,6 +48,12 @@ export const getRedisMonarchTokensProvider = (commands: string[]): monacoEditor.
         ],
         [/[<>=!%&+\-*/|~^]/, 'operator'],
       ],
+      keyword: [
+        [
+          `(${commands.join('|')})\\b`,
+          'keyword'
+        ]
+      ],
       whitespace: [
         [/\s+/, 'white'],
         [/\/\/.*$/, 'comment'],