Clean up code

Author: olaws

ScintillaNet_FindReplaceDialog/FindAllResults/FindAllResultsPanel.cs

@@ -17,7 +17,7 @@ public partial class FindAllResultsPanel : UserControl
 
         private List<ScintillaNET_FindReplaceDialog.CharacterRange> _findAllResults;
         private Scintilla _scintilla;
-        private int? _startingLineNumber;
+        private int _startingLineNumber;
 
         #endregion Fields
 
@@ -51,9 +51,9 @@ public Scintilla Scintilla
             {
 	            _scintilla = value;
 
-	            // Get the first line number's margin text
+	            // Is the number margin setup?
 	            if (string.IsNullOrEmpty(_scintilla?.Lines[0].MarginText))
-		            _startingLineNumber = null;
+		            _startingLineNumber = 0;
 	            else
 		            _startingLineNumber = int.Parse(_scintilla.Lines[0].MarginText);
             }
@@ -95,12 +95,9 @@ public void UpdateFindAllResults(FindReplace FindReplace, List<ScintillaNET_Find
 
                 if (startLine == endLine)
                 {
-	                int lineNumber = _startingLineNumber.HasValue ? startLine + _startingLineNumber.Value : startLine;
+	                string resultsLinePrefix = string.Format(Properties.Resources.FindAllResults_ResultsLinePrefix, startLine + _startingLineNumber);
 
-	                string resultsLinePrefix = string.Format(Properties.Resources.FindAllResults_ResultsLinePrefix, lineNumber);
-
-	                FindResultsScintilla.AppendText(string.Format("{0}{1}",
-		                resultsLinePrefix, Scintilla.Lines[startLine].Text));
+	                FindResultsScintilla.AppendText(string.Format("{0}{1}", resultsLinePrefix, Scintilla.Lines[startLine].Text));
                 }
             }
 

ScintillaNet_FindReplaceDialog/GoTo/GoTo.cs

@@ -38,9 +38,8 @@ public void ShowGoToDialog()
 			//GoToDialog gd = new GoToDialog();
 			GoToDialog gd = _window;
 
-			// CurrentLine is 0 based
 			gd.CurrentLineNumber = _scintilla.CurrentLine + _startingLineIndex; 
-			gd.MaximumLineNumber = _scintilla.Lines.Count + _startingLineIndex; // TODO Add 1?
+			gd.MaximumLineNumber = _scintilla.Lines.Count + _startingLineIndex; 
 			gd.Scintilla = _scintilla;
 
 			if (!_window.Visible)
@@ -71,11 +70,13 @@ public GoTo(Scintilla scintilla)
 		{
 			_scintilla = scintilla;
 
-			// Get the first line number's margin text
+			// Is the number margin setup?
 			if (!string.IsNullOrEmpty(_scintilla.Lines[0].MarginText))
 			{
+				// Get the first line number's margin text
+				// and set the starting index. Note the LineIndex starts at 0 not 1
 				_startingLineIndex = int.Parse(_scintilla.Lines[0].MarginText);
-				_startingLineIndex = _startingLineIndex > 1 ? _startingLineIndex - 1 : 0;
+				_startingLineIndex--;
 			}
 
 			_window = CreateWindowInstance();