Merge pull request #713 from dark64/update-ace-mode

Update ace mode

zokrates_parser/src/ace_mode/README.md

@@ -1,3 +1,4 @@
-### ZoKrates Ace Mode (Syntax Highlighting)
+### ZoKrates Ace Mode (Syntax Highlighting for Ace/Brace)
 
 [Ace](https://ace.c9.io/) Edit Mode for [ZoKrates DSL](https://github.com/Zokrates/ZoKrates).
+Compatible with browserify version of the ace editor, [brace](https://www.npmjs.com/package/brace).

zokrates_parser/src/ace_mode/index.js

@@ -37,7 +37,7 @@ ace.define("ace/mode/zokrates_highlight_rules",["require","exports","module","ac
     var ZoKratesHighlightRules = function () {
 
         var keywords = (
-            "assert|endfor|as|return|byte|field|bool|if|then|fi|do|else|export|false|def|for|import|from|uint|in|public|private|struct|true"
+            "assert|as|bool|byte|def|do|else|endfor|export|false|field|for|if|then|fi|import|from|in|private|public|return|struct|true|u8|u16|u32"
         );
 
         var keywordMapper = this.createKeywordMapper({
@@ -68,7 +68,7 @@ ace.define("ace/mode/zokrates_highlight_rules",["require","exports","module","ac
                     regex: "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
                 }, {
                     token: "keyword.operator",
-                    regex: "\\+|\\-|\\*|\\*\\*|\\/|\\|\\||&&|\\^|!|<|>|<=|=>|==|!=|="
+                    regex: "\\+|\\-|\\*\\*?|\\/|\\|\\|?|&&?|\\^|!|<<?|>>?|<=|=>|==|!=|="
                 }, {
                     token: "punctuation",
                     regex: ",|:|;"

zokrates_parser/src/ace_mode/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ace-mode-zokrates",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Ace Mode for ZoKrates DSL",
   "main": "index.js",
   "scripts": {