allow Ctrl-O + enter filename with line number (captured from log or exception trace) - to go straight to the line

andrey012 · andrey012 · commit 9f408abb349f · 2015-02-20T23:49:02.000+03:00
diff --git a/lang/english.php b/lang/english.php
@@ -252,7 +252,7 @@
 		"Creating Folder"		=> "Creating Folder",
 		"Sorry you can..."		=> "Sorry, you can only have 100 files open at a time!",
 		"Opening File"			=> "Opening File",
-		"Enter relative file..."	=> "Enter relative file path (prefixed with /) or remote URL",
+		"Enter relative file..."	=> "Enter relative file path (prefixed with /) or remote URL\\nYou can enter \\n'/path/file:123' or \\n'/path/file(123)' or \\n'/path/file.ext line 123' \\nto go directly to particular line",
 		"Getting"			=> "Getting",
 		"Please enter the..."		=> "Please enter the new name for",
 		"Renaming to"			=> "Renaming to",
diff --git a/lib/file-control.php b/lib/file-control.php
@@ -1,4 +1,4 @@
-﻿<?php
+<?php
 include("headers.php");
 include("settings.php");
 $t = $text['file-control'];
@@ -68,7 +68,7 @@
 // If we're due to open a file...
 if ($_GET['action']=="load") {
 	echo 'action="load";';
-
+	$lineNumber = max(isset($_REQUEST['lineNumber'])?intval($_REQUEST['lineNumber']):1, 1);
 	if (file_exists($file)) {
 		$finfo = "text";
 		// Determine what to do based on mime type
@@ -173,6 +173,7 @@
 					top.ICEcoder.content.contentWindow.CodeMirror.doFold(cM.getLine(i).indexOf("{")>-1?"brace":"xml",null,"+","-",true)(cM, i);
 				}
 				top.ICEcoder.loadingFile = false;
+				top.ICEcoder.goToLine(<?php echo $lineNumber; ?>);
 			<?php
 			;};
 			?>
diff --git a/lib/ice-coder.js b/lib/ice-coder.js
@@ -1151,6 +1151,22 @@ var ICEcoder = {
 	// Open a file
 	openFile: function(fileLink) {
 		var shortURL, canOpenFile;
+		var line = 1;
+		if ("undefined" != typeof fileLink) {
+			var re = /^(.*)\s+line\s+(\d+)/;
+			var reMatch = re.exec(fileLink);
+			if (null !== reMatch)
+			{
+				line = reMatch[2];
+				fileLink = reMatch[1];
+			} else if (fileLink.indexOf(':') > 0){
+				line = fileLink.split(':')[1];
+				fileLink = fileLink.split(':')[0];
+			} else if ((fileLink.indexOf('(') > 0) && (fileLink.indexOf(')') > 0)){
+				line = fileLink.split('(')[1].split(')')[0];
+				fileLink = fileLink.split('(')[0];
+			}
+		}
 
 		if (fileLink) {
 			top.ICEcoder.thisFileFolderLink=fileLink;
@@ -1176,7 +1192,7 @@ var ICEcoder = {
 
 				if (shortURL!="/[NEW]") {
 					top.ICEcoder.thisFileFolderLink = top.ICEcoder.thisFileFolderLink.replace(/\//g,"|");
-					top.ICEcoder.serverQueue("add","lib/file-control.php?action=load&file="+top.ICEcoder.thisFileFolderLink+"&csrf="+top.ICEcoder.csrf);
+					top.ICEcoder.serverQueue("add","lib/file-control.php?action=load&file="+top.ICEcoder.thisFileFolderLink+"&csrf="+top.ICEcoder.csrf+"&lineNumber="+line);
 					top.ICEcoder.serverMessage('<b>'+top.t['Opening File']+'</b><br>'+top.ICEcoder.shortURL);
 				} else {
 					top.ICEcoder.createNewTab('new');
@@ -3133,7 +3149,13 @@ var ICEcoder = {
 
 			// CTRL/Cmd+G (Go to line)
 			} else if(key==71 && (evt.ctrlKey||top.ICEcoder.cmdKey)) {
-				top.get('goToLineNo').focus();
+				var goToLineInput = top.get('goToLineNo');
+				goToLineInput.select();
+				// this is trick for Chrome - after you have used Ctrl-F once, when
+				// you try using Ctrl-F another time, somewhy Chrome still thinks,
+				// that find has focus and refuses to give it focus second time.
+				top.get('find').focus();
+				goToLineInput.focus();
 	        		return false;
 
 			// CTRL/Cmd+I (Get info)
diff --git a/lib/ice-coder.min.js b/lib/ice-coder.min.js
