From e87dfcce7a224e06341779f01d9cf6cf5bb4748c Mon Sep 17 00:00:00 2001
From: William Candillon <wcandillon@gmail.com>
Date: Fri, 4 Apr 2014 12:02:57 +0200
Subject: [PATCH] Minor JSONiq mode refactoring

---
 lib/ace/mode/jsoniq.js        | 13 -------------
 lib/ace/mode/xquery_worker.js | 10 ++++++----
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/lib/ace/mode/jsoniq.js b/lib/ace/mode/jsoniq.js
index 54298949..6f10d2d3 100644
--- a/lib/ace/mode/jsoniq.js
+++ b/lib/ace/mode/jsoniq.js
@@ -129,19 +129,6 @@ oop.inherits(Mode, TextMode);
           that.addMarkers(e.data, session);
         });
  
-        worker.on("highlight", function(tokens) {
-          that.$tokenizer.tokens = tokens.data.tokens;
-          that.$tokenizer.lines  = session.getDocument().getAllLines();
-          
-          var rows = Object.keys(that.$tokenizer.tokens);
-          for(var i=0; i < rows.length; i++) {
-            var row = parseInt(rows[i]);
-            delete session.bgTokenizer.lines[row];
-            delete session.bgTokenizer.states[row];
-            session.bgTokenizer.fireUpdateEvent(row, row);
-          }
-        });
-        
         return worker;
     };
  
diff --git a/lib/ace/mode/xquery_worker.js b/lib/ace/mode/xquery_worker.js
index c857260b..6a8432b3 100644
--- a/lib/ace/mode/xquery_worker.js
+++ b/lib/ace/mode/xquery_worker.js
@@ -72,10 +72,12 @@ var XQueryWorker = exports.XQueryWorker = function(sender) {
     this.moduleResolver = getModuleResolverFromModules(Modules);
     var that = this;
 
-    this.sender.on("complete", function(e){ 
-        var pos = { line: e.data.pos.row, col: e.data.pos.column };
-        var proposals = that.xqlint.getCompletions(pos);
-        that.sender.emit("complete", proposals);
+    this.sender.on("complete", function(e){
+        if(that.xqlint) {
+            var pos = { line: e.data.pos.row, col: e.data.pos.column };
+            var proposals = that.xqlint.getCompletions(pos);
+            that.sender.emit("complete", proposals);
+        }
     });
 
     this.sender.on("setAvailableModuleNamespaces", function(e){