From 34f34bb591439b2a95da43cd44dc026c5c7691e3 Mon Sep 17 00:00:00 2001
From: William Candillon <wcandillon@gmail.com>
Date: Tue, 25 Mar 2014 21:42:59 +0100
Subject: [PATCH] Bug fixes

---
 lib/ace/mode/jsoniq.js           |  2 ++
 lib/ace/mode/xquery.js           |  3 ++-
 lib/ace/snippets/xquery.snippets | 35 +++++++++++++++++++++++---------
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/lib/ace/mode/jsoniq.js b/lib/ace/mode/jsoniq.js
index af5714bc..54b671e3 100644
--- a/lib/ace/mode/jsoniq.js
+++ b/lib/ace/mode/jsoniq.js
@@ -32,6 +32,7 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var JSONiqLexer = require("./xquery/jsoniq_lexer").JSONiqLexer;
 var Range = require("../range").Range;
 var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
@@ -42,6 +43,7 @@ var Mode = function() {
     this.$tokenizer   = new JSONiqLexer();
     this.$behaviour   = new XQueryBehaviour();
     this.foldingRules = new CStyleFoldMode();
+    this.$highlightRules = new TextHighlightRules();
 };
 
 oop.inherits(Mode, TextMode);
diff --git a/lib/ace/mode/xquery.js b/lib/ace/mode/xquery.js
index c1f5d3d5..bbc76414 100644
--- a/lib/ace/mode/xquery.js
+++ b/lib/ace/mode/xquery.js
@@ -33,6 +33,7 @@ define(function(require, exports, module) {
 var WorkerClient = require("../worker/worker_client").WorkerClient;
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var XQueryLexer = require("./xquery/xquery_lexer").XQueryLexer;
 var Range = require("../range").Range;
 var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
@@ -43,8 +44,8 @@ var Mode = function() {
     this.$tokenizer   = new XQueryLexer();
     this.$behaviour   = new XQueryBehaviour();
     this.foldingRules = new CStyleFoldMode();
+    this.$highlightRules = new TextHighlightRules();
 };
-
 oop.inherits(Mode, TextMode);
 
 (function() {
diff --git a/lib/ace/snippets/xquery.snippets b/lib/ace/snippets/xquery.snippets
index e01b85b4..1d846bec 100644
--- a/lib/ace/snippets/xquery.snippets
+++ b/lib/ace/snippets/xquery.snippets
@@ -1,31 +1,42 @@
 snippet for
 	for $${1:item} in ${2:expr}
+snippet return
+    return ${1:expr}
 snippet import
 	import module namespace ${1:ns} = "${2:http://www.example.com/}";
 snippet some
-	some $${1:var} in ${2:expr} satisfies ${3:expr}
+	some $${1:varname} in ${2:expr} satisfies ${3:expr}
 snippet every
-	every $${1:var} in ${2:expr} satisfies ${3:expr}
+	every $${1:varname} in ${2:expr} satisfies ${3:expr}
 snippet if
 	if(${1:true}) then ${2:expr} else ${3:true}
 snippet switch
-	switch(${1:"foo"})\n  case ${2:"foo"}\n  return ${3:true}\ndefault return ${4:false}
+	switch(${1:"foo"})
+    case ${2:"foo"}
+    return ${3:true}
+    default return ${4:false}
 snippet try
 	try { ${1:expr} } catch ${2:*} { ${3:expr} }
 snippet tumbling
-	for tumbling window $${1:var} in ${2:expr}\nstart at $${3:start} when ${4:expr}\nend at $${5:end} when ${6:expr}\nreturn ${7:expr}
+	for tumbling window $${1:varname} in ${2:expr}
+    start at $${3:start} when ${4:expr}
+    end at $${5:end} when ${6:expr}
+    return ${7:expr}
 snippet sliding
-	for sliding window $${1:var} in ${2:expr}\nstart at $${3:start} when ${4:expr}\nend at $${5:end} when ${6:expr}\nreturn ${7:expr}
+	for sliding window $${1:varname} in ${2:expr}
+    start at $${3:start} when ${4:expr}
+    end at $${5:end} when ${6:expr}
+    return ${7:expr}
 snippet let
-	let $${1:var} := ${2:expr}
+	let $${1:varname} := ${2:expr}
 snippet group
-	group by $${1:var} := ${2:expr}
+	group by $${1:varname} := ${2:expr}
 snippet order
 	order by ${1:expr} ${2:descending}
 snippet stable
 	stable order by ${1:expr}
 snippet count
-	count $${1:var}
+	count $${1:varname}
 snippet ordered
 	ordered { ${1:expr} }
 snippet unordered
@@ -37,10 +48,14 @@ snippet castable
 snippet cast
 	cast as ${1:atomicType}
 snippet typeswitch
-	typeswitch(${1:expr})\ncase ${2:type}\n  return ${3:expr}\ndefault return ${4:expr}
+	typeswitch(${1:expr})
+    case ${2:type}  return ${3:expr}
+    default return ${4:expr}
 snippet var
 	declare variable $${1:varname} := ${2:expr};
 snippet fn
-	declare function ${1:ns}:${2:name}(){\n  ${3:expr}\n};
+	declare function ${1:ns}:${2:name}(){
+        ${3:expr}
+    };
 snippet module
 	module namespace ${1:ns} = "${2:http://www.example.com}";
\ No newline at end of file