Merge pull request #72 from fdncred/and_and_or

fdncred · web-flow · commit a3d91c4857f2 · 2022-12-14T12:23:49.000-06:00
diff --git a/syntaxes/nushell.tmLanguage.json b/syntaxes/nushell.tmLanguage.json
@@ -151,7 +151,7 @@
         },
         {
           "name": "keyword.other.o",
-          "match": "\\b(otherwise|open-df|open)\\b"
+          "match": "\\b(or|otherwise|open-df|open)\\b"
         },
         {
           "name": "keyword.other.n",
@@ -291,7 +291,7 @@
         },
         {
           "name": "keyword.other.a",
-          "match": "\\b(as-datetime|arg-unique|agg-groups|arg-where|all-false|arg-true|arg-sort|all-true|as-date|arg-min|arg-max|append|ansi|ast|any|all|agg|as)\\b"
+          "match": "\\b(and|as-datetime|arg-unique|agg-groups|arg-where|all-false|arg-true|arg-sort|all-true|as-date|arg-min|arg-max|append|ansi|ast|any|all|agg|as)\\b"
         },
         {
           "name": "keyword.other.unit",

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@`
`151`	`151`	`},`
`152`	`152`	`{`
`153`	`153`	`"name": "keyword.other.o",`
`154`		`- "match": "\\b(otherwise\|open-df\|open)\\b"`
	`154`	`+ "match": "\\b(or\|otherwise\|open-df\|open)\\b"`
`155`	`155`	`},`
`156`	`156`	`{`
`157`	`157`	`"name": "keyword.other.n",`
`@@ -291,7 +291,7 @@`
`291`	`291`	`},`
`292`	`292`	`{`
`293`	`293`	`"name": "keyword.other.a",`
`294`		`- "match": "\\b(as-datetime\|arg-unique\|agg-groups\|arg-where\|all-false\|arg-true\|arg-sort\|all-true\|as-date\|arg-min\|arg-max\|append\|ansi\|ast\|any\|all\|agg\|as)\\b"`
	`294`	`+ "match": "\\b(and\|as-datetime\|arg-unique\|agg-groups\|arg-where\|all-false\|arg-true\|arg-sort\|all-true\|as-date\|arg-min\|arg-max\|append\|ansi\|ast\|any\|all\|agg\|as)\\b"`
`295`	`295`	`},`
`296`	`296`	`{`
`297`	`297`	`"name": "keyword.other.unit",`