Skip to content

Commit 92a09ce

Browse files
authored
Merge pull request #9 from fdncred/main
bunch of fixes
2 parents 06c59c8 + d2615b6 commit 92a09ce

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

nushell.theme-minimal.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
}
1111
},
1212

13+
// these are the sub commands
14+
{
15+
"scope": [ "keyword.other", ],
16+
"settings": {
17+
"foreground": "#00b7ff"
18+
}
19+
},
20+
1321
// "FlatShape__String": "#12820e", //"Green"
1422
{
1523
// "scope": ["string", "meta.embedded.assembly"],

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vscode-nushell-lang",
33
"displayName": "vscode-nushell-lang",
44
"description": "nushell language for vscode",
5-
"version": "0.0.3",
5+
"version": "0.0.4",
66
"license": "MIT",
77
"publisher": "nushell-team",
88
"repository": "https://github.com/fdncred/vscode-nushell-lang/",

syntaxes/nushell.tmLanguage.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,28 @@
1717
"keywords": {
1818
"patterns": [
1919
{
20-
"name": "keyword.control.nu",
21-
"match": "\\b(str\\slpad|echo|str\\scollect|char\\snewline|math\\smin|each|build-string|append)\\b"
20+
"name": "keyword.control.nushell",
21+
"match": "\\b(ansi|append|autoview|benchmark|binaryview|build-string|cal|cd|char|clear|clip|compact|count|cp|debug|default|describe|do|drop|du|echo|empty?|enter|each|every|exec|exit|fetch|first|flatten|get|headers|help|histogram|history|if|inc|insert|into-int|kill|last|lines|ls|match|merge|mkdir|move|mv|n|nth|open|p|parse|pivot|post|prepend|ps|pwd|range|reduce|reject|rename|reverse|rm|s3|save|select|selector|set|set-env|seq|shells|shuffle|size|sleep|sort-by|source|split-by|start|sys|table|tags|textview|touch|tree|uniq|update|version|where|which|with-env|wrap|xpath)\\b"
22+
},
23+
{
24+
"name":"keyword.other.nushell",
25+
"match": "\\b(autoenv\\strust|autoenv\\suntrust|chart\\sbar|chart\\sline|config\\sclear|config\\sget|config\\sload|config\\spath|config\\sremove|config\\sset|config\\sset_into|date\\sformat|date\\slist-timezone|date\\snow|date\\sto-table|date\\sto-timezoneeach\\sgroup|each\\swindow|format\\sfilesize|from\\sbson|from\\scsv|from\\seml|from\\sics|from\\sini|from\\sjson|from\\sods|from\\ssqlite|from\\sssv|from\\stoml|from\\stsv|from\\surl|from\\svcf|from\\sxlsx|from\\sxml|from\\syaml|from\\syml|group-by\\sdate|hash\\sbase64|keep\\suntil|keep\\swhile|math\\sabs|math\\savg|math\\sceil|math\\seval|math\\sfloor|math\\smax|math\\smedian|math\\smin|math\\smode|math\\sproduct|math\\sround|math\\sstddev|math\\ssum|math\\svariance|path\\sbasename|path\\sdirname|path\\sexists|path\\sexpand|path\\sextension|path\\sfilestem|path\\stype|random\\sbool|random\\schars|random\\sdecimal|random\\sdice|random\\sinteger|random\\suuid|seq\\sdate|skip\\suntil|skip\\swhile|split\\schars|split\\scolumn|split\\srow|str\\scamel-case|str\\scapitalize|str\\scollect|str\\scontains|str\\sdowncase|str\\sends-with|str\\sfind-replace|str\\sfrom|str\\sindex-of|str\\skebab-case|str\\slength|str\\slpad|str\\sltrim|str\\spascal-case|str\\sreverse|str\\srpad|str\\srtrim|str\\sscreaming-snake-case|str\\sset|str\\ssnake-case|str\\sstarts-with|str\\ssubstring|str\\sto-datetime|str\\sto-decimal|str\\sto-int|str\\strim|str\\supcase|to\\sbson|to\\scsv|to\\shtml|to\\sjson|to\\smd|to\\ssqlite|to\\stoml|to\\stsv|to\\surl|to\\sxml|to\\syaml|url\\shost|url\\spath|url\\squery|url\\sscheme)\\b"
2226
}
2327
]
2428
},
2529
"strings": {
26-
"name": "string.quoted.double.nu",
30+
"name": "string.quoted.double.nushell",
2731
"begin": "\"|'|`",
2832
"end": "\"|'|`",
2933
"patterns": [
3034
{
31-
"name": "constant.character.escape.nu",
35+
"name": "constant.character.escape.nushell",
3236
"match": "\\\\."
3337
}
3438
]
3539
},
3640
"punctuation": {
37-
"match": "(;|\\||\\.|\\[|\\]|\\{|\\}|\\(|\\)|=|\\<|>)|(\\$\\(|\\$\\[)",
41+
"match": "(;|\\||\\.|\\[|\\]|\\{|\\}|\\(|\\)|=|\\<|>)|(\\$\\(|\\$\\[|\\+|\\%|\\/|\\*)",
3842
"name": "punctuation.nushell"
3943
},
4044
"comment": {
@@ -46,15 +50,15 @@
4650
"name": "constant.nushell"
4751
},
4852
"parameter": {
49-
"match": "(-[a-zA-Z_\\-]|--[a-zA-Z_\\-]{1,50})",
53+
"match": "(\\s-[a-zA-Z_\\-]|--[a-zA-Z_\\-]{1,50})",
5054
"name": "variable.parameter.function.nushell"
5155
},
5256
"digit": {
5357
"match": "(\\b[0-9]+)",
5458
"name": "constant.numeric.nushell"
5559
},
5660
"variable":{
57-
"match": "(let)\\s+([a-zA-Z0-9-_\\-]+)|(\\s+\\$[a-zA-Z0-9_\\-]+)",
61+
"match": "(let)\\s+([a-zA-Z0-9_\\-]+)|(^[\\[]\\[\\$[a-zA-Z0-9_\\-]+)|(\\$[a-zA-Z0-9_\\-]+)",
5862
"name": "variable.nushell",
5963
"captures": {
6064
"1":{

0 commit comments

Comments
 (0)