Skip to content

Commit 0d14d3d

Browse files
authored
feat: improve highlight conf (#122)
* feat: some keywords * feat: highlight brackets for customParams * feat: highlight keywords for sparksql materialized view
1 parent ea22ff0 commit 0d14d3d

File tree

6 files changed

+22
-7
lines changed

6 files changed

+22
-7
lines changed

src/languages/hive/hive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ export const language = <languages.IMonarchLanguage>{
516516
{ include: '@scopes' },
517517
{ include: '@complexDataTypes' },
518518
[/[;,.]/, TokenClassConsts.DELIMITER],
519-
[/[\(\)\[\]]/, '@brackets'],
519+
[/[\(\)\[\]\{\}]/, '@brackets'],
520520
[
521521
/[\w@#$]+/,
522522
{

src/languages/impala/impala.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ export const language = <languages.IMonarchLanguage>{
439439
typeKeywords: [
440440
// https://impala.apache.org/docs/build/html/topics/impala_datatypes.html
441441
'ARRAY',
442+
'BINARY',
442443
'BIGINT',
443444
'BOOLEAN',
444445
'CHAR',
@@ -455,7 +456,7 @@ export const language = <languages.IMonarchLanguage>{
455456
'TIMESTAMP',
456457
'TINYINT',
457458
'VARCHAR',
458-
'Complex'
459+
'COMPLEX'
459460
],
460461
scopeKeywords: ['CASE', 'END', 'WHEN', 'THEN', 'ELSE'],
461462
pseudoColumns: [

src/languages/mysql/mysql.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ export const language = <languages.IMonarchLanguage>{
912912
{ include: '@scopes' },
913913
{ include: '@complexOperators' },
914914
[/[;,.]/, TokenClassConsts.DELIMITER],
915-
[/[()]/, '@brackets'],
915+
[/[\(\)\[\]\{\}]/, '@brackets'],
916916
[
917917
/[\w@]+/,
918918
{

src/languages/pgsql/pgsql.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ testTokenization('pgsql', [
6666
{ startIndex: 7, type: postfixTokenClass(TokenClassConsts.WHITE) },
6767
{ startIndex: 8, type: postfixTokenClass(TokenClassConsts.IDENTIFIER) },
6868
{ startIndex: 10, type: postfixTokenClass(TokenClassConsts.WHITE) },
69-
{ startIndex: 11, type: postfixTokenClass(TokenClassConsts.IDENTIFIER) },
69+
{ startIndex: 11, type: postfixTokenClass(TokenClassConsts.TYPE) },
7070
{ startIndex: 14, type: postfixTokenClass(TokenClassConsts.WHITE) },
7171
{ startIndex: 15, type: postfixTokenClass(TokenClassConsts.OPERATOR_SYMBOL) },
7272
{ startIndex: 16, type: postfixTokenClass(TokenClassConsts.WHITE) },
@@ -399,7 +399,7 @@ testTokenization('pgsql', [
399399
[
400400
{
401401
line: 'int',
402-
tokens: [{ startIndex: 0, type: postfixTokenClass(TokenClassConsts.IDENTIFIER) }]
402+
tokens: [{ startIndex: 0, type: postfixTokenClass(TokenClassConsts.TYPE) }]
403403
}
404404
],
405405

src/languages/pgsql/pgsql.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,12 @@ export const language = <languages.IMonarchLanguage>{
942942
'CAHR',
943943
'BPCHAR',
944944
'TEXT',
945+
'BYTEA',
946+
'JSON',
947+
'GEOMETRY',
948+
'MAP',
949+
'ARRAY',
950+
'INT',
945951
'TIMESTAMP',
946952
'DATE',
947953
'INTERVAL',
@@ -975,7 +981,7 @@ export const language = <languages.IMonarchLanguage>{
975981
{ include: '@scopes' },
976982
{ include: '@complexDataTypes' },
977983
[/[;,.]/, TokenClassConsts.DELIMITER],
978-
[/[\(\)\[\]]/, '@brackets'],
984+
[/[\(\)\[\]\{\}]/, '@brackets'],
979985
[
980986
/[\w@#$]+/,
981987
{

src/languages/spark/spark.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,21 +197,29 @@ export const language = <languages.IMonarchLanguage>{
197197
'COMMENT',
198198
'DATABASE',
199199
'DESC',
200+
'DISABLE',
201+
'ENABLE',
200202
'INDEX',
201203
'LIMIT',
202204
'LOAD',
203205
'MATCHED',
206+
'MATERIALIZED',
204207
'KW_OVER',
208+
'OPTIMIZE',
205209
'OVERWRITE',
206210
'PARTITIONED',
211+
'REFRESH',
207212
'RENAME',
213+
'REWRITE',
208214
'SCHEMA',
209215
'SHOW',
210216
'SKEWED',
211217
'SORTED',
212218
'STORED',
219+
'TBLPROPERTIES',
213220
'USE',
214-
'VIEW'
221+
'VIEW',
222+
'ZORDER'
215223
],
216224
operators: [
217225
// Logical

0 commit comments

Comments
 (0)