From b4628d450fd39083902af27dc9d5bb0250a0c116 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 9 Sep 2013 18:57:28 +0400 Subject: [PATCH] use lazy getTokenizer in getNextLineIndent --- lib/ace/mode/c_cpp.js | 2 +- lib/ace/mode/clojure.js | 2 +- lib/ace/mode/coffee.js | 2 +- lib/ace/mode/csharp.js | 2 +- lib/ace/mode/css.js | 2 +- lib/ace/mode/dot.js | 2 +- lib/ace/mode/golang.js | 2 +- lib/ace/mode/haxe.js | 2 +- lib/ace/mode/javascript.js | 2 +- lib/ace/mode/jsx.js | 2 +- lib/ace/mode/less.js | 2 +- lib/ace/mode/liquid.js | 2 +- lib/ace/mode/logiql.js | 2 +- lib/ace/mode/lsl.js | 2 +- lib/ace/mode/lua.js | 6 +++--- lib/ace/mode/mushcode.js | 4 ++-- lib/ace/mode/ocaml.js | 2 +- lib/ace/mode/perl.js | 2 +- lib/ace/mode/php.js | 2 +- lib/ace/mode/powershell.js | 2 +- lib/ace/mode/python.js | 4 ++-- lib/ace/mode/ruby.js | 2 +- lib/ace/mode/scad.js | 2 +- lib/ace/mode/scss.js | 2 +- lib/ace/mode/sh.js | 4 ++-- lib/ace/mode/tcl.js | 2 +- lib/ace/mode/twig.js | 2 +- 27 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lib/ace/mode/c_cpp.js b/lib/ace/mode/c_cpp.js index cb62292f..08ccf0bb 100644 --- a/lib/ace/mode/c_cpp.js +++ b/lib/ace/mode/c_cpp.js @@ -58,7 +58,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; var endState = tokenizedLine.state; diff --git a/lib/ace/mode/clojure.js b/lib/ace/mode/clojure.js index 38a6c4f1..71f842e7 100644 --- a/lib/ace/mode/clojure.js +++ b/lib/ace/mode/clojure.js @@ -51,7 +51,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { diff --git a/lib/ace/mode/coffee.js b/lib/ace/mode/coffee.js index 02b018bd..72ed0960 100644 --- a/lib/ace/mode/coffee.js +++ b/lib/ace/mode/coffee.js @@ -57,7 +57,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokens = this.$tokenizer.getLineTokens(line, state).tokens; + var tokens = this.getTokenizer().getLineTokens(line, state).tokens; if (!(tokens.length && tokens[tokens.length - 1].type === 'comment') && state === 'start' && indenter.test(line)) diff --git a/lib/ace/mode/csharp.js b/lib/ace/mode/csharp.js index 94629f3d..a6911c6f 100644 --- a/lib/ace/mode/csharp.js +++ b/lib/ace/mode/csharp.js @@ -25,7 +25,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { diff --git a/lib/ace/mode/css.js b/lib/ace/mode/css.js index 0ee16e75..9a4234c6 100644 --- a/lib/ace/mode/css.js +++ b/lib/ace/mode/css.js @@ -57,7 +57,7 @@ oop.inherits(Mode, TextMode); var indent = this.$getIndent(line); // ignore braces in comments - var tokens = this.$tokenizer.getLineTokens(line, state).tokens; + var tokens = this.getTokenizer().getLineTokens(line, state).tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { return indent; } diff --git a/lib/ace/mode/dot.js b/lib/ace/mode/dot.js index 0f443b10..116b2d27 100644 --- a/lib/ace/mode/dot.js +++ b/lib/ace/mode/dot.js @@ -23,7 +23,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; var endState = tokenizedLine.state; diff --git a/lib/ace/mode/golang.js b/lib/ace/mode/golang.js index c5d1ace0..62b68755 100644 --- a/lib/ace/mode/golang.js +++ b/lib/ace/mode/golang.js @@ -23,7 +23,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; var endState = tokenizedLine.state; diff --git a/lib/ace/mode/haxe.js b/lib/ace/mode/haxe.js index 2ae10d0e..138df420 100644 --- a/lib/ace/mode/haxe.js +++ b/lib/ace/mode/haxe.js @@ -25,7 +25,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { diff --git a/lib/ace/mode/javascript.js b/lib/ace/mode/javascript.js index c0e7ae3d..7bfce443 100644 --- a/lib/ace/mode/javascript.js +++ b/lib/ace/mode/javascript.js @@ -58,7 +58,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; var endState = tokenizedLine.state; diff --git a/lib/ace/mode/jsx.js b/lib/ace/mode/jsx.js index 2131b23f..999a9777 100644 --- a/lib/ace/mode/jsx.js +++ b/lib/ace/mode/jsx.js @@ -25,7 +25,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { diff --git a/lib/ace/mode/less.js b/lib/ace/mode/less.js index bde7a18e..ac40a0a6 100644 --- a/lib/ace/mode/less.js +++ b/lib/ace/mode/less.js @@ -56,7 +56,7 @@ oop.inherits(Mode, TextMode); var indent = this.$getIndent(line); // ignore braces in comments - var tokens = this.$tokenizer.getLineTokens(line, state).tokens; + var tokens = this.getTokenizer().getLineTokens(line, state).tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { return indent; } diff --git a/lib/ace/mode/liquid.js b/lib/ace/mode/liquid.js index 41322d27..490be895 100644 --- a/lib/ace/mode/liquid.js +++ b/lib/ace/mode/liquid.js @@ -50,7 +50,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; var endState = tokenizedLine.state; diff --git a/lib/ace/mode/logiql.js b/lib/ace/mode/logiql.js index 2fdaf5b3..5abf7c83 100644 --- a/lib/ace/mode/logiql.js +++ b/lib/ace/mode/logiql.js @@ -56,7 +56,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; var endState = tokenizedLine.state; if (/comment|string/.test(endState)) diff --git a/lib/ace/mode/lsl.js b/lib/ace/mode/lsl.js index b2dcb991..49ecd534 100644 --- a/lib/ace/mode/lsl.js +++ b/lib/ace/mode/lsl.js @@ -60,7 +60,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; var endState = tokenizedLine.state; diff --git a/lib/ace/mode/lua.js b/lib/ace/mode/lua.js index 3beae941..92468242 100644 --- a/lib/ace/mode/lua.js +++ b/lib/ace/mode/lua.js @@ -99,7 +99,7 @@ oop.inherits(Mode, TextMode); var indent = this.$getIndent(line); var level = 0; - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (state == "start") { @@ -123,7 +123,7 @@ oop.inherits(Mode, TextMode); if (line.match(/^\s*[\)\}\]]$/)) return true; - var tokens = this.$tokenizer.getLineTokens(line.trim(), state).tokens; + var tokens = this.getTokenizer().getLineTokens(line.trim(), state).tokens; if (!tokens || !tokens.length) return false; @@ -134,7 +134,7 @@ oop.inherits(Mode, TextMode); this.autoOutdent = function(state, session, row) { var prevLine = session.getLine(row - 1); var prevIndent = this.$getIndent(prevLine).length; - var prevTokens = this.$tokenizer.getLineTokens(prevLine, "start").tokens; + var prevTokens = this.getTokenizer().getLineTokens(prevLine, "start").tokens; var tabLength = session.getTabString().length; var expectedIndent = prevIndent + tabLength * getNetIndentLevel(prevTokens); var curIndent = this.$getIndent(session.getLine(row)).length; diff --git a/lib/ace/mode/mushcode.js b/lib/ace/mode/mushcode.js index 1a30717b..bdaeeb4e 100644 --- a/lib/ace/mode/mushcode.js +++ b/lib/ace/mode/mushcode.js @@ -51,7 +51,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { @@ -80,7 +80,7 @@ oop.inherits(Mode, TextMode); if (input !== "\r\n" && input !== "\r" && input !== "\n") return false; - var tokens = this.$tokenizer.getLineTokens(line.trim(), state).tokens; + var tokens = this.getTokenizer().getLineTokens(line.trim(), state).tokens; if (!tokens) return false; diff --git a/lib/ace/mode/ocaml.js b/lib/ace/mode/ocaml.js index ae369625..1f69977a 100644 --- a/lib/ace/mode/ocaml.js +++ b/lib/ace/mode/ocaml.js @@ -74,7 +74,7 @@ var indenter = /(?:[({[=:]|[-=]>|\b(?:else|try|with))\s*$/; this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokens = this.$tokenizer.getLineTokens(line, state).tokens; + var tokens = this.getTokenizer().getLineTokens(line, state).tokens; if (!(tokens.length && tokens[tokens.length - 1].type === 'comment') && state === 'start' && indenter.test(line)) diff --git a/lib/ace/mode/perl.js b/lib/ace/mode/perl.js index 4a48a52e..e8d930bc 100644 --- a/lib/ace/mode/perl.js +++ b/lib/ace/mode/perl.js @@ -59,7 +59,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { diff --git a/lib/ace/mode/php.js b/lib/ace/mode/php.js index 6b770a9e..18aecb66 100644 --- a/lib/ace/mode/php.js +++ b/lib/ace/mode/php.js @@ -76,7 +76,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; var endState = tokenizedLine.state; diff --git a/lib/ace/mode/powershell.js b/lib/ace/mode/powershell.js index 7dc778aa..8cc55684 100644 --- a/lib/ace/mode/powershell.js +++ b/lib/ace/mode/powershell.js @@ -25,7 +25,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { diff --git a/lib/ace/mode/python.js b/lib/ace/mode/python.js index bcd22920..d561c084 100644 --- a/lib/ace/mode/python.js +++ b/lib/ace/mode/python.js @@ -51,7 +51,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { @@ -80,7 +80,7 @@ oop.inherits(Mode, TextMode); if (input !== "\r\n" && input !== "\r" && input !== "\n") return false; - var tokens = this.$tokenizer.getLineTokens(line.trim(), state).tokens; + var tokens = this.getTokenizer().getLineTokens(line.trim(), state).tokens; if (!tokens) return false; diff --git a/lib/ace/mode/ruby.js b/lib/ace/mode/ruby.js index adb3c96a..7d14bb57 100644 --- a/lib/ace/mode/ruby.js +++ b/lib/ace/mode/ruby.js @@ -54,7 +54,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { diff --git a/lib/ace/mode/scad.js b/lib/ace/mode/scad.js index 3860f5af..ca8dc959 100644 --- a/lib/ace/mode/scad.js +++ b/lib/ace/mode/scad.js @@ -56,7 +56,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; var endState = tokenizedLine.state; diff --git a/lib/ace/mode/scss.js b/lib/ace/mode/scss.js index 599bdd8d..111f71aa 100644 --- a/lib/ace/mode/scss.js +++ b/lib/ace/mode/scss.js @@ -56,7 +56,7 @@ oop.inherits(Mode, TextMode); var indent = this.$getIndent(line); // ignore braces in comments - var tokens = this.$tokenizer.getLineTokens(line, state).tokens; + var tokens = this.getTokenizer().getLineTokens(line, state).tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { return indent; } diff --git a/lib/ace/mode/sh.js b/lib/ace/mode/sh.js index 32c7e75e..c66c2619 100644 --- a/lib/ace/mode/sh.js +++ b/lib/ace/mode/sh.js @@ -50,7 +50,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { @@ -79,7 +79,7 @@ oop.inherits(Mode, TextMode); if (input !== "\r\n" && input !== "\r" && input !== "\n") return false; - var tokens = this.$tokenizer.getLineTokens(line.trim(), state).tokens; + var tokens = this.getTokenizer().getLineTokens(line.trim(), state).tokens; if (!tokens) return false; diff --git a/lib/ace/mode/tcl.js b/lib/ace/mode/tcl.js index 4dcac180..c8e7c436 100644 --- a/lib/ace/mode/tcl.js +++ b/lib/ace/mode/tcl.js @@ -53,7 +53,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { diff --git a/lib/ace/mode/twig.js b/lib/ace/mode/twig.js index fc314394..06e4faa1 100644 --- a/lib/ace/mode/twig.js +++ b/lib/ace/mode/twig.js @@ -61,7 +61,7 @@ oop.inherits(Mode, TextMode); this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); var tokens = tokenizedLine.tokens; var endState = tokenizedLine.state;