Skip to content

Commit 7beb537

Browse files
liuxy0551liuxy0551
authored
feat: #167 support dt highlight style (#168)
1 parent e5be2bb commit 7beb537

File tree

10 files changed

+43
-38
lines changed

10 files changed

+43
-38
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"pre-commit": "npx pretty-quick --staged"
6868
},
6969
"dependencies": {
70-
"dt-sql-parser": "4.1.0-beta.4"
70+
"dt-sql-parser": "4.1.0"
7171
},
7272
"peerDependencies": {
7373
"monaco-editor": ">=0.31.0"

‎pnpm-lock.yaml‎

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

‎src/languages/flink/flink.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,13 +489,14 @@ export const language = <languages.IMonarchLanguage>{
489489
{ include: '@comments' },
490490
{ include: '@whitespace' },
491491
{ include: '@pseudoColumns' },
492+
{ include: '@customParams' },
492493
{ include: '@numbers' },
493494
{ include: '@strings' },
494495
{ include: '@complexIdentifiers' },
495496
{ include: '@scopes' },
496497
{ include: '@complexDataTypes' },
497498
{ include: '@complexFunctions' },
498-
[/[;,.]/, TokenClassConsts.DELIMITER],
499+
[/[:;,.]/, TokenClassConsts.DELIMITER],
499500
[/[\(\)\[\]\{\}]/, '@brackets'],
500501
[
501502
/[\w@#$]+/,
@@ -535,6 +536,10 @@ export const language = <languages.IMonarchLanguage>{
535536
}
536537
]
537538
],
539+
customParams: [
540+
[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
541+
[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
542+
],
538543
numbers: [
539544
[/0[xX][0-9a-fA-F]*/, TokenClassConsts.NUMBER_HEX],
540545
[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],

‎src/languages/hive/hive.ts‎

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

‎src/languages/impala/impala.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ export const language = <languages.IMonarchLanguage>{
474474
{ include: '@scopes' },
475475
{ include: '@complexDataTypes' },
476476
{ include: '@complexOperators' },
477-
[/[;,.]/, TokenClassConsts.DELIMITER],
477+
[/[:;,.]/, TokenClassConsts.DELIMITER],
478478
[/[\(\)\[\]\{\}]/, '@brackets'],
479479
[
480480
/[\w@#$]+/,

‎src/languages/mysql/mysql.ts‎

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

‎src/languages/pgsql/pgsql.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ export const language = <languages.IMonarchLanguage>{
980980
{ include: '@complexIdentifiers' },
981981
{ include: '@scopes' },
982982
{ include: '@complexDataTypes' },
983-
[/[;,.]/, TokenClassConsts.DELIMITER],
983+
[/[:;,.]/, TokenClassConsts.DELIMITER],
984984
[/[\(\)\[\]\{\}]/, '@brackets'],
985985
[
986986
/[\w@#$]+/,

‎src/languages/spark/spark.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ export const language = <languages.IMonarchLanguage>{
699699
{ include: '@complexIdentifiers' },
700700
{ include: '@scopes' },
701701
{ include: '@complexDataTypes' },
702-
[/[;,.]/, TokenClassConsts.DELIMITER],
702+
[/[:;,.]/, TokenClassConsts.DELIMITER],
703703
[/[\(\)\[\]\{\}]/, '@brackets'],
704704
[
705705
/[\w@#$]+/,

‎src/languages/trino/trino.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ export const language = <languages.IMonarchLanguage>{
636636
{ include: '@complexIdentifiers' },
637637
{ include: '@scopes' },
638638
{ include: '@complexDataTypes' },
639-
[/[;,.]/, TokenClassConsts.DELIMITER],
639+
[/[:;,.]/, TokenClassConsts.DELIMITER],
640640
[/[\(\)\[\]\{\}]/, '@brackets'],
641641
[
642642
/[\w@$-]+/, // https://trino.io/docs/current/language/reserved.html#language-identifiers

‎src/theme/vs-plus/light.ts‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@ export const lightThemeData: editor.IStandaloneThemeData = {
88
base: 'vs',
99
inherit: true,
1010
rules: [
11-
{ token: postfixTokenClass(TokenClassConsts.BINARY), foreground: '098658' },
12-
{ token: postfixTokenClass(TokenClassConsts.BINARY_ESCAPE), foreground: '098658' },
13-
{ token: postfixTokenClass(TokenClassConsts.COMMENT), foreground: '008000' },
14-
{ token: postfixTokenClass(TokenClassConsts.COMMENT_QUOTE), foreground: '008000' },
15-
{ token: postfixTokenClass(TokenClassConsts.DELIMITER), foreground: '000000' },
16-
{ token: postfixTokenClass(TokenClassConsts.DELIMITER_CURLY), foreground: '319331' },
17-
{ token: postfixTokenClass(TokenClassConsts.DELIMITER_PAREN), foreground: '0431fa' },
18-
{ token: postfixTokenClass(TokenClassConsts.DELIMITER_SQUARE), foreground: '0431fa' },
19-
{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER), foreground: '001080' },
20-
{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER_QUOTE), foreground: '001080' },
21-
{ token: postfixTokenClass(TokenClassConsts.KEYWORD), foreground: '0000ff' },
22-
{ token: postfixTokenClass(TokenClassConsts.KEYWORD_SCOPE), foreground: 'af00db' },
23-
{ token: postfixTokenClass(TokenClassConsts.NUMBER), foreground: '098658' },
24-
{ token: postfixTokenClass(TokenClassConsts.NUMBER_FLOAT), foreground: '098658' },
25-
{ token: postfixTokenClass(TokenClassConsts.NUMBER_BINARY), foreground: '098658' },
26-
{ token: postfixTokenClass(TokenClassConsts.NUMBER_OCTAL), foreground: '098658' },
27-
{ token: postfixTokenClass(TokenClassConsts.NUMBER_HEX), foreground: '098658' },
28-
{ token: postfixTokenClass(TokenClassConsts.OPERATOR), foreground: '000000' },
29-
{ token: postfixTokenClass(TokenClassConsts.OPERATOR_KEYWORD), foreground: '0000ff' },
30-
{ token: postfixTokenClass(TokenClassConsts.OPERATOR_SYMBOL), foreground: '000000' },
31-
{ token: postfixTokenClass(TokenClassConsts.PREDEFINED), foreground: '795e26' },
32-
{ token: postfixTokenClass(TokenClassConsts.STRING), foreground: 'a31515' },
33-
{ token: postfixTokenClass(TokenClassConsts.STRING_ESCAPE), foreground: 'a31515' },
34-
{ token: postfixTokenClass(TokenClassConsts.TYPE), foreground: '267f99' },
35-
{ token: postfixTokenClass(TokenClassConsts.VARIABLE), foreground: '4fc1ff' }
11+
{ token: postfixTokenClass(TokenClassConsts.BINARY), foreground: '45AB5A' },
12+
{ token: postfixTokenClass(TokenClassConsts.BINARY_ESCAPE), foreground: '45AB5A' },
13+
{ token: postfixTokenClass(TokenClassConsts.NUMBER), foreground: '45AB5A' },
14+
{ token: postfixTokenClass(TokenClassConsts.NUMBER_FLOAT), foreground: '45AB5A' },
15+
{ token: postfixTokenClass(TokenClassConsts.NUMBER_BINARY), foreground: '45AB5A' },
16+
{ token: postfixTokenClass(TokenClassConsts.NUMBER_OCTAL), foreground: '45AB5A' },
17+
{ token: postfixTokenClass(TokenClassConsts.NUMBER_HEX), foreground: '45AB5A' },
18+
{ token: postfixTokenClass(TokenClassConsts.COMMENT), foreground: 'B1B4C5' },
19+
{ token: postfixTokenClass(TokenClassConsts.COMMENT_QUOTE), foreground: 'B1B4C5' },
20+
{ token: postfixTokenClass(TokenClassConsts.DELIMITER), foreground: '7D98B1' },
21+
{ token: postfixTokenClass(TokenClassConsts.OPERATOR), foreground: '7D98B1' },
22+
{ token: postfixTokenClass(TokenClassConsts.OPERATOR_SYMBOL), foreground: '7D98B1' },
23+
{ token: postfixTokenClass(TokenClassConsts.DELIMITER_CURLY), foreground: 'B1BB86' },
24+
{ token: postfixTokenClass(TokenClassConsts.DELIMITER_PAREN), foreground: 'B1BB86' },
25+
{ token: postfixTokenClass(TokenClassConsts.DELIMITER_SQUARE), foreground: 'B1BB86' },
26+
{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER), foreground: '201A1A' },
27+
{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER_QUOTE), foreground: '201A1A' },
28+
{ token: postfixTokenClass(TokenClassConsts.KEYWORD), foreground: '3300FF' },
29+
{ token: postfixTokenClass(TokenClassConsts.OPERATOR_KEYWORD), foreground: '3300FF' },
30+
{ token: postfixTokenClass(TokenClassConsts.KEYWORD_SCOPE), foreground: 'E221DA' },
31+
{ token: postfixTokenClass(TokenClassConsts.PREDEFINED), foreground: 'C3771C' },
32+
{ token: postfixTokenClass(TokenClassConsts.STRING), foreground: 'BC1313' },
33+
{ token: postfixTokenClass(TokenClassConsts.STRING_ESCAPE), foreground: 'BC1313' },
34+
{ token: postfixTokenClass(TokenClassConsts.TYPE), foreground: '256FC6' },
35+
{ token: postfixTokenClass(TokenClassConsts.VARIABLE), foreground: '00AD84' }
3636
],
3737
colors: {}
3838
};

0 commit comments

Comments
 (0)