Textmate improvements (#168)

* fix multiple cases in-out

* fix one line function parameters

* add type name infos

* fix type detection in parameters

* fix variadic detection in parameters

* fix type detction in parameters

* simplify texmate

Author: glcraft

syntaxes/nushell.tmLanguage.json

@@ -224,6 +224,7 @@
     "types": {
       "patterns": [
         { 
+          "name": "meta.list.nushell",
           "begin": "\\b(list)\\s*<",
           "beginCaptures": {
             "1": { "name": "entity.name.type.nushell" }
@@ -234,6 +235,7 @@
           ]
         },
         {
+          "name": "meta.record.nushell",
           "begin": "\\b(record)\\s*<",
           "beginCaptures": {
             "1": { "name": "entity.name.type.nushell" }
@@ -255,20 +257,15 @@
         }
       ]
     },
-    "function-parameter-default-value": {
-      "begin": "=\\s*",
-      "end": "(?=\\])|,|$",
-      "patterns": [{ "include": "#value" }]
-    },
-    "function-parameter-declare": {
+    "function-parameter": {
       "patterns": [
         {
-          "match": "(-{0,2}[\\w-]+|\\.{3})(?:\\((-[\\w?])\\))?",
+          "match": "((?:-{0,2}|\\.{3})[\\w-]+)(?:\\((-[\\w?])\\))?",
           "name": "variable.parameter.nushell"
         },
         {
           "begin": "\\??:\\s*",
-          "end": "\\s*(?=,|@|#|$)",
+          "end": "(?=(?:\\s+(?:-{0,2}|\\.{3})[\\w-]+)|(?:\\s*(?:,|\\]|@|=|#|$)))",
           "patterns": [
             { "include": "#types" }
           ]
@@ -277,15 +274,15 @@
           "begin": "@(?=\"|')",
           "end": "(?<=\"|')",
           "patterns": [ {"include": "#string"} ]
+        },
+        {
+          "name": "default.value.nushell",
+          "begin": "=\\s*",
+          "end": "(?=(?:\\s+-{0,2}[\\w-]+)|(?:\\s*(?:,|\\]|#|$)))",
+          "patterns": [{ "include": "#value" }]
         }
       ]
     },
-    "function-parameter": {
-      "patterns": [
-        { "include": "#function-parameter-declare" },
-        { "include": "#function-parameter-default-value" }
-      ]
-    },
     "function-parameters": {
       "begin": "\\[",
       "beginCaptures": {
@@ -301,31 +298,40 @@
       ],
       "name": "meta.function.parameters.nushell"
     },
-    "inout": {
+    "function-multiple-inout": {
+      "begin": "(?<=]\\s*)(:)\\s+(\\[)",
+          "beginCaptures": {
+            "1": { "name": "punctuation.definition.in-out.nushell" },
+            "2": { "name": "meta.brace.square.begin.nushell" }
+          },
+          "end": "\\]",
+          "endCaptures": {
+            "0": { "name": "meta.brace.square.end.nushell" }
+          },
+          "patterns": [
+            { "include": "#types" },
+            {
+              "match": "\\s*(,)\\s*",
+              "captures": {
+                "1": { "name": "punctuation.separator.nushell" }
+              }
+            },
+            {
+              "match": "\\s+(->)\\s+",
+              "captures": {
+                "1": { "name": "keyword.operator.nushell" }
+              }
+            }
+          ]
+    },
+    "function-inout": {
       "patterns": [
         { "include": "#types" },
         {
           "match": "->",
           "name": "keyword.operator.nushell"
-        }
-      ]
-    },
-    "function-inout": {
-      "begin": "(?<=]\\s*)(:)\\s+(\\[)",
-      "beginCaptures": {
-        "1": { "name": "punctuation.definition.in-out.nushell" },
-        "2": { "name": "meta.brace.square.end.nushell" }
-      },
-      "end": "\\]",
-      "endCaptures": {
-        "0": { "name": "meta.brace.square.end.nushell" }
-      },
-      "patterns": [
-        { "include": "#inout" },
-        { 
-          "match": ",",
-          "name": "punctuation.separator.nushell"
-        }
+        },
+        { "include": "#function-multiple-inout" }
       ]
     },
     "function-body": {
@@ -348,14 +354,10 @@
         "3": { "name": "entity.name.function.nushell" }
       },
       "end": "(?<=\\})",
-      "endCaptures": {
-        "0": { "name": "punctuation.definition.function.end.nushell" }
-      },
       "patterns": [
         { "include": "#function-parameters" },
         { "include": "#function-body" },
-        { "include": "#function-inout" },
-        { "include": "#inout" }
+        { "include": "#function-inout" }
       ]
     },
     "extern": {