update language, version, changelog (#84)

Author: fdncred

CHANGELOG.md

@@ -114,3 +114,11 @@ All notable changes to the "vscode-nushell-lang" extension will be documented in
   - update language syntax to support new nushell 0.72 features (break, continue, return, loop, try, catch, mut, while, err>, out>, err+out>, out+err>)
 - 1.0.0
   - Thanks to Gabin Lefranc (@glcraft) for a total rewrite of the textmate grammar for nushell!!
+- 1.1.0
+  - Updated syntax to match nushell 0.77.0
+  - Added a new path to search for nu [#82](https://github.com/nushell/vscode-nushell-lang/pull/82)
+  - Fixed `use` syntax highlighting [#79](https://github.com/nushell/vscode-nushell-lang/pull/79)
+  - Added nu icon [#77](https://github.com/nushell/vscode-nushell-lang/pull/77)
+  - Added additional scoop location [#75](https://github.com/nushell/vscode-nushell-lang/pull/75)
+
+

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-nushell-lang",
   "displayName": "vscode-nushell-lang",
   "description": "nushell language for vscode",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "preview": true,
   "license": "MIT",
   "publisher": "TheNuProjectContributors",

syntaxes/nushell.tmLanguage.json

@@ -126,9 +126,9 @@
                 "1": {
                     "patterns": [
                         { "include": "#internal-variables" },
-                        { 
+                        {
                             "match": "\\$.+",
-                            "name": "variable.other.nushell" 
+                            "name": "variable.other.nushell"
                         }
                     ]
                 }
@@ -296,11 +296,11 @@
         "function": {
             "begin": "((?:export\\s+)?def(?:-env)?)\\s+([\\w\\-]+|\"[\\w\\- ]+\")",
             "beginCaptures": {
-                "0": { 
+                "0": {
                     "patterns": [
                         { "include": "#define-function" },
                         { "include": "#define-extern" }
-                    ] 
+                    ]
                 }
             },
             "end": "(?<=\\})",
@@ -315,10 +315,10 @@
         "extern": {
             "begin": "((?:export\\s+)?extern)\\s+([\\w\\-]+|\"[\\w\\- ]+\")",
             "beginCaptures": {
-                "0": { 
+                "0": {
                     "patterns": [
                         { "include": "#define-extern" }
-                    ] 
+                    ]
                 }
             },
             "end": "(?<=\\])",
@@ -380,7 +380,7 @@
                     "match": "(?<path>(?:/|\\\\|~[\\/\\\\]|\\.\\.?[\\/\\\\])?(?:[^\\/\\\\]+[\\/\\\\])*[\\w\\- ]+(?:\\.nu)?){0}^\\s*((?:export )?use)\\s+(\"\\g<path>\"|'\\g<path>\\'|(?![\"'])\\g<path>)(?:\\s+([\\w\\-]+|\"[\\w\\- ]+\"|'[^']+'|\\*))?\\s*;?$",
                     "captures": {
                         "2": { "name": "entity.name.function.nushell" },
-                        "3": { 
+                        "3": {
                             "name": "string.bare.nushell",
                             "patterns": [
                                 {
@@ -398,7 +398,7 @@
                     "begin": "(?<path>(?:/|\\\\|~[\\/\\\\]|\\.\\.?[\\/\\\\])?(?:[^\\/\\\\]+[\\/\\\\])*[\\w\\- ]+(?:\\.nu)?){0}^\\s*((?:export )?use)\\s+(\"\\g<path>\"|'\\g<path>\\'|(?![\"'])\\g<path>)\\s+\\[",
                     "beginCaptures": {
                         "2": { "name": "entity.name.function.nushell" },
-                        "3": { 
+                        "3": {
                             "name": "string.bare.nushell",
                             "patterns": [
                                 {
@@ -470,7 +470,7 @@
             "begin": "(\\{)(?:\\s*\\|([\\w, ]*)\\|)?",
             "beginCaptures": {
 				"1": { "name": "punctuation.section.block.begin.bracket.curly.nushell" },
-                "2": { 
+                "2": {
                     "patterns": [
                         { "include": "#function-parameter" },
                         {
@@ -486,10 +486,10 @@
 			},
             "name": "meta.expression.braced.nushell",
             "patterns": [
-                { 
+                {
                     "begin": "((?:(?:[^$\\(\\{\\[\"'#\\s][^\\(\\{\\[\"'#\\s]*)|\\$?(?:\"[^\"]+\"|'[^']+')))\\s*(:)\\s*",
                     "beginCaptures": {
-                        "1": { 
+                        "1": {
                             "name": "variable.other.nushell",
                             "patterns": [
                                 { "include": "#paren-expression" }
@@ -511,10 +511,10 @@
             "captures": {
                 "1": { "name": "keyword.other.nushell" },
                 "2": { "name": "variable.other.nushell" },
-                "3": { 
+                "3": {
                     "patterns": [
                         { "include": "#operators" }
-                    ] 
+                    ]
                 }
             }
         },
@@ -523,21 +523,21 @@
             "captures": {
                 "1": { "name": "entity.name.function.nushell" },
                 "2": { "name": "entity.name.type.nushell" },
-                "3": { 
+                "3": {
                     "patterns": [
                         { "include": "#operators" }
-                    ] 
+                    ]
                 }
             }
         },
         "pre-command": {
             "begin": "(\\w+)(=)",
             "beginCaptures": {
                 "1": { "name": "variable.other.nushell" },
-                "2": { 
+                "2": {
                     "patterns": [
                         { "include": "#operators" }
-                    ] 
+                    ]
                 }
             },
             "end": "(?=\\s+)",
@@ -550,7 +550,7 @@
             "begin": "(?<!\\w)(?:(\\^)|(?![0-9]|(?<=\\)|\\}|\\]|\\$\\w+)\\.))([\\w.!]+(?:(?: (?!-)[\\w\\-.!]+(?:(?= |\\))|$)|[\\w\\-.!]+))*|(?<=\\^)\\$?(?:\"[^\"]+\"|'[^']+'))",
             "beginCaptures": {
                 "1": { "name": "keyword.operator.nushell" },
-                "2": { 
+                "2": {
                     "patterns": [
                         { "include": "#control-keywords" },
                         {
@@ -559,34 +559,34 @@
                                 "0": { "name": "keyword.other.builtin.nushell" }
                             }
                         },
-                        { 
+                        {
                             "comment": "Regex generated with list-to-tree (https://github.com/glcraft/list-to-tree)",
-                            "match": "(a(?:l(?:ias|l)|n(?:si(?: (?:gradient|strip))?|y)|ppend|st)|b(?:enchmark|its(?: (?:and|not|or|ro(?:l|r)|sh(?:l|r)|xor))?|ytes(?: (?:a(?:dd|t)|build|collect|ends-with|index-of|length|re(?:move|place|verse)|starts-with))?)|c(?:al|d|har|lear|o(?:l(?:lect|umns)|m(?:mandline|p(?:act|lete))|nfig(?: (?:env|nu|reset))?)|p|ustom-value (?:generate(?:2)?|update))|d(?:ate(?: (?:format|humanize|list-timezone|now|to-(?:record|t(?:able|imezone))))?|e(?:bug|code(?: base64)?|f(?:-env|ault)?|scribe|tect columns)|o|rop(?: (?:column|nth))?|u)|e(?:ach(?: while)?|cho|n(?:code(?: base64)?|ter|v)|rror make|very|x(?:it|port(?: (?:alias|def(?:-env)?|extern|use)|-env)?|tern ))|f(?:etch|i(?:nd|rst)|latten|mt|ormat(?: filesize)?|rom(?: (?:csv|eml|i(?:cs|ni)|json|nuon|ods|ssv|t(?:oml|sv)|url|vcf|x(?:lsx|ml)|y(?:aml|ml)))?)|g(?:et|lob|r(?:id|oup(?:-by)?)|stat)?|h(?:ash(?: (?:base64|md5|sha256))?|e(?:aders|lp(?: operators)?)|i(?:de(?:-env)?|sto(?:gram|ry(?: session)?)))|i(?:gnore|n(?:c|put|sert|to(?: (?:b(?:inary|ool)|d(?:atetime|ecimal|uration)|filesize|int|record|s(?:qlite|tring)))?)|s-(?:admin|empty))|k(?:eybindings(?: (?:default|list(?:en)?))?|ill)|l(?:ast|e(?:ngth|t(?:-env)?)|ines|oad-env|s)|m(?:ath(?: (?:a(?:bs|vg)|ceil|eval|floor|m(?:ax|edian|in|ode)|product|round|s(?:qrt|tddev|um)|variance))?|e(?:rge|tadata)|kdir|o(?:dule|ve)|ut|v)|n(?:u-(?:check|example-(?:1|2|3)|highlight))?|o(?:pen|verlay(?: (?:hide|list|new|use))?)|p(?:a(?:r(?:-each|se)|th(?: (?:basename|dirname|ex(?:ists|pand)|join|parse|relative-to|split|type))?)|o(?:rt|st)|r(?:epend|int)|s)?|query(?: (?:db|json|web|xml))?|r(?:an(?:dom(?: (?:bool|chars|d(?:ecimal|ice)|integer|uuid))?|ge)|e(?:duce|gist(?:er|ry query)|ject|name|verse)|m|o(?:ll(?: (?:down|left|right|up))?|tate)|un-external)|s(?:ave|chema|e(?:lect|q(?: (?:char|date))?)|h(?:ells|uffle)|ize|kip(?: (?:until|while))?|leep|o(?:rt(?:-by)?|urce(?:-env)?)|plit(?: (?:c(?:hars|olumn)|list|row|words)|-by)?|tr(?: (?:c(?:a(?:mel-case|pitalize)|o(?:llect|ntains))|d(?:istance|owncase)|ends-with|find-replace|index-of|join|kebab-case|l(?:ength|pad)|pascal-case|r(?:e(?:place|verse)|pad)|s(?:creaming-snake-case|nake-case|tarts-with|ubstring)|t(?:itle-case|o-(?:d(?:atetime|ecimal)|int)|rim)|upcase))?|ys)|t(?:a(?:ble|ke(?: (?:until|while))?)|erm size|o(?: (?:csv|html|json|md|nuon|t(?:ext|oml|sv)|url|xml|yaml)|uch)?|ranspose|utor)|u(?:niq|p(?:date(?: cells)?|sert)|rl(?: parse)?|se)|v(?:ersion|iew-source)|w(?:atch|h(?:ere|ich)|i(?:ndow|th-env)|rap)|zip)(?![\\w-])( (.*))?",
+                            "match": "(a(?:l(?:ias|l)|n(?:si(?: (?:gradient|link|strip))?|y)|ppend|st)|b(?:its(?: (?:and|not|or|ro(?:l|r)|sh(?:l|r)|xor))?|reak|ytes(?: (?:a(?:dd|t)|build|collect|ends-with|index-of|length|re(?:move|place|verse)|starts-with))?)|c(?:al|d|har|lear|o(?:l(?:lect|umns)|m(?:mandline|p(?:act|lete))|n(?:fig(?: (?:env|nu|reset))?|st|tinue))|p|ustom-value (?:generate(?:2)?|update))|d(?:ate(?: (?:format|humanize|list-timezone|now|to-(?:record|t(?:able|imezone))))?|e(?:bug|code(?: base64)?|f(?:-env|ault)?|scribe|tect columns)|fr (?:a(?:gg(?:-groups)?|ll-(?:false|true)|ppend|rg-(?:m(?:ax|in)|sort|true|unique|where)|s(?:-date(?:time)?)?)|c(?:ache|o(?:l(?:lect|umns)?|n(?:cat(?:-str|enate)|tains)|unt(?:-null)?)|umulative)|d(?:rop(?:-(?:duplicates|nulls))?|types|ummies)|exp(?:lode|r-not)|f(?:etch|i(?:l(?:l-n(?:an|ull)|ter(?:-with)?)|rst)|latten)|g(?:et(?:-(?:day|hour|m(?:inute|onth)|nanosecond|ordinal|second|week(?:day)?|year))?|roup-by)|i(?:nto-(?:df|lazy|nu)|s-(?:duplicated|in|n(?:ot-null|ull)|unique))|join|l(?:ast|i(?:st|t)|owercase|s)|m(?:ax|e(?:an|dian|lt)|in)|n(?:-unique|ot)|o(?:pen|therwise)|qu(?:antile|ery)|r(?:e(?:name|place(?:-all)?|verse)|olling)|s(?:ample|e(?:lect|t(?:-with-idx)?)|h(?:ape|ift)|lice|ort-by|t(?:d|r(?:-(?:lengths|slice)|ftime))|um(?:mary)?)|t(?:ake|o-(?:arrow|csv|parquet))|u(?:nique|ppercase)|va(?:lue-counts|r)|w(?:hen|ith-column))|o|rop(?: (?:column|nth))?|u)|e(?:ach(?: while)?|cho|n(?:code(?: base64)?|ter|umerate)|rror make|very|x(?:ec|it|p(?:l(?:ain|ore)|ort(?: (?:alias|def(?:-env)?|extern|old-alias|use)|-env)?)|tern))|f(?:i(?:l(?:l|ter)|nd|rst)|latten|mt|or(?:mat(?: filesize)?)?|rom(?: (?:csv|eml|i(?:cs|ni)|json|nuon|ods|p(?:arquet|list)|ssv|t(?:oml|sv)|url|vcf|x(?:lsx|ml)|y(?:aml|ml)))?)|g(?:et|lob|r(?:id|oup(?:-by)?)|stat)?|h(?:ash(?: (?:base64|md5|sha256))?|e(?:aders|lp(?: (?:aliases|commands|modules|operators))?)|i(?:de(?:-env)?|st(?:o(?:gram|ry(?: session)?))?)|ttp(?: (?:delete|get|head|p(?:atch|ost|ut)))?)|i(?:f|gnore|n(?:c|put|s(?:ert|pect)|to(?: (?:b(?:inary|ool)|d(?:atetime|ecimal|uration)|filesize|int|record|s(?:qlite|tring)))?)|s-(?:admin|empty))|json path|k(?:eybindings(?: (?:default|list(?:en)?))?|ill)|l(?:ast|e(?:ngth|t(?:-env)?)|ines|o(?:ad-env|op)|s)|m(?:ath(?: (?:a(?:bs|rc(?:cos(?:h)?|sin(?:h)?|tan(?:h)?)|vg)|c(?:eil|os(?:h)?)|e(?:val)?|floor|l(?:n|og)|m(?:ax|edian|in|ode)|p(?:i|roduct)|round|s(?:in(?:h)?|qrt|tddev|um)|ta(?:n(?:h)?|u)|variance))?|e(?:rge|tadata)|kdir|o(?:dule|ve)|ut|v)|n(?:u-(?:check|example-(?:1|2|3)|highlight))?|o(?:ld-alias|pen|verlay(?: (?:hide|list|new|use))?)|p(?:a(?:r(?:-each|se)|th(?: (?:basename|dirname|ex(?:ists|pand)|join|parse|relative-to|split|type))?)|eriodic-table|lot|net|ort|r(?:epend|int|ofile)|s)?|query(?: (?:db|json|web|xml))?|r(?:an(?:dom(?: (?:bool|chars|d(?:ecimal|ice)|integer|uuid))?|ge)|e(?:duce|g(?:ex|ist(?:er|ry query))|ject|name|turn|verse)|m|o(?:ll(?: (?:down|left|right|up))?|tate)|un-external)|s(?:ave|chema|e(?:lect|q(?: (?:char|date))?)|h(?:ells|uffle)|ize|kip(?: (?:until|while))?|leep|o(?:rt(?:-by)?|urce(?:-env)?)|plit(?: (?:c(?:hars|olumn)|list|row|words)|-by)?|t(?:art|r(?: (?:c(?:a(?:mel-case|pitalize)|o(?:llect|ntains))|d(?:istance|owncase)|ends-with|find-replace|index-of|join|kebab-case|l(?:ength|pad)|pascal-case|r(?:e(?:place|verse)|pad)|s(?:creaming-snake-case|nake-case|tarts-with|ubstring)|t(?:itle-case|o-(?:d(?:atetime|ecimal)|int)|rim)|upcase))?)|ys)|t(?:a(?:ble|ke(?: (?:until|while))?)|erm size|imeit|o(?: (?:csv|html|json|md|nuon|t(?:ext|oml|sv)|xml|yaml)|uch)?|r(?:anspose|y)|utor)|u(?:niq(?:-by)?|p(?:date(?: cells)?|sert)|rl(?: (?:build-query|encode|join|parse))?|se)|v(?:alues|ersion|iew(?: (?:files|s(?:ource|pan)))?)|w(?:atch|h(?:ere|i(?:ch|le))|i(?:ndow|th-env)|rap)|xyplot|zip)(?![\\w-])( (.*))?",
                             "captures": {
                                 "1": { "name": "keyword.other.builtin.nushell" },
-                                "2": { 
+                                "2": {
                                     "patterns": [
                                         { "include": "#value" }
                                     ]
                                 }
                             }
                         },
-                        { 
+                        {
                             "match": "(?<=\\^)(?:\\$(\"[^\"]+\"|'[^']+')|\"[^\"]+\"|'[^']+')",
                             "name": "entity.name.type.external.nushell",
                             "captures": {
-                                "1": { 
+                                "1": {
                                     "patterns": [
                                         { "include": "#paren-expression" }
-                                    ] 
+                                    ]
                                 }
                             }
                         },
                         {
                             "match": "([\\w.]+(?:-[\\w.!]+)*)(?: (.*))?",
                             "captures": {
                                 "1": { "name": "entity.name.type.external.nushell" },
-                                "2": { 
+                                "2": {
                                     "patterns": [
                                         { "include": "#value" }
                                     ]
@@ -595,7 +595,7 @@
                         },
                         { "include": "#value" }
                     ]
-                    
+
                 }
             },
             "end": "(?=\\||\\)|\\}|;)|$",