|
20 | 20 | { "include": "#string-double-quote" }, |
21 | 21 | { "include": "#string-interpolated-double" }, |
22 | 22 | { "include": "#string-interpolated-single" }, |
23 | | - { "include": "#string-bare" }, |
24 | | - { "include": "#string-raw" } |
| 23 | + { "include": "#string-raw" }, |
| 24 | + { "include": "#string-bare" } |
25 | 25 | ] |
26 | 26 | }, |
27 | 27 | "string-escape": { |
28 | 28 | "match": "\\\\(?:[bfrnt\\\\'\"/]|u[0-9a-fA-F]{4})", |
29 | 29 | "name": "constant.character.escape.nushell" |
30 | 30 | }, |
31 | 31 | "string-bare": { |
32 | | - "match": "[^$\\[{(\"',|#\\s|][^\\[\\]{}()\"'\\s#,|]*", |
| 32 | + "match": "[^$\\[{(\"',|#\\s|;][^\\[\\]{}()\"'\\s,|;]*", |
33 | 33 | "name": "string.bare.nushell" |
34 | 34 | }, |
35 | 35 | "string-raw": { |
36 | | - "begin": "(?<=r)(#+)'", |
| 36 | + "begin": "r(#+)'", |
37 | 37 | "beginCaptures": { |
38 | 38 | "0": { "name": "punctuation.definition.string.begin.nushell" } |
39 | 39 | }, |
|
167 | 167 | "name": "constant.numeric.nushell" |
168 | 168 | }, |
169 | 169 | "numbers": { |
170 | | - "match": "(?<![\\w-])[-+]?(?:\\d+|\\d{1,3}(?:_\\d{3})*)(?:\\.\\d*)?(?i:ns|us|ms|sec|min|hr|day|wk|b|kb|mb|gb|tb|pt|eb|zb|kib|mib|gib|tib|pit|eib|zib)?(?:(?![\\w.])|(?=\\.\\.))", |
| 170 | + "match": "(?<![\\w-])[-+]?(?:\\d+|\\d{1,3}(?:_\\d{3})*)(?:\\.\\d*)?(?i:ns|us|µs|ms|sec|min|hr|day|wk|b|kb|mb|gb|tb|pt|eb|zb|kib|mib|gib|tib|pit|eib|zib)?(?:(?![\\w.])|(?=\\.\\.))", |
171 | 171 | "name": "constant.numeric.nushell" |
172 | 172 | }, |
173 | 173 | "binary": { |
|
207 | 207 | "name": "keyword.control.nushell" |
208 | 208 | }, |
209 | 209 | "operators-word": { |
210 | | - "match": "(?<= |\\()(?:mod|in|not-in|not|and|or|xor|bit-or|bit-and|bit-xor|bit-shl|bit-shr|starts-with|ends-with)(?= |\\)|$)", |
| 210 | + "match": "(?<= |\\()(?:mod|in|not-in|not|and|or|xor|bit-or|bit-and|bit-xor|bit-shl|bit-shr|starts-with|ends-with|like|not-like)(?= |\\)|$)", |
211 | 211 | "name": "keyword.control.nushell" |
212 | 212 | }, |
213 | 213 | "operators-symbols": { |
|
685 | 685 | }, |
686 | 686 | { "include": "#control-keywords" }, |
687 | 687 | { "include": "#constant-value" }, |
| 688 | + { "include": "#string-raw" }, |
688 | 689 | { "include": "#command" }, |
689 | 690 | { "include": "#value" } |
690 | 691 | ] |
|
0 commit comments