update golang_highlight_rules

Author: nightwing

lib/ace/mode/_test/highlight_rules_test.js

@@ -21,7 +21,8 @@ function modeList() {
 }
 
 function checkModes() {
-    modeList().forEach(function(modeName) {
+    modeList().forEach(function(modeName, i) {
+        console.log(padNumber(i+1, 3) + ") check: \u001b[33m" + modeName + "\u001b[0m");
         try {
             var Mode = require("../" + modeName).Mode;
         } catch(e) {

lib/ace/mode/_test/tokens_golang.json

@@ -45,7 +45,7 @@
    "start",
   ["keyword","func"],
   ["text"," "],
-  ["identifier","main"],
+  ["entity.name.function","main"],
   ["paren.lparen","("],
   ["paren.rparen",")"],
   ["text"," "],
@@ -55,9 +55,9 @@
   ["text","    "],
   ["identifier","fmt"],
   ["punctuation.operator","."],
-  ["identifier","Println"],
+  ["support.function","Println"],
   ["paren.lparen","("],
-  ["identifier","pi"],
+  ["support.function","pi"],
   ["paren.lparen","("],
   ["constant.numeric","5000"],
   ["paren.rparen","))"]
@@ -76,7 +76,7 @@
    "start",
   ["keyword","func"],
   ["text"," "],
-  ["identifier","pi"],
+  ["entity.name.function","pi"],
   ["paren.lparen","("],
   ["identifier","n"],
   ["text"," "],
@@ -129,7 +129,7 @@
   ["text","        "],
   ["keyword","go"],
   ["text"," "],
-  ["identifier","term"],
+  ["support.function","term"],
   ["paren.lparen","("],
   ["identifier","ch"],
   ["punctuation.operator",","],
@@ -203,7 +203,7 @@
    "start",
   ["keyword","func"],
   ["text"," "],
-  ["identifier","term"],
+  ["entity.name.function","term"],
   ["paren.lparen","("],
   ["identifier","ch"],
   ["text"," "],
@@ -231,7 +231,7 @@
   ["text"," "],
   ["identifier","math"],
   ["punctuation.operator","."],
-  ["identifier","Pow"],
+  ["support.function","Pow"],
   ["paren.lparen","("],
   ["constant.numeric","-1"],
   ["punctuation.operator",","],

lib/ace/mode/golang_highlight_rules.js

@@ -15,7 +15,7 @@ define(function(require, exports, module) {
             "float64|complex64|complex128|byte|rune|uint|int|uintptr|bool|error"
         );
         var builtinFunctions = (
-            "make|close|new|panic|recover"
+            "new|close|cap|copy|panic|panicln|print|println|len|make|delete|real|recover|imag|append"
         );
         var builtinConstants = ("nil|true|false|iota");
 
@@ -24,7 +24,9 @@ define(function(require, exports, module) {
             "constant.language": builtinConstants,
             "support.function": builtinFunctions,
             "support.type": builtinTypes
-        }, "identifier");
+        }, "");
+        
+        var stringEscapeRe = "\\\\(?:[0-7]{3}|x\\h{2}|u{4}|U\\h{6}|[abfnrtv'\"\\\\])".replace(/\\h/g, "[a-fA-F\\d]");
 
         this.$rules = {
             "start" : [
@@ -34,32 +36,43 @@ define(function(require, exports, module) {
                 },
                 DocCommentHighlightRules.getStartRule("doc-start"),
                 {
-                    token : "comment", // multi line comment
+                    token : "comment.start", // multi line comment
                     regex : "\\/\\*",
                     next : "comment"
                 }, {
                     token : "string", // single line
-                    regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+                    regex : /"(?:[^"\\]|\\.)*?"/
                 }, {
-                    token : "string", // single line
-                    regex : '[`](?:[^`]*)[`]'
-                }, {
-                    token : "string", // multi line string start
-                    merge : true,
+                    token : "string", // raw
                     regex : '[`](?:[^`]*)$',
                     next : "bqstring"
                 }, {
                     token : "constant.numeric", // rune
-                    regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))[']"
+                    regex : "'(?:[^\\'\uD800-\uDBFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|" + stringEscapeRe.replace('"', '')  + ")'"
                 }, {
                     token : "constant.numeric", // hex
-                    regex : "0[xX][0-9a-fA-F]+\\b"
+                    regex : "0[xX][0-9a-fA-F]+\\b" 
                 }, {
                     token : "constant.numeric", // float
                     regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
                 }, {
-                    token : keywordMapper,
-                    regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+                    token : ["keyword", "text", "entity.name.function"],
+                    regex : "(func)(\\s+)([a-zA-Z_$][a-zA-Z0-9_$]*)\\b"
+                }, {
+                    token : function(val) {
+                        if (val[val.length - 1] == "(") {
+                            return [{
+                                type: keywordMapper(val.slice(0, -1)) || "support.function",
+                                value: val.slice(0, -1)
+                            }, {
+                                type: "paren.lparen",
+                                value: val.slice(-1)
+                            }];
+                        }
+                        
+                        return keywordMapper(val) || "identifier";
+                    },
+                    regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b\\(?"
                 }, {
                     token : "keyword.operator",
                     regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^="
@@ -79,22 +92,20 @@ define(function(require, exports, module) {
             ],
             "comment" : [
                 {
-                    token : "comment", // closing comment
-                    regex : ".*?\\*\\/",
+                    token : "comment.end",
+                    regex : "\\*\\/",
                     next : "start"
                 }, {
-                    token : "comment", // comment spanning whole line
-                    regex : ".+"
+                    defaultToken : "comment",
                 }
             ],
             "bqstring" : [
                 {
                     token : "string",
-                    regex : '(?:[^`]*)`',
+                    regex : '`',
                     next : "start"
                 }, {
-                    token : "string",
-                    regex : '.+'
+                    defaultToken : "string"
                 }
             ]
         };

static.js

@@ -13,6 +13,8 @@ if (!fs.exists)
     fs.exists = path.exists;
 
 var allowSave = process.argv.indexOf("--allow-save") != -1;
+if (allowSave)
+    console.warn("writing files from browser is enabled");
 
 http.createServer(function(req, res) {
     var uri = unescape(url.parse(req.url).pathname)