Minor improvements on the syntax highlighter.

lib/ace/mode/xquery/visitors/SyntaxHighlighter.js

@@ -1,3 +1,33 @@
+/* ***** 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)
@@ -5,7 +35,6 @@ 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: [] };
-//   var inName = false;
 
    this.getTokens = function() {
      this.visit(tree);
@@ -94,27 +123,6 @@ var SyntaxHighlighter = exports.SyntaxHighlighter = function(source, tree)
      return true;
    };
 
-   //this.EQName = function(node)
-   //{
-   //  var value = source.substring(node.begin, node.end);
-   //  this.addTokens(value, "support.function");
-   //  return true;
-   //};
-   
-   //this.FunctionName = function(node)
-   //{
-   //  for(var i in node.children) {
-   //    var child = node.children[i];
-   //    if(child.children[0] && (child.name === "EQName" || child.name === "TOKEN")) {
-   //      var value = this.getNodeValue(child.children[0]);
-   //      this.addTokens(value, "support.function");
-   //    } else {
-   //      this.visit(child);
-   //    }
-   //  }
-   //  return true;
-   //};
-
    this.StringConcatExpr = function(node)
    {
      for(var i in node.children) {
@@ -230,37 +238,17 @@ var SyntaxHighlighter = exports.SyntaxHighlighter = function(source, tree)
      return true;
    };
 
-//   this.NCName = function(node)
-//   {
-//     inName = true;
-//     for(var i in node.children)
-//     {
-//       var child = node.children[i];
-//       this.visit(child);
-//     }
-//     inName = false;
-//     return true;
-//   };
-
    this.EQName = function(node)
    {
      var value = this.getNodeValue(node);
      this.addTokens(value, "support.function");
-     //inName = true;
-     //for(var i in node.children)
-     //{
-     //  var child = node.children[i];
-     //  this.visit(child);
-     //}
-     //inName = false;
-     
      return true;
    };
 
    this.TOKEN = function(node)
    {
      var value = this.getNodeValue(node);
-     if(keywords.indexOf(value) > -1 ) {//&& !inName) {
+     if(keywords.indexOf(value) > -1 ) {
        this.addTokens(value, "keyword");
      } else if(value === "$") {