Bug 373955 - Find next/previous occurrence is broken

max-li · Mar 12, 2012 · e572302 · e572302
1 parent e32c4a0
commit e572302
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/searchAndReplace/textSearcher.js b/bundles/org.eclipse.orion.client.core/web/orion/searchAndReplace/textSearcher.js
@@ -403,7 +403,7 @@ orion.TextSearcher = (function() {
 
 			if(this.visible()){
 				return this.findOnce(searchStr ? searchStr : findTextDiv.value, startPos, (focusBackDiv && !dojo.isIE) ? function(){focusBackDiv.focus();} : null);
-			} else if(this._lastSearchString && this._lastSearchString.length > 0){
+			} else if(searchStr || (this._lastSearchString && this._lastSearchString.length > 0)){
 				var retVal = this._prepareFind(searchStr ? searchStr : this._lastSearchString, startPos);
 				return this._doFind(retVal.text, retVal.searchStr, retVal.startIndex, !next, this._wrapSearch);
 			}

diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/editorFeatures.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/editorFeatures.js
@@ -165,7 +165,12 @@ function(messages, mUndoStack, mKeyBinding, mRulers, mAnnotations, mTextDND, mRe
 			this.textView.setKeyBinding(new mKeyBinding.KeyBinding("k", true), messages.findNext);
 			this.textView.setAction(messages.findNext, function() {
 				if (this._searcher){
-					this._searcher.findNext(true);
+					var selection = this.textView.getSelection();
+					if(selection.start < selection.end) {
+						this._searcher.findNext(true, this.textView.getText(selection.start, selection.end));
+					} else {
+						this._searcher.findNext(true);
+					}
 					return true;
 				}
 				return false;
@@ -174,7 +179,12 @@ function(messages, mUndoStack, mKeyBinding, mRulers, mAnnotations, mTextDND, mRe
 			this.textView.setKeyBinding(new mKeyBinding.KeyBinding("k", true, true), messages.findPrevious);
 			this.textView.setAction(messages.findPrevious, function() {
 				if (this._searcher){
-					this._searcher.findNext(false);
+					var selection = this.textView.getSelection();
+					if(selection.start < selection.end) {
+						this._searcher.findNext(false, this.textView.getText(selection.start, selection.end));
+					} else {
+						this._searcher.findNext(false);
+					}
 					return true;
 				}
 				return false;