fix: DTStack#121 customParams use identifier highlight

liuxy0551 · Apr 22, 2024 · 0820b6a · 0820b6a
1 parent bfb368e
commit 0820b6a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 0 deletions.
diff --git a/src/languages/hive/hive.ts b/src/languages/hive/hive.ts
@@ -509,6 +509,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@comments' },
 			{ include: '@whitespace' },
 			{ include: '@pseudoColumns' },
+			{ include: '@customParams' },
 			{ include: '@numbers' },
 			{ include: '@strings' },
 			{ include: '@complexIdentifiers' },
@@ -554,6 +555,10 @@ export const language = <languages.IMonarchLanguage>{
 				}
 			]
 		],
+		customParams: [
+			[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
+			[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
+		],
 		numbers: [
 			[/0[xX][0-9a-fA-F]*/, TokenClassConsts.NUMBER_HEX],
 			[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],

diff --git a/src/languages/impala/impala.ts b/src/languages/impala/impala.ts
@@ -466,6 +466,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@comments' },
 			{ include: '@whitespace' },
 			{ include: '@pseudoColumns' },
+			{ include: '@customParams' },
 			{ include: '@numbers' },
 			{ include: '@strings' },
 			{ include: '@complexIdentifiers' },
@@ -501,6 +502,10 @@ export const language = <languages.IMonarchLanguage>{
 			[/./, TokenClassConsts.COMMENT]
 		],
 		pseudoColumns: [],
+		customParams: [
+			[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
+			[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
+		],
 		numbers: [
 			[/0[xX][0-9a-fA-F]*/, TokenClassConsts.NUMBER_HEX],
 			[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],

diff --git a/src/languages/mysql/mysql.ts b/src/languages/mysql/mysql.ts
@@ -905,6 +905,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@comments' },
 			{ include: '@whitespace' },
 			{ include: '@pseudoColumns' },
+			{ include: '@customParams' },
 			{ include: '@numbers' },
 			{ include: '@strings' },
 			{ include: '@complexIdentifiers' },
@@ -953,6 +954,10 @@ export const language = <languages.IMonarchLanguage>{
 				}
 			]
 		],
+		customParams: [
+			[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
+			[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
+		],
 		numbers: [
 			[/0[xX][0-9a-fA-F]*/, TokenClassConsts.NUMBER_HEX],
 			[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],

diff --git a/src/languages/pgsql/pgsql.ts b/src/languages/pgsql/pgsql.ts
@@ -968,6 +968,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@comments' },
 			{ include: '@whitespace' },
 			{ include: '@pseudoColumns' },
+			{ include: '@customParams' },
 			{ include: '@numbers' },
 			{ include: '@strings' },
 			{ include: '@complexIdentifiers' },
@@ -1006,6 +1007,10 @@ export const language = <languages.IMonarchLanguage>{
 		pseudoColumns: [
 			// Not support
 		],
+		customParams: [
+			[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
+			[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
+		],
 		numbers: [
 			[/0[xX][0-9a-fA-F]*/, TokenClassConsts.NUMBER_HEX],
 			[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],

diff --git a/src/languages/spark/spark.ts b/src/languages/spark/spark.ts
@@ -684,6 +684,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@comments' },
 			{ include: '@whitespace' },
 			{ include: '@pseudoColumns' },
+			{ include: '@customParams' },
 			{ include: '@numbers' },
 			{ include: '@binaries' },
 			{ include: '@strings' },
@@ -730,6 +731,10 @@ export const language = <languages.IMonarchLanguage>{
 				}
 			]
 		],
+		customParams: [
+			[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
+			[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
+		],
 		numbers: [
 			// https://spark.apache.org/docs/latest/sql-ref-literals.html#numeric-literal
 			// TODO: Fractional Literals Syntax

diff --git a/src/languages/trino/trino.ts b/src/languages/trino/trino.ts
@@ -630,6 +630,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@comments' },
 			{ include: '@whitespace' },
 			{ include: '@pseudoColumns' },
+			{ include: '@customParams' },
 			{ include: '@numbers' },
 			{ include: '@strings' },
 			{ include: '@complexIdentifiers' },
@@ -674,6 +675,10 @@ export const language = <languages.IMonarchLanguage>{
 				}
 			]
 		],
+		customParams: [
+			[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
+			[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
+		],
 		numbers: [
 			[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],
 			[/((\d+(\.\d*)?)|(\.\d+))([eE][\-+]?\d+)?/, TokenClassConsts.NUMBER]