fix bug that always showed global class names.

hecomi · Nov 29, 2017 · 358bbc2 · 358bbc2
1 parent 29bfe39
commit 358bbc2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/Assets/uREPL/Resources/uREPL/Prefabs/uREPL.prefab b/Assets/uREPL/Resources/uREPL/Prefabs/uREPL.prefab
diff --git a/Assets/uREPL/Scripts/Completions/GlobalClassCompletion.cs b/Assets/uREPL/Scripts/Completions/GlobalClassCompletion.cs
@@ -10,15 +10,15 @@ public class GlobalClassCompletion : CompletionPlugin
 
 	protected override void OnEnable()
 	{
-        if (globalClassNames_ == null) {
-            globalClassNames_ = System.AppDomain.CurrentDomain.GetAssemblies()
-                .SelectMany(asm => asm.GetTypes())
-                .Where(type => type.IsClass && type.Namespace == null)
-                .Select(type => type.Name)
-                .Where(name => char.IsLetter(name[0]))
-                .Distinct()
-                .OrderBy(name => name[0])
-                .ToArray();
+        if (globalClassNames_ == null) {
+            globalClassNames_ = System.AppDomain.CurrentDomain.GetAssemblies()
+                .SelectMany(asm => asm.GetTypes())
+                .Where(type => type.IsClass && type.Namespace == null)
+                .Select(type => type.Name)
+                .Where(name => char.IsLetter(name[0]))
+                .Distinct()
+                .OrderBy(name => name[0])
+                .ToArray();
         }
 
 		base.OnEnable();
@@ -28,6 +28,8 @@ public override CompletionInfo[] GetCompletions(string input)
 	{
 		var parts = input.Split(new char[] { '\n', ' ', '\t', '=', '{', '}', '(', ')', '<', '>' });
         var lastPart = parts.Last();
+		if (string.IsNullOrEmpty(lastPart)) return null;
+
 		return globalClassNames_
 			.Where(name => name.IndexOf(lastPart) == 0)
 			.Select(name => new CompletionInfo(

diff --git a/Assets/uREPL/Scripts/Completions/MonoCompletion.cs b/Assets/uREPL/Scripts/Completions/MonoCompletion.cs
@@ -88,7 +88,7 @@ private CompletionInfo[] GetCustomCompletions(string input, string codeAddedPrev
 		int index = 0;
 
 		// split by '=, \s'
-		var inputParts = input.Split(new char[] { '=', ' ', '	' });
+		var inputParts = input.Split(new char[] { '=', ' ', '	' }, StringSplitOptions.None);
 		input = inputParts.Last();
 
 		// completion inner block
@@ -127,6 +127,8 @@ private CompletionInfo[] GetCustomCompletions(string input, string codeAddedPrev
 			isComplemented = true;
 		}
 
+		if (string.IsNullOrEmpty(prefix)) return null;
+
 		return ConvertToCompletionInfoArray(result, prefix);
 	}
 

diff --git a/Assets/uREPL/Scripts/Gui/Window/KeyBinding.cs b/Assets/uREPL/Scripts/Gui/Window/KeyBinding.cs
@@ -164,7 +164,7 @@ public void Update()
 	{
 		ToggleWindowByKeys();
 
-		if (window_.isOpen) {
+		if (window_ && window_.isOpen) {
 			if (inputField.isFocused) {
 				keyEvent_.Check();
 			} else {