gollum 2.4.4 → 2.4.5

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/mode/xquery/visitors/SyntaxHighlighter.js

@@ -0,0 +1,316 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2010, 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.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define(function(require, exports, module){
+
+var SyntaxHighlighter = exports.SyntaxHighlighter = function(source, tree)
+{
+   var keywords = ['after', 'ancestor', 'ancestor-or-self', 'and', 'as', 'ascending', 'attribute', 'before', 'case', 'cast', 'castable', 'child', 'collation', 'comment', 'copy', 'count', 'declare', 'default', 'delete', 'descendant', 'descendant-or-self', 'descending', 'div', 'document', 'document-node', 'element', 'else', 'empty', 'empty-sequence', 'end', 'eq', 'every', 'except', 'first', 'following', 'following-sibling', 'for', 'function', 'ge', 'group', 'gt', 'idiv', 'if', 'then', 'import', 'insert', 'instance', 'intersect', 'into', 'is', 'item', 'last', 'le', 'let', 'lt', 'mod', 'modify', 'module', 'namespace', 'namespace-node', 'ne', 'node', 'only', 'or', 'order', 'ordered', 'parent', 'preceding', 'preceding-sibling', 'processing-instruction', 'rename', 'replace', 'return', 'satisfies', 'schema-attribute', 'schema-element', 'self', 'some', 'stable', 'start', 'switch', 'text', 'to', 'treat', 'try', 'typeswitch', 'union', 'unordered', 'validate', 'where', 'with', 'xquery', 'contains', 'paragraphs', 'sentences', 'times', 'words', 'by', 'collection', 'allowing', 'at', 'base-uri', 'boundary-space', 'break', 'catch', 'construction', 'context', 'continue', 'copy-namespaces', 'decimal-format', 'encoding', 'exit', 'external', 'ft-option', 'in', 'index', 'integrity', 'lax', 'nodes', 'option', 'ordering', 'revalidation', 'schema', 'score', 'sliding', 'strict', 'tumbling', 'type', 'updating', 'value', 'variable', 'version', 'while', 'constraint', 'loop', 'returning', 'append', 'array', 'json-item', 'object', 'structured-item', 'when', 'next', 'previous', 'window'];
+   var states  = ["cdata", "comment", "tag"];
+   var info = { lines: [ [] ], states: [] };
+
+   this.getTokens = function() {
+     this.visit(tree);
+     return info;
+   };
+ 
+   this.addTokens = function(value, type)
+   {
+     var tokens = value.split("\n");
+     var lastState = "start";
+     for(var i in tokens)
+     {
+       if(i > 0) {
+         info.lines.push([]);
+         info.states.push(lastState);
+       }
+       var value = tokens[i];
+       var linesLength = info.lines.length - 1;
+       var linesIdx = info.lines[linesLength];
+       linesIdx.push({ value: value, type: type });
+       lastState = states.indexOf(type) != -1 ? type : "start"; 
+     }
+   };
+
+   this.getNodeValue = function(node)
+   {
+     return source.substring(node.begin, node.end);
+   };
+   
+   this.DirPIConstructor = function(node)
+   {
+     var value = this.getNodeValue(node);
+     this.addTokens(value, "xml_pe");
+     return true;
+   };
+
+   this.DirElemConstructor = function(node)
+   {
+     for(var i in node.children)
+     {
+       var child = node.children[i];
+       if(child.name === "TOKEN" || child.name === "QName") {
+         var value = this.getNodeValue(child);
+         this.addTokens(value, "meta.tag");
+       } else {
+         this.visit(child);
+       }
+     }
+     return true; 
+   };
+   
+   this.DirAttributeList = function(node)
+   {
+     for(var i in node.children)
+     {
+       var child = node.children[i];
+       if(child.name === "QName") {
+         var value = this.getNodeValue(child);
+         this.addTokens(value, "meta.tag");
+       } else {
+         this.visit(child);
+       }
+     }
+     return true; 
+   };
+
+   this.DirAttributeValue =  function(node)
+   {
+     for(var i in node.children)
+     {
+       var child = node.children[i];
+       if(child.name === "TOKEN") {
+         var value = this.getNodeValue(child);
+         this.addTokens(value, "string");
+       } else {
+         this.visit(child);
+       }
+     }
+     return true; 
+   };
+
+   this.QuotAttrContentChar = function(node)
+   {
+     var value = this.getNodeValue(node);
+     this.addTokens(value, "string");
+     return true;
+   };
+
+   this.StringConcatExpr = function(node)
+   {
+     for(var i in node.children) {
+       var child = node.children[i];
+       if(child.name === "TOKEN") {
+         var value = this.getNodeValue(child);
+         this.addTokens(value, "keyword.operator");
+       } else {
+         this.visit(child);
+       }
+     }
+     return true;
+   };
+
+   this.AdditiveExpr = function(node)
+   {
+     for(var i in node.children) {
+       var child = node.children[i];
+       if(child.name === "TOKEN") {
+         var value = this.getNodeValue(child);
+         this.addTokens(value, "keyword.operator");
+       } else {
+         this.visit(child);
+       }
+     }
+     return true;
+   };
+
+   this.MultiplicativeExpr = function(node)
+   {
+     for(var i in node.children) {
+       var child = node.children[i];
+       if(child.name === "TOKEN") {
+         var value = this.getNodeValue(child);
+         this.addTokens(value, "keyword.operator");
+       } else {
+         this.visit(child);
+       }
+     }
+     return true;
+   };
+
+   this.UnaryExpr = function(node)
+   {
+     for(var i in node.children) {
+       var child = node.children[i];
+       if(child.name === "TOKEN") {
+         var value = this.getNodeValue(child);
+         this.addTokens(value, "keyword.operator");
+       } else {
+         this.visit(child);
+       }
+     }
+     return true;
+   };
+   
+   this.GeneralComp = function(node)
+   {
+     for(var i in node.children) {
+       var child = node.children[i];
+       if(child.name === "TOKEN") {
+         var value = this.getNodeValue(child);
+         this.addTokens(value, "keyword.operator");
+       } else {
+         this.visit(child);
+       }
+     }
+     return true;
+   };
+
+   this.NumericLiteral = function(node)
+   {
+     for(var i in node.children) {
+       var child = node.children[i];
+       if(child.name != "TEXT") {
+         var value = this.getNodeValue(child);
+         this.addTokens(value, "constant");
+       } else {
+         this.visit(child);
+       }
+     }return true;
+   }
+ 
+   this.DirCommentConstructor = function(node)
+   {
+     for(var i in node.children) {
+       var child = node.children[i];
+       if(child.name != "TEXT") {
+         var value = this.getNodeValue(child);
+         this.addTokens(value, "comment");
+       } else {
+         this.visit(child);
+       }
+     }return true;
+   }
+     
+   this.Comment = function(node)
+   {
+     return true;
+   };
+
+   this.URILiteral = function(node)
+   {
+     var value = this.getNodeValue(node);
+     this.addTokens(value, "string");
+     return true;
+   };
+
+   this.StringLiteral = function(node)
+   {
+     var value = this.getNodeValue(node);
+     this.addTokens(value, "string");
+     return true;
+   };
+
+   this.EQName = function(node)
+   {
+     var value = this.getNodeValue(node);
+     this.addTokens(value, "support.function");
+     return true;
+   };
+
+   this.TOKEN = function(node)
+   {
+     var value = this.getNodeValue(node);
+     if(keywords.indexOf(value) > -1 ) {
+       this.addTokens(value, "keyword");
+     } else if(value === "$") {
+       
+     } else {
+       this.addTokens(value, "text");
+     }
+     return true;
+   };
+   
+   this.WS = function(node) {
+     var value = this.getNodeValue(node);
+     var openingIdx = value.indexOf("(:"); 
+     while(openingIdx > -1) { 
+       var text = value.substring(0, openingIdx); 
+       this.addTokens(text, "text"); 
+       var closingIdx = value.substring(openingIdx).indexOf(":)") + 3; 
+       var comment = value.substring(openingIdx, closingIdx); 
+       this.addTokens(comment, "comment"); 
+       value = value.substring(closingIdx); 
+       openingIdx = value.indexOf("(:"); 
+     } 
+     this.addTokens(value, "text");
+   };
+
+   this.EverythingElse = function(node)
+   {
+     if(node.children.length === 0) {
+       var value = this.getNodeValue(node);
+       this.addTokens(value, "text");
+       return true;
+     }
+     return false;
+   };
+
+   this.visit = function(node){
+     var name = node.name;
+     var skip = false;
+     
+     if(typeof this[name] === "function")
+       skip = this[name](node) === true ? true : false ;
+     else
+       skip = this.EverythingElse(node) === true ? true : false;
+     
+     if(!skip && typeof node.children === "object")
+     {
+       var isVarEQName = false;
+       for(var i = 0; i < node.children.length; i++)
+       {
+         var child = node.children[i];
+         var value = this.getNodeValue(child);
+         if(child.name === "TOKEN" && value === "$")
+         {
+           isVarEQName = true;
+         } else if(isVarEQName) {
+           this.addTokens("$" + value, "variable"); 
+           isVarEQName = false;
+         } else {
+           this.visit(child);
+         }
+       }
+     } 
+   };
+};
+
+});

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/mode/xquery_highlight_rules.js

@@ -1,52 +1,44 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ * Distributed under the BSD license:
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      William Candillon <wcandillon AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Copyright (c) 2010, 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.
  *
  * ***** END LICENSE BLOCK ***** */
 define(function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
-var lang = require("../lib/lang");
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 
 var XQueryHighlightRules = function() {
 
-  var keywords = lang.arrayToMap(
-    ("after|ancestor|ancestor-or-self|and|as|ascending|attribute|before|case|cast|castable|child|collation|comment|copy|count|declare|default|delete|descendant|descendant-or-self|descending|div|document|document-node|element|else|empty|empty-sequence|end|eq|every|except|first|following|following-sibling|for|function|ge|group|gt|idiv|if|import|insert|instance|intersect|into|is|item|last|le|let|lt|mod|modify|module|namespace|namespace-node|ne|node|only|or|order|ordered|parent|preceding|preceding-sibling|processing-instruction|rename|replace|return|satisfies|schema-attribute|schema-element|self|some|stable|start|switch|text|to|treat|try|typeswitch|union|unordered|validate|where|with|xquery|contains|paragraphs|sentences|times|words|by|collectionreturn|variable|version|option|when|encoding|toswitch|catch|tumbling|sliding|window|at|using|stemming|collection|schema|while|on|nodes|index|external|then|in|updating|value|of|containsbreak|loop|continue|exit|returning").split("|")
-    );
-    
+    var keywordMapper = this.createKeywordMapper({
+        keyword: "after|ancestor|ancestor-or-self|and|as|ascending|attribute|before|case|cast|castable|child|collation|comment|copy|count|declare|default|delete|descendant|descendant-or-self|descending|div|document|document-node|element|else|empty|empty-sequence|end|eq|every|except|first|following|following-sibling|for|function|ge|group|gt|idiv|if|import|insert|instance|intersect|into|is|item|last|le|let|lt|mod|modify|module|namespace|namespace-node|ne|node|only|or|order|ordered|parent|preceding|preceding-sibling|processing-instruction|rename|replace|return|satisfies|schema-attribute|schema-element|self|some|stable|start|switch|text|to|treat|try|typeswitch|union|unordered|validate|where|with|xquery|contains|paragraphs|sentences|times|words|by|collectionreturn|variable|version|option|when|encoding|toswitch|catch|tumbling|sliding|window|at|using|stemming|collection|schema|while|on|nodes|index|external|then|in|updating|value|of|containsbreak|loop|continue|exit|returning|append|json|position"
+    }, "identifier");
+
     // regexp must not have capturing parentheses
     // regexps are ordered -> the first match is used
 
@@ -56,7 +48,7 @@ var XQueryHighlightRules = function() {
             regex : "<\\!\\[CDATA\\[",
             next : "cdata"
         }, {
-            token : "xml_pe",
+            token : "xml-pe",
             regex : "<\\?.*?\\?>"
         }, {
             token : "comment",
@@ -89,12 +81,7 @@ var XQueryHighlightRules = function() {
             token: "support.function",
             regex: "\\w[\\w+_\\-:]+(?=\\()"
         }, {
-      token : function(value) {
-            if (keywords[value])
-                return "keyword";
-            else
-                return "identifier";
-      },
+      token : keywordMapper,
       regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
     }, {
             token: "keyword.operator",

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/mode/xquery_worker.js

@@ -1,37 +1,30 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ * Distributed under the BSD license:
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      William Candillon <wcandillon AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Copyright (c) 2010, 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.
  *
  * ***** END LICENSE BLOCK ***** */
  
@@ -40,12 +33,9 @@ define(function(require, exports, module) {
     
 var oop = require("../lib/oop");
 var Mirror = require("../worker/mirror").Mirror;
-var xquery = require("../mode/xquery/xquery");
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
-
-window.addEventListener = function() {};
-
+var JSONParseTreeHandler  = require("./xquery/JSONParseTreeHandler").JSONParseTreeHandler;
+var XQueryParser  = require("./xquery/XQueryParser").XQueryParser;
+var SyntaxHighlighter = require("../mode/xquery/visitors/SyntaxHighlighter").SyntaxHighlighter;
 
 var XQueryWorker = exports.XQueryWorker = function(sender) {
     Mirror.call(this, sender);
@@ -59,26 +49,27 @@ oop.inherits(XQueryWorker, Mirror);
   this.onUpdate = function() {
     this.sender.emit("start");
     var value = this.doc.getValue();    
-    var parser = xquery.getParser(value);
-    var ast = parser.p_Module();
-    if(parser.hasErrors()) {
-		  var errors = parser.getErrors();
-	    var i = 0;
-      for(i in errors) {
-	      var error = errors[i];
-	      this.sender.emit("error", {
-	        row: error.line,
-          column: error.column,
-	        text: error.message,
-	        type: "error"
-       });
-      }	
-    } else {
-     this.sender.emit("ok");
+    var h = new JSONParseTreeHandler();
+    var parser = new XQueryParser(value, h);
+    try {
+      parser.parse_XQuery();
+      var ast = h.getParseTree();
+      this.sender.emit("ok");
+      var highlighter = new SyntaxHighlighter(value, ast);
+      var tokens = highlighter.getTokens();
+      this.sender.emit("highlight", tokens);
+    } catch(e) {
+      var prefix = value.substring(0, e.getBegin());
+      var line = prefix.split("\n").length;
+      var column = e.getBegin() - prefix.lastIndexOf("\n");
+      var message = parser.getErrorMessage(e);
+      this.sender.emit("error", {
+        row: line - 1,
+        column: column,
+        text: message,
+        type: "error"
+      });
     }
-    parser.highlighter.tokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
-    var tokens = parser.highlighter.getTokens();
-    this.sender.emit("highlight", tokens);
   };
     
 }).call(XQueryWorker.prototype);