Merge pull request #11 from wolfreak99/refactor_2

More refactoring

Author: marijnz

Assets/UnityShell/Editor/Scripts/AutocompleteBox.cs

@@ -78,7 +78,7 @@ public void OnGUI(string result, Rect rect)
 			}
 			searchString = result;
 
-			DoResults(rect);
+			DrawResults(rect);
 		}
 
 		public void HandleEvents()
@@ -92,24 +92,26 @@ public void HandleEvents()
 
 			if (current.type == EventType.KeyDown)
 			{
-				if (current.keyCode == KeyCode.Escape)
+				switch (current.keyCode)
 				{
+				case KeyCode.Escape:
 					showResults = false;
-				}
-				if (current.keyCode == KeyCode.UpArrow)
-				{
+					break;
+				case KeyCode.UpArrow:
 					current.Use();
 					selectedIndex--;
-				}
-				else if (current.keyCode == KeyCode.DownArrow)
-				{
+					break;
+				case KeyCode.DownArrow:
 					current.Use();
 					selectedIndex++;
-				}
-				else if (current.keyCode == KeyCode.Return && selectedIndex >= 0)
-				{
-					current.Use();
-					OnConfirm(results[selectedIndex]);
+					break;
+				case KeyCode.Return:
+					if (selectedIndex >= 0)
+					{
+						current.Use();
+						OnConfirm(results[selectedIndex]);
+					}
+					break;
 				}
 
 				if (selectedIndex >= results.Length)
@@ -123,7 +125,7 @@ public void HandleEvents()
 			}
 		}
 
-		private void DoResults(Rect drawRect)
+		private void DrawResults(Rect drawRect)
 		{
 			if (results.Length <= 0 || !showResults)
 			{

Assets/UnityShell/Editor/Scripts/UnityShellEditorWindow.cs

@@ -88,21 +88,18 @@ private string text
 
 		[SerializeField]
 		private List<string> inputHistory = new List<string>();
-
-		private bool requestMoveToCursorToEnd;
+		private int positionInHistory;
+		
+		private bool requestMoveCursorToEnd;
 		private bool requestFocusOnTextArea;
-
 		private bool requestRevertNewLine;
 
 		private string input = "";
 		private string lastWord = "";
+		private string savedInput;
 
 		private Vector2 lastCursorPos;
 
-		private int positionInHistory;
-
-		private string savedInput;
-
 		private void Awake()
 		{
 			ClearText();
@@ -142,14 +139,14 @@ private void OnInspectorUpdate()
 
 		private void OnGUI()
 		{
-			textEditor = (TextEditor) GUIUtility.GetStateObject(typeof(TextEditor), GUIUtility.keyboardControl);
+			textEditor = (TextEditor)GUIUtility.GetStateObject(typeof(TextEditor), GUIUtility.keyboardControl);
 			if (text == "")
 			{
 				AppendStartCommand();
 				ScheduleMoveCursorToEnd();
 			}
 
-			EnsureNotAboutToTypeAtInvalidPosition();
+			HandleInvalidTypePositions();
 			autocompleteBox.HandleEvents();
 			HandleHistory();
 			DoAutoComplete();
@@ -240,10 +237,10 @@ private string GetInput()
 		private void HandleRequests()
 		{
 			var current = Event.current;
-			if (requestMoveToCursorToEnd && current.type == EventType.Repaint)
+			if (requestMoveCursorToEnd && current.type == EventType.Repaint)
 			{
 				textEditor.MoveTextEnd();
-				requestMoveToCursorToEnd = false;
+				requestMoveCursorToEnd = false;
 				Repaint();
 			}
 			else if (focusedWindow == this && requestFocusOnTextArea)
@@ -266,7 +263,10 @@ private void HandleRequests()
 			lastCursorPos = cursorPos;
 		}
 
-		private void EnsureNotAboutToTypeAtInvalidPosition()
+		/// <summary>
+		/// Ensures not about to type at an invalid position.
+		/// </summary>
+		private void HandleInvalidTypePositions()
 		{
 			var current = Event.current;
 
@@ -278,7 +278,6 @@ private void EnsureNotAboutToTypeAtInvalidPosition()
 				if (current.keyCode == KeyCode.Backspace)
 				{
 					cursorIndex--;
-
 				}
 
 				if (cursorIndex < lastIndexCommand)
@@ -310,6 +309,7 @@ private void DrawAll()
 			EditorGUILayout.EndScrollView();
 
 			autocompleteBox.results = shellEvaluator.completions;
+
 			var pos = textEditor.graphicalCursorPos;
 			var rect = new Rect(pos.x, pos.y, 300, 200);
 			rect.y += 34;
@@ -341,6 +341,7 @@ private void DrawConsole()
 					}
 
 					AppendStartCommand();
+					ScheduleMoveCursorToEnd();
 
 					current.Use();
 				}
@@ -358,12 +359,11 @@ private void ScrollDown()
 		private void AppendStartCommand()
 		{
 			text += CommandName;
-			ScheduleMoveCursorToEnd();
 		}
 
 		private void ScheduleMoveCursorToEnd()
 		{
-			requestMoveToCursorToEnd = true;
+			requestMoveCursorToEnd = true;
 			ScrollDown();
 		}