[Auto Suggest] SQL Syntax Highlighting fix (#8951)

Fixes SQL monaco monarch tokens by separating the states for single quoted and double quoted strings so that both can appear properly --------- Signed-off-by: Paul Sebastian <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit 8f58bce) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Nov 27, 2024 · 4fb2972 · 4fb2972
1 parent 56b8b19
commit 4fb2972
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/changelogs/fragments/8951.yml b/changelogs/fragments/8951.yml
@@ -0,0 +1,2 @@
+fix:
+- SQL syntax highlighting double quotes ([#8951](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8951))
diff --git a/packages/osd-monaco/src/xjson/lexer_rules/opensearchsql.ts b/packages/osd-monaco/src/xjson/lexer_rules/opensearchsql.ts
@@ -134,18 +134,22 @@ export const lexerRules = {
       [new RegExp(operators.join('|')), 'operator'],
       [/[0-9]+(\.[0-9]+)?/, 'number'],
       [/'([^'\\]|\\.)*$/, 'string.invalid'], // non-terminated string
-      [/'/, 'string', '@string'],
-      [/"/, 'string', '@string'],
+      [/'/, 'string', '@stringSingle'],
+      [/"/, 'string', '@stringDouble'],
     ],
     whitespace: [
       [/[ \t\r\n]+/, 'white'],
       [/\/\*/, 'comment', '@comment'],
       [/--.*$/, 'comment'],
     ],
-    string: [
+    stringSingle: [
       [/[^'\\]+/, 'string'],
       [/\\./, 'string.escape'],
       [/'/, 'string', '@pop'],
+    ],
+    stringDouble: [
+      [/[^"\\]+/, 'string'],
+      [/\\./, 'string.escape'],
       [/"/, 'string', '@pop'],
     ],
     comment: [
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fix:
		- SQL syntax highlighting double quotes ([#8951](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8951))