feat: highlight keywords of condition expression (#66)

DTStack · Nov 3, 2023 · a9f6578 · a9f6578
1 parent f24e4ff
commit a9f6578
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/flinksql/flinksql.ts b/src/flinksql/flinksql.ts
@@ -777,6 +777,7 @@ export const language = <languages.IMonarchLanguage>{
 		'NUMERIC',
 		'INTERVAL'
 	],
+	scopeKeywords: ['CASE', 'END', 'WHEN', 'THEN', 'ELSE'],
 	pseudoColumns: [
 		// Not support
 	],
@@ -796,6 +797,7 @@ export const language = <languages.IMonarchLanguage>{
 				/[\w@#$]+/,
 				{
 					cases: {
+						'@scopeKeywords': TokenClassConsts.KEYWORD_SCOPE,
 						'@operators': TokenClassConsts.OPERATOR_KEYWORD,
 						'@typeKeywords': TokenClassConsts.TYPE,
 						'@builtinVariables': TokenClassConsts.VARIABLE,
@@ -850,8 +852,7 @@ export const language = <languages.IMonarchLanguage>{
 		],
 		scopes: [
 			[/(EXECUTE\s+)?BEGIN\s+STATEMENT\s+SET/i, TokenClassConsts.KEYWORD_SCOPE],
-			[/(EXECUTE\s+)?STATEMENT\s+SET\s+BEGIN/i, TokenClassConsts.KEYWORD_SCOPE],
-			[/END\b/i, { token: TokenClassConsts.KEYWORD_SCOPE }]
+			[/(EXECUTE\s+)?STATEMENT\s+SET\s+BEGIN/i, TokenClassConsts.KEYWORD_SCOPE]
 		],
 		complexDataTypes: [
 			[/DOUBLE\s+PRECISION\b/i, { token: TokenClassConsts.TYPE }],

diff --git a/src/hivesql/hivesql.ts b/src/hivesql/hivesql.ts
@@ -689,6 +689,7 @@ export const language = <languages.IMonarchLanguage>{
 		'STRUCT',
 		'UNIONTYPE'
 	],
+	scopeKeywords: ['CASE', 'END', 'WHEN', 'THEN', 'ELSE'],
 	pseudoColumns: [
 		// Not support
 	],
@@ -708,6 +709,7 @@ export const language = <languages.IMonarchLanguage>{
 				/[\w@#$]+/,
 				{
 					cases: {
+						'@scopeKeywords': TokenClassConsts.KEYWORD_SCOPE,
 						'@operators': TokenClassConsts.OPERATOR_KEYWORD,
 						'@typeKeywords': TokenClassConsts.TYPE,
 						'@builtinVariables': TokenClassConsts.VARIABLE,

diff --git a/src/sparksql/sparksql.ts b/src/sparksql/sparksql.ts
@@ -840,6 +840,7 @@ export const language = <languages.IMonarchLanguage>{
 		'STRUCT',
 		'MAP'
 	],
+	scopeKeywords: ['CASE', 'END', 'WHEN', 'THEN', 'ELSE'],
 	pseudoColumns: [
 		// Not support
 	],
@@ -860,6 +861,7 @@ export const language = <languages.IMonarchLanguage>{
 				/[\w@#$]+/,
 				{
 					cases: {
+						'@scopeKeywords': TokenClassConsts.KEYWORD_SCOPE,
 						'@operators': TokenClassConsts.OPERATOR_KEYWORD,
 						'@typeKeywords': TokenClassConsts.TYPE,
 						'@builtinVariables': TokenClassConsts.VARIABLE,

diff --git a/src/trinosql/trinosql.ts b/src/trinosql/trinosql.ts
@@ -740,6 +740,7 @@ export const language = <languages.IMonarchLanguage>{
 		// UUID
 		'UUID'
 	],
+	scopeKeywords: ['CASE', 'END', 'WHEN', 'THEN', 'ELSE'],
 	pseudoColumns: [
 		// Not support
 	],
@@ -759,6 +760,7 @@ export const language = <languages.IMonarchLanguage>{
 				/[\w@$-]+/, // https://trino.io/docs/current/language/reserved.html#language-identifiers
 				{
 					cases: {
+						'@scopeKeywords': TokenClassConsts.KEYWORD_SCOPE,
 						'@operators': TokenClassConsts.OPERATOR_KEYWORD,
 						'@typeKeywords': TokenClassConsts.TYPE,
 						'@builtinVariables': TokenClassConsts.VARIABLE,