Merge pull request #94 from anubmat/branch_anubha

Fix for adding caret as a Logical Operator

Author: anubmat

TypeScript.YAML-tmLanguage

@@ -506,7 +506,7 @@ repository:
 
   logic-operator:
     name: keyword.operator.arithmetic.ts
-    match: \!|&|~|\||&&|\|\|
+    match: \!|&|~|\^|\||&&|\|\|
 
   storage-keyword:
     name: storage.type.ts

TypeScript.tmLanguage

@@ -704,7 +704,7 @@
 		<key>logic-operator</key>
 		<dict>
 			<key>match</key>
-			<string>\!|&amp;|~|\||&amp;&amp;|\|\|</string>
+			<string>\!|&amp;|~|\^|\||&amp;&amp;|\|\|</string>
 			<key>name</key>
 			<string>keyword.operator.arithmetic.ts</string>
 		</dict>

TypeScriptReact.YAML-tmLanguage

@@ -494,7 +494,7 @@ repository:
 
   logic-operator:
     name: keyword.operator.arithmetic.tsx
-    match: \!|&|~|\||&&|\|\|
+    match: \!|&|~|\^|\||&&|\|\|
 
   storage-keyword:
     name: storage.type.tsx

TypeScriptReact.tmLanguage

@@ -1070,7 +1070,7 @@
 		<key>logic-operator</key>
 		<dict>
 			<key>match</key>
-			<string>\!|&amp;|~|\||&amp;&amp;|\|\|</string>
+			<string>\!|&amp;|~|\^|\||&amp;&amp;|\|\|</string>
 			<key>name</key>
 			<string>keyword.operator.arithmetic.tsx</string>
 		</dict>

tests/baselines/Issue90.txt

@@ -0,0 +1,10 @@
+[1, 1]: source.ts meta.var.expr.ts 
+[2, 1]: source.ts meta.var.expr.ts 
+[2, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts 
+[2, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts 
+[3, 1]: source.ts meta.var.expr.ts 
+[3, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts 
+[3, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts 
+[3, 12]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts 
+[3, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts 
+[4, 1]: source.ts 

tests/cases/Issue90.ts

@@ -0,0 +1,4 @@
+^^ var a = 0;
+^^ var ^^b = ^^1;
+^^ var ^^c = ^^a ^^^ ^^b;
+^^