Skip to content

Commit ea22ff0

Browse files
liuxy0551liuxy0551
authored
fix: #121 customParams use identifier highlight (#123)
* fix: #121 customParams use identifier highlight * feat: upgrade dt-sql-parser
1 parent bfb368e commit ea22ff0

File tree

8 files changed

+35
-5
lines changed

8 files changed

+35
-5
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
}
6262
},
6363
"dependencies": {
64-
"dt-sql-parser": "4.0.0-beta.4.14"
64+
"dt-sql-parser": "4.0.0-beta.4.15"
6565
},
6666
"peerDependencies": {
6767
"monaco-editor": ">=0.31.0"

‎pnpm-lock.yaml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/languages/hive/hive.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@ export const language = <languages.IMonarchLanguage>{
509509
{ include: '@comments' },
510510
{ include: '@whitespace' },
511511
{ include: '@pseudoColumns' },
512+
{ include: '@customParams' },
512513
{ include: '@numbers' },
513514
{ include: '@strings' },
514515
{ include: '@complexIdentifiers' },
@@ -554,6 +555,10 @@ export const language = <languages.IMonarchLanguage>{
554555
}
555556
]
556557
],
558+
customParams: [
559+
[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
560+
[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
561+
],
557562
numbers: [
558563
[/0[xX][0-9a-fA-F]*/, TokenClassConsts.NUMBER_HEX],
559564
[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],

‎src/languages/impala/impala.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ export const language = <languages.IMonarchLanguage>{
466466
{ include: '@comments' },
467467
{ include: '@whitespace' },
468468
{ include: '@pseudoColumns' },
469+
{ include: '@customParams' },
469470
{ include: '@numbers' },
470471
{ include: '@strings' },
471472
{ include: '@complexIdentifiers' },
@@ -501,6 +502,10 @@ export const language = <languages.IMonarchLanguage>{
501502
[/./, TokenClassConsts.COMMENT]
502503
],
503504
pseudoColumns: [],
505+
customParams: [
506+
[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
507+
[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
508+
],
504509
numbers: [
505510
[/0[xX][0-9a-fA-F]*/, TokenClassConsts.NUMBER_HEX],
506511
[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],

‎src/languages/mysql/mysql.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ export const language = <languages.IMonarchLanguage>{
905905
{ include: '@comments' },
906906
{ include: '@whitespace' },
907907
{ include: '@pseudoColumns' },
908+
{ include: '@customParams' },
908909
{ include: '@numbers' },
909910
{ include: '@strings' },
910911
{ include: '@complexIdentifiers' },
@@ -953,6 +954,10 @@ export const language = <languages.IMonarchLanguage>{
953954
}
954955
]
955956
],
957+
customParams: [
958+
[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
959+
[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
960+
],
956961
numbers: [
957962
[/0[xX][0-9a-fA-F]*/, TokenClassConsts.NUMBER_HEX],
958963
[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],

‎src/languages/pgsql/pgsql.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,7 @@ export const language = <languages.IMonarchLanguage>{
968968
{ include: '@comments' },
969969
{ include: '@whitespace' },
970970
{ include: '@pseudoColumns' },
971+
{ include: '@customParams' },
971972
{ include: '@numbers' },
972973
{ include: '@strings' },
973974
{ include: '@complexIdentifiers' },
@@ -1006,6 +1007,10 @@ export const language = <languages.IMonarchLanguage>{
10061007
pseudoColumns: [
10071008
// Not support
10081009
],
1010+
customParams: [
1011+
[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
1012+
[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
1013+
],
10091014
numbers: [
10101015
[/0[xX][0-9a-fA-F]*/, TokenClassConsts.NUMBER_HEX],
10111016
[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],

‎src/languages/spark/spark.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,7 @@ export const language = <languages.IMonarchLanguage>{
684684
{ include: '@comments' },
685685
{ include: '@whitespace' },
686686
{ include: '@pseudoColumns' },
687+
{ include: '@customParams' },
687688
{ include: '@numbers' },
688689
{ include: '@binaries' },
689690
{ include: '@strings' },
@@ -730,6 +731,10 @@ export const language = <languages.IMonarchLanguage>{
730731
}
731732
]
732733
],
734+
customParams: [
735+
[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
736+
[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
737+
],
733738
numbers: [
734739
// https://spark.apache.org/docs/latest/sql-ref-literals.html#numeric-literal
735740
// TODO: Fractional Literals Syntax

‎src/languages/trino/trino.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,7 @@ export const language = <languages.IMonarchLanguage>{
630630
{ include: '@comments' },
631631
{ include: '@whitespace' },
632632
{ include: '@pseudoColumns' },
633+
{ include: '@customParams' },
633634
{ include: '@numbers' },
634635
{ include: '@strings' },
635636
{ include: '@complexIdentifiers' },
@@ -674,6 +675,10 @@ export const language = <languages.IMonarchLanguage>{
674675
}
675676
]
676677
],
678+
customParams: [
679+
[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
680+
[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
681+
],
677682
numbers: [
678683
[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],
679684
[/((\d+(\.\d*)?)|(\.\d+))([eE][\-+]?\d+)?/, TokenClassConsts.NUMBER]

0 commit comments

Comments
 (0)