feat: improve highlight conf (DTStack#122)

* feat: some keywords * feat: highlight brackets for customParams * feat: highlight keywords for sparksql materialized view
JackWang032 · Apr 22, 2024 · 0d14d3d · 0d14d3d
1 parent ea22ff0
commit 0d14d3d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/src/languages/hive/hive.ts b/src/languages/hive/hive.ts
@@ -516,7 +516,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
 			[/[;,.]/, TokenClassConsts.DELIMITER],
-			[/[\(\)\[\]]/, '@brackets'],
+			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
 				{

diff --git a/src/languages/impala/impala.ts b/src/languages/impala/impala.ts
@@ -439,6 +439,7 @@ export const language = <languages.IMonarchLanguage>{
 	typeKeywords: [
 		// https://impala.apache.org/docs/build/html/topics/impala_datatypes.html
 		'ARRAY',
+		'BINARY',
 		'BIGINT',
 		'BOOLEAN',
 		'CHAR',
@@ -455,7 +456,7 @@ export const language = <languages.IMonarchLanguage>{
 		'TIMESTAMP',
 		'TINYINT',
 		'VARCHAR',
-		'Complex'
+		'COMPLEX'
 	],
 	scopeKeywords: ['CASE', 'END', 'WHEN', 'THEN', 'ELSE'],
 	pseudoColumns: [

diff --git a/src/languages/mysql/mysql.ts b/src/languages/mysql/mysql.ts
@@ -912,7 +912,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@scopes' },
 			{ include: '@complexOperators' },
 			[/[;,.]/, TokenClassConsts.DELIMITER],
-			[/[()]/, '@brackets'],
+			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@]+/,
 				{

diff --git a/src/languages/pgsql/pgsql.test.ts b/src/languages/pgsql/pgsql.test.ts
@@ -66,7 +66,7 @@ testTokenization('pgsql', [
 				{ startIndex: 7, type: postfixTokenClass(TokenClassConsts.WHITE) },
 				{ startIndex: 8, type: postfixTokenClass(TokenClassConsts.IDENTIFIER) },
 				{ startIndex: 10, type: postfixTokenClass(TokenClassConsts.WHITE) },
-				{ startIndex: 11, type: postfixTokenClass(TokenClassConsts.IDENTIFIER) },
+				{ startIndex: 11, type: postfixTokenClass(TokenClassConsts.TYPE) },
 				{ startIndex: 14, type: postfixTokenClass(TokenClassConsts.WHITE) },
 				{ startIndex: 15, type: postfixTokenClass(TokenClassConsts.OPERATOR_SYMBOL) },
 				{ startIndex: 16, type: postfixTokenClass(TokenClassConsts.WHITE) },
@@ -399,7 +399,7 @@ testTokenization('pgsql', [
 	[
 		{
 			line: 'int',
-			tokens: [{ startIndex: 0, type: postfixTokenClass(TokenClassConsts.IDENTIFIER) }]
+			tokens: [{ startIndex: 0, type: postfixTokenClass(TokenClassConsts.TYPE) }]
 		}
 	],
 

diff --git a/src/languages/pgsql/pgsql.ts b/src/languages/pgsql/pgsql.ts
@@ -942,6 +942,12 @@ export const language = <languages.IMonarchLanguage>{
 		'CAHR',
 		'BPCHAR',
 		'TEXT',
+		'BYTEA',
+		'JSON',
+		'GEOMETRY',
+		'MAP',
+		'ARRAY',
+		'INT',
 		'TIMESTAMP',
 		'DATE',
 		'INTERVAL',
@@ -975,7 +981,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
 			[/[;,.]/, TokenClassConsts.DELIMITER],
-			[/[\(\)\[\]]/, '@brackets'],
+			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
 				{

diff --git a/src/languages/spark/spark.ts b/src/languages/spark/spark.ts
@@ -197,21 +197,29 @@ export const language = <languages.IMonarchLanguage>{
 		'COMMENT',
 		'DATABASE',
 		'DESC',
+		'DISABLE',
+		'ENABLE',
 		'INDEX',
 		'LIMIT',
 		'LOAD',
 		'MATCHED',
+		'MATERIALIZED',
 		'KW_OVER',
+		'OPTIMIZE',
 		'OVERWRITE',
 		'PARTITIONED',
+		'REFRESH',
 		'RENAME',
+		'REWRITE',
 		'SCHEMA',
 		'SHOW',
 		'SKEWED',
 		'SORTED',
 		'STORED',
+		'TBLPROPERTIES',
 		'USE',
-		'VIEW'
+		'VIEW',
+		'ZORDER'
 	],
 	operators: [
 		// Logical