From f79c2d8ce29a7d599213a7df8337037c6ac8cfe5 Mon Sep 17 00:00:00 2001 From: okonomiyaki3000 Date: Wed, 21 Dec 2011 17:16:37 +0900 Subject: [PATCH 1/2] replace and replaceAll will return the number of items replaced --- lib/ace/editor.js | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/ace/editor.js b/lib/ace/editor.js index 0ae8f9ad..4f6d7e72 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -1093,13 +1093,18 @@ var Editor = function(renderer, session) { if (options) this.$search.set(options); - var range = this.$search.find(this.session); + var range = this.$search.find(this.session), + replaced = 0; if (!range) - return; + return replaced; - this.$tryReplace(range, replacement); + if(this.$tryReplace(range, replacement)) { + replaced = 1; + } if (range !== null) this.selection.setSelectionRange(range); + + return replaced; }; this.replaceAll = function(replacement, options) { @@ -1107,20 +1112,26 @@ var Editor = function(renderer, session) { this.$search.set(options); } - var ranges = this.$search.findAll(this.session); + var ranges = this.$search.findAll(this.session), + replaced = 0; if (!ranges.length) - return; + return replaced; var selection = this.getSelectionRange(); this.clearSelection(); this.selection.moveCursorTo(0, 0); this.$blockScrolling += 1; - for (var i = ranges.length - 1; i >= 0; --i) - this.$tryReplace(ranges[i], replacement); + for (var i = ranges.length - 1; i >= 0; --i) { + if(this.$tryReplace(ranges[i], replacement)) { + replaced++; + } + } this.selection.setSelectionRange(selection); this.$blockScrolling -= 1; + + return replaced; }; this.$tryReplace = function(range, replacement) { From 68a812c69d8e72f28167698e4ce95f6e1fae7c40 Mon Sep 17 00:00:00 2001 From: okonomiyaki3000 Date: Wed, 21 Dec 2011 22:11:46 +0900 Subject: [PATCH 2/2] each new variable gets its own 'var' statement. --- lib/ace/editor.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ace/editor.js b/lib/ace/editor.js index 4f6d7e72..fad00d36 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -1093,8 +1093,8 @@ var Editor = function(renderer, session) { if (options) this.$search.set(options); - var range = this.$search.find(this.session), - replaced = 0; + var range = this.$search.find(this.session); + var replaced = 0; if (!range) return replaced; @@ -1112,8 +1112,8 @@ var Editor = function(renderer, session) { this.$search.set(options); } - var ranges = this.$search.findAll(this.session), - replaced = 0; + var ranges = this.$search.findAll(this.session); + var replaced = 0; if (!ranges.length) return replaced;