From c214640bb1e381d1cea80cef64a517ce297fbb92 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Sun, 5 May 2013 13:35:38 +0100
Subject: [PATCH] Jump to Definition variations setup

If something is selected and we have an orig cursor pos, set it back to
that. If not, we set the orig cursor pos, define an array of possible
definition matches and attempt to find them one after another in a for
loop, escaping when we do. Altered findReplace function to provide a
return of true or false depending on if anything is found.
---
 lib/ice-coder.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/lib/ice-coder.js b/lib/ice-coder.js
index 9f283f5..f7d32e3 100644
--- a/lib/ice-coder.js
+++ b/lib/ice-coder.js
@@ -412,11 +412,22 @@ var ICEcoder = {
 
 	// Jump to and highlight the function definition current token
 	jumpToDefinition: function() {
-		var cM, tokenString;
+		var cM, tokenString, defVars;
 
 		cM = ICEcoder.getcMInstance();
 		tokenString = cM.getTokenAt(cM.getCursor()).string;
-		top.ICEcoder.findReplace("function "+tokenString,false,true);
+
+		if (cM.somethingSelected() && top.ICEcoder.origCurorPos) {
+			cM.setCursor(top.ICEcoder.origCurorPos);
+		} else {
+			top.ICEcoder.origCurorPos = cM.getCursor();
+			defVars = ["var "+tokenString, "function "+tokenString, tokenString+"=function", tokenString+"=new function", tokenString+":", "def "+tokenString, "class "+tokenString];
+			for (var i=0; i<defVars.length; i++) {
+				if (top.ICEcoder.findReplace(defVars[i],false,true)) {
+					i=defVars.length;
+				}
+			}
+		}
 	},
 
 // ==============
@@ -966,8 +977,10 @@ var ICEcoder = {
 					cM.focus();
 					top.ICEcoder.findMode = true;
 				}
+				return true;
 			} else {
 				results.innerHTML = "No results";
+				return false;
 			}
 		} else {
 			// Show the relevant multiple results popup