gollum 3.1.2 → 3.1.3

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/golang_highlight_rules.js

@@ -5,17 +5,25 @@ define(function(require, exports, module) {
 
     var GolangHighlightRules = function() {
         var keywords = (
-            "true|else|false|break|case|return|goto|if|const|" +
-            "continue|struct|default|switch|for|" +
-            "func|import|package|chan|defer|fallthrough|go|interface|map|range" +
+            "else|break|case|return|goto|if|const|select|" +
+            "continue|struct|default|switch|for|range|" +
+            "func|import|package|chan|defer|fallthrough|go|interface|map|range|" +
             "select|type|var"
         );
-        var buildinConstants = ("nil|true|false|iota");
+        var builtinTypes = (
+            "string|uint8|uint16|uint32|uint64|int8|int16|int32|int64|float32|" +
+            "float64|complex64|complex128|byte|rune|uint|int|uintptr|bool|error"
+        );
+        var builtinFunctions = (
+            "make|close|new|panic|recover"
+        );
+        var builtinConstants = ("nil|true|false|iota");
 
         var keywordMapper = this.createKeywordMapper({
-            "variable.language": "this",
             "keyword": keywords,
-            "constant.language": buildinConstants
+            "constant.language": builtinConstants,
+            "support.function": builtinFunctions,
+            "support.type": builtinTypes
         }, "identifier");
 
         this.$rules = {
@@ -27,43 +35,34 @@ define(function(require, exports, module) {
                 DocCommentHighlightRules.getStartRule("doc-start"),
                 {
                     token : "comment", // multi line comment
-                    merge : true,
                     regex : "\\/\\*",
                     next : "comment"
                 }, {
                     token : "string", // single line
                     regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-                }, {
-                    token : "string", // multi line string start
-                    merge : true,
-                    regex : '["].*\\\\$',
-                    next : "qqstring"
                 }, {
                     token : "string", // single line
-                    regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+                    regex : '[`](?:[^`]*)[`]'
                 }, {
                     token : "string", // multi line string start
                     merge : true,
-                    regex : "['].*\\\\$",
-                    next : "qstring"
+                    regex : '[`](?:[^`]*)$',
+                    next : "bqstring"
+                }, {
+                    token : "constant.numeric", // rune
+                    regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))[']"
                 }, {
                     token : "constant.numeric", // hex
                     regex : "0[xX][0-9a-fA-F]+\\b"
                 }, {
                     token : "constant.numeric", // float
                     regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-                }, {
-                    token : "constant", // <CONSTANT>
-                    regex : "<[a-zA-Z0-9.]+>"
-                }, {
-                    token : "keyword", // pre-compiler directivs
-                    regex : "(?:#include|#pragma|#line|#define|#undef|#ifdef|#else|#elif|#endif|#ifndef)"
                 }, {
                     token : keywordMapper,
                     regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
                 }, {
                     token : "keyword.operator",
-                    regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"
+                    regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^="
                 }, {
                     token : "punctuation.operator",
                     regex : "\\?|\\:|\\,|\\;|\\."
@@ -85,29 +84,16 @@ define(function(require, exports, module) {
                     next : "start"
                 }, {
                     token : "comment", // comment spanning whole line
-                    merge : true,
                     regex : ".+"
                 }
             ],
-            "qqstring" : [
+            "bqstring" : [
                 {
                     token : "string",
-                    regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
+                    regex : '(?:[^`]*)`',
                     next : "start"
                 }, {
                     token : "string",
-                    merge : true,
-                    regex : '.+'
-                }
-            ],
-            "qstring" : [
-                {
-                    token : "string",
-                    regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                    next : "start"
-                }, {
-                    token : "string",
-                    merge : true,
                     regex : '.+'
                 }
             ]
@@ -115,8 +101,8 @@ define(function(require, exports, module) {
 
         this.embedRules(DocCommentHighlightRules, "doc-",
             [ DocCommentHighlightRules.getEndRule("start") ]);
-    }
+    };
     oop.inherits(GolangHighlightRules, TextHighlightRules);
 
     exports.GolangHighlightRules = GolangHighlightRules;
-});
+});

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/groovy.js

@@ -3,12 +3,11 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var GroovyHighlightRules = require("./groovy_highlight_rules").GroovyHighlightRules;
 
 var Mode = function() {
     JavaScriptMode.call(this);
-    this.$tokenizer = new Tokenizer(new GroovyHighlightRules().getRules());
+    this.HighlightRules = GroovyHighlightRules;
 };
 oop.inherits(Mode, JavaScriptMode);
 
@@ -18,6 +17,7 @@ oop.inherits(Mode, JavaScriptMode);
         return null;
     };
 
+    this.$id = "ace/mode/groovy";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/groovy_highlight_rules.js

@@ -72,7 +72,6 @@ var GroovyHighlightRules = function() {
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
                 token : "comment", // multi line comment
-                merge : true,
                 regex : "\\/\\*",
                 next : "comment"
             }, {
@@ -127,7 +126,6 @@ var GroovyHighlightRules = function() {
                 next : "start"
             }, {
                 token : "comment", // comment spanning whole line
-                merge : true,
                 regex : ".+"
             }
         ],

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/haml.js

@@ -42,20 +42,19 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var HamlHighlightRules = require("./haml_highlight_rules").HamlHighlightRules;
 var FoldMode = require("./folding/coffee").FoldMode;
 
 var Mode = function() {
-    var highlighter = new HamlHighlightRules();
-    this.foldingRules = new FoldMode();    
-    
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
+    this.HighlightRules = HamlHighlightRules;
+    this.foldingRules = new FoldMode();
 };
 oop.inherits(Mode, TextMode);
 
 (function() {
-    // Extra logic goes here. 
+    this.lineCommentStart = ["//", "#"];
+    
+    this.$id = "ace/mode/haml";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/haml_highlight_rules.js

@@ -15,69 +15,69 @@ var HamlHighlightRules = function() {
         {
     "start": [
         {
-            "token" : "punctuation.section.comment",
-            "regex" : /^\s*\/.*/
+            token : "punctuation.section.comment",
+            regex : /^\s*\/.*/
         },
         {
-            "token" : "punctuation.section.comment",
-            "regex" : /^\s*#.*/
+            token : "punctuation.section.comment",
+            regex : /^\s*#.*/
         },
         {
-            "token": "string.quoted.double",
-            "regex": "==.+?=="
+            token: "string.quoted.double",
+            regex: "==.+?=="
         },
         {
-            "token": "keyword.other.doctype",
-            "regex": "^!!!\\s*(?:[a-zA-Z0-9-_]+)?"
+            token: "keyword.other.doctype",
+            regex: "^!!!\\s*(?:[a-zA-Z0-9-_]+)?"
         },
         RubyExports.qString,
         RubyExports.qqString,
         RubyExports.tString,
         {
-            "token": ["entity.name.tag.haml"],
-            "regex": /^\s*%[\w:]+/,
-            "next": "tag_single"
+            token: ["entity.name.tag.haml"],
+            regex: /^\s*%[\w:]+/,
+            next: "tag_single"
         },
         {
-            "token": [ "meta.escape.haml" ],
-            "regex": "^\\s*\\\\."
+            token: [ "meta.escape.haml" ],
+            regex: "^\\s*\\\\."
         },
         RubyExports.constantNumericHex,
         RubyExports.constantNumericFloat,
         
         RubyExports.constantOtherSymbol,
         {
-            "token": "text",
-            "regex": "=|-|~",
-            "next": "embedded_ruby"
+            token: "text",
+            regex: "=|-|~",
+            next: "embedded_ruby"
         }
     ],
     "tag_single": [
         {
-            "token": "entity.other.attribute-name.class.haml",
-            "regex": "\\.[\\w-]+"
+            token: "entity.other.attribute-name.class.haml",
+            regex: "\\.[\\w-]+"
         },
         {
-            "token": "entity.other.attribute-name.id.haml",
-            "regex": "#[\\w-]+"
+            token: "entity.other.attribute-name.id.haml",
+            regex: "#[\\w-]+"
         },
         {
-            "token": "punctuation.section",
-            "regex": "\\{",
-            "next": "section"
+            token: "punctuation.section",
+            regex: "\\{",
+            next: "section"
         },
         
         RubyExports.constantOtherSymbol,
         
         {
-            "token": "text",
-            "regex": /\s/,
-            "next": "start"
+            token: "text",
+            regex: /\s/,
+            next: "start"
         },
         {
-            "token": ["text", "punctuation"],
-            "regex": "($)|((?!\\.|#|\\{|\\[|=|-|~|\\/))",
-            "next": "start"
+            token: "empty",
+            regex: "$|(?!\\.|#|\\{|\\[|=|-|~|\\/)",
+            next: "start"
         }
     ],
     "section": [
@@ -90,9 +90,9 @@ var HamlHighlightRules = function() {
         RubyExports.constantNumericHex,
         RubyExports.constantNumericFloat,
         {
-            "token": "punctuation.section",
-            "regex": "\\}",
-            "next": "start"
+            token: "punctuation.section",
+            regex: "\\}",
+            next: "start"
         } 
     ],
     "embedded_ruby": [ 
@@ -103,23 +103,23 @@ var HamlHighlightRules = function() {
                 regex : "[A-Z][a-zA-Z_\\d]+"
         },    
         {
-            "token" : new RubyHighlightRules().getKeywords(),
-            "regex" : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            token : new RubyHighlightRules().getKeywords(),
+            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
         },
         {
-            "token" : ["keyword", "text", "text"],
-            "regex" : "(?:do|\\{)(?: \\|[^|]+\\|)?$",
-            "next"  : "start"
+            token : ["keyword", "text", "text"],
+            regex : "(?:do|\\{)(?: \\|[^|]+\\|)?$",
+            next  : "start"
         }, 
         {
-            "token" : ["text"],
-            "regex" : "^$",
-            "next"  : "start"
+            token : ["text"],
+            regex : "^$",
+            next  : "start"
         }, 
         {
-            "token" : ["text"],
-            "regex" : "^(?!.*\\|\\s*$)",
-            "next"  : "start"
+            token : ["text"],
+            regex : "^(?!.*\\|\\s*$)",
+            next  : "start"
         }
     ]
 }

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/handlebars.js

@@ -0,0 +1,29 @@
+/* global define */
+
+define(function(require, exports, module) {
+  "use strict";
+
+var oop = require("../lib/oop");
+var HtmlMode = require("./html").Mode;
+var HandlebarsHighlightRules = require("./handlebars_highlight_rules").HandlebarsHighlightRules;
+var HtmlBehaviour = require("./behaviour/html").HtmlBehaviour;
+var HtmlFoldMode = require("./folding/html").FoldMode;
+
+var Mode = function() {
+    HtmlMode.call(this);
+    this.HighlightRules = HandlebarsHighlightRules;
+    this.$behaviour = new HtmlBehaviour();
+
+    
+    this.foldingRules = new HtmlFoldMode();
+};
+
+oop.inherits(Mode, HtmlMode);
+
+(function() {
+    this.blockComment = {start: "{!--", end: "--}"};
+    this.$id = "ace/mode/handlebars";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/handlebars_highlight_rules.js

@@ -0,0 +1,72 @@
+/* global define */
+
+define(function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
+
+function pop2(currentState, stack) {
+    stack.splice(0, 3);
+    return stack.shift() || "start";
+}
+var HandlebarsHighlightRules = function() {
+    HtmlHighlightRules.call(this);
+    var hbs = {
+        regex : "(?={{)",
+        push : "handlebars"
+    };
+    for (var key in this.$rules) {
+        this.$rules[key].unshift(hbs);
+    }
+    this.$rules.handlebars = [{
+        token : "comment.start",
+        regex : "{{!--",
+        push : [{
+            token : "comment.end",
+            regex : "--}}",
+            next : pop2
+        }, {
+            defaultToken : "comment"
+        }]
+    }, {
+        token : "comment.start",
+        regex : "{{!",
+        push : [{
+            token : "comment.end",
+            regex : "}}",
+            next : pop2
+        }, {
+            defaultToken : "comment"
+        }]
+    }, {
+        token : "support.function", // unescaped variable
+        regex : "{{{",
+        push : [{
+            token : "support.function",
+            regex : "}}}",
+            next : pop2
+        }, {
+            token : "variable.parameter",
+            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*"
+        }]
+    }, {
+        token : "storage.type.start", // begin section
+        regex : "{{[#\\^/&]?",
+        push : [{
+            token : "storage.type.end",
+            regex : "}}",
+            next : pop2
+        }, {
+            token : "variable.parameter",
+            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*"
+        }]
+    }];
+
+    this.normalizeRules();
+};
+
+oop.inherits(HandlebarsHighlightRules, HtmlHighlightRules);
+
+exports.HandlebarsHighlightRules = HandlebarsHighlightRules;
+});

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/haskell.js

@@ -0,0 +1,62 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2012, Ajax.org B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * Contributor(s):
+ *
+ *
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+  THIS FILE WAS AUTOGENERATED BY mode.tmpl.js
+*/
+
+define(function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var HaskellHighlightRules = require("./haskell_highlight_rules").HaskellHighlightRules;
+// TODO: pick appropriate fold mode
+var FoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.HighlightRules = HaskellHighlightRules;
+    this.foldingRules = new FoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    this.lineCommentStart = "--";
+    this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/haskell";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});