From dd1cd074c9829e89af00f2124bf6d45eeb7dbc4f Mon Sep 17 00:00:00 2001 From: Elena Stoeva Date: Fri, 19 Jul 2024 14:01:58 +0100 Subject: [PATCH 1/2] [Console Monaco] Resolve uncaught error from tokenizer --- .../kbn-monaco/src/console/lexer_rules/console_editor.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/kbn-monaco/src/console/lexer_rules/console_editor.ts b/packages/kbn-monaco/src/console/lexer_rules/console_editor.ts index 97984a83b2c9f3..8961a2652b644a 100644 --- a/packages/kbn-monaco/src/console/lexer_rules/console_editor.ts +++ b/packages/kbn-monaco/src/console/lexer_rules/console_editor.ts @@ -26,7 +26,12 @@ export const lexerRules: monaco.languages.IMonarchLanguage = { root: [ ...consoleSharedLexerRules.tokenizer.root, // method - matchTokensWithEOL('method', /([a-zA-Z]+)/, 'root', 'method_sep'), + matchTokensWithEOL( + 'method', + /([Gg][Ee][Tt])|([Pp][Oo][Ss][Tt])|([Pp][Uu][Tt])|([Pp][Aa][Tt][Cc][Hh])|([Dd][Ee][Ll][Ee][Tt][Ee])|([Hh][Ee][Aa][Dd])/, + 'root', + 'method_sep' + ), // whitespace matchToken('whitespace', '\\s+'), // text From 95e7d9331973f3ed3f3635ef6d23128ef13e8c32 Mon Sep 17 00:00:00 2001 From: Elena Stoeva Date: Tue, 23 Jul 2024 17:17:46 +0100 Subject: [PATCH 2/2] Simplify regex --- .../kbn-monaco/src/console/lexer_rules/console_editor.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/kbn-monaco/src/console/lexer_rules/console_editor.ts b/packages/kbn-monaco/src/console/lexer_rules/console_editor.ts index 8961a2652b644a..164a44eb9f5fbd 100644 --- a/packages/kbn-monaco/src/console/lexer_rules/console_editor.ts +++ b/packages/kbn-monaco/src/console/lexer_rules/console_editor.ts @@ -21,17 +21,13 @@ export const languageConfiguration: monaco.languages.LanguageConfiguration = { export const lexerRules: monaco.languages.IMonarchLanguage = { ...consoleSharedLexerRules, + ignoreCase: true, tokenizer: { ...consoleSharedLexerRules.tokenizer, root: [ ...consoleSharedLexerRules.tokenizer.root, // method - matchTokensWithEOL( - 'method', - /([Gg][Ee][Tt])|([Pp][Oo][Ss][Tt])|([Pp][Uu][Tt])|([Pp][Aa][Tt][Cc][Hh])|([Dd][Ee][Ll][Ee][Tt][Ee])|([Hh][Ee][Aa][Dd])/, - 'root', - 'method_sep' - ), + matchTokensWithEOL('method', /get|post|put|patch|delete|head/, 'root', 'method_sep'), // whitespace matchToken('whitespace', '\\s+'), // text