From cbd66efbf3454b808bc547451871ad719d45d9f1 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Thu, 3 Apr 2014 14:16:15 +0200 Subject: [PATCH] Bug fix --- lib/ace/mode/xquery/xqlint.js | 11 ++++++++--- lib/ace/mode/xquery_worker.js | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/ace/mode/xquery/xqlint.js b/lib/ace/mode/xquery/xqlint.js index 954e53e4..3b924890 100644 --- a/lib/ace/mode/xquery/xqlint.js +++ b/lib/ace/mode/xquery/xqlint.js @@ -78653,8 +78653,14 @@ exports.TreeOps = { }, {}], 11:[function(_dereq_,module,exports){ +'use strict'; + +var createStaticContext = exports.createStaticContext = function(){ + var StaticContext = _dereq_('./compiler/static_context').StaticContext; + return new StaticContext(); +}; + exports.XQLint = function (source, opts) { - 'use strict'; opts = opts ? opts : {}; @@ -78663,7 +78669,6 @@ exports.XQLint = function (source, opts) { var JSONParseTreeHandler = _dereq_('./parsers/JSONParseTreeHandler').JSONParseTreeHandler; var Translator = _dereq_('./compiler/translator').Translator; var StyleChecker = _dereq_('./formatter/style_checker').StyleChecker; - var StaticContext = _dereq_('./compiler/static_context').StaticContext; var completer = _dereq_('../lib/completion/completer'); var defaults = function(current, def){ @@ -78735,7 +78740,7 @@ exports.XQLint = function (source, opts) { return pos; }; - var sctx = opts.staticContext ? opts.staticContext : new StaticContext(); + var sctx = opts.staticContext ? opts.staticContext : createStaticContext(); var file = opts.fileName ? opts.fileName : ''; var isJSONiq = ((file.substring(file.length - '.jq'.length).indexOf('.jq') !== -1) && source.indexOf('xquery version') !== 0) || source.indexOf('jsoniq version') === 0; var h = new JSONParseTreeHandler(source); diff --git a/lib/ace/mode/xquery_worker.js b/lib/ace/mode/xquery_worker.js index a61a8a56..09259ddb 100644 --- a/lib/ace/mode/xquery_worker.js +++ b/lib/ace/mode/xquery_worker.js @@ -33,15 +33,15 @@ define(function(require, exports, module) { var oop = require("../lib/oop"); var Mirror = require("../worker/mirror").Mirror; -var XQLint = require("./xquery/xqlint").XQLint; -var StaticContext = require("./xquery/xqlint").StaticContext; +var XQLintLib = require("./xquery/xqlint"); +var XQLint = XQLintLib.XQLint; var XQueryWorker = exports.XQueryWorker = function(sender) { Mirror.call(this, sender); this.setTimeout(200); this.opts = { styleCheck: false, - sctx: new StaticContext() + staticContext: XQLintLib.createStaticContext() }; var that = this;