Add AutoCompletionResult class

Author: hadim

src/main/java/org/scijava/script/AbstractScriptLanguage.java

@@ -31,6 +31,7 @@
 
 package org.scijava.script;
 
+import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
 
 import org.scijava.plugin.AbstractRichPlugin;
@@ -72,11 +73,6 @@ public String getLanguageName() {
 		if (info != null) name = info.getName();
 		return name != null && !name.isEmpty() ? name : inferNameFromClassName();
 	}
-    
-    @Override
-    public AutoCompleter getAutoCompleter() {
-        return new DefaultAutoCompleter(getScriptEngine());
-    }
 
 	// -- Helper methods --
 

src/main/java/org/scijava/script/ScriptLanguage.java

@@ -42,6 +42,7 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.RichPlugin;
 import org.scijava.plugin.SingletonPlugin;
+import org.scijava.script.autocompletion.DefaultAutoCompleter;
 import org.scijava.util.VersionUtils;
 
 /**
@@ -152,6 +153,8 @@ default String getEngineVersion() {
 		return "0.0";
 	}
 
-	public AutoCompleter getAutoCompleter();
+    default AutoCompleter getAutoCompleter() {
+        return new DefaultAutoCompleter(this);
+    }
 
 }

src/main/java/org/scijava/script/autocompletion/AbstractAutoCompleter.java

@@ -31,37 +31,68 @@
 package org.scijava.script.autocompletion;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import javax.script.Bindings;
+import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
+import org.scijava.script.ScriptLanguage;
 
 /**
  *
  * @author Hadrien Mary
  */
 public abstract class AbstractAutoCompleter implements AutoCompleter {
 
-    protected ScriptEngine engine = null;
+    protected ScriptLanguage scriptLanguage = null;
 
-    public AbstractAutoCompleter(ScriptEngine engine) {
-        this.engine = engine;
+    public AbstractAutoCompleter(ScriptLanguage scriptLanguage) {
+        this.scriptLanguage = scriptLanguage;
     }
 
     @Override
-    public Map<String, Object> autocomplete(String code) {
-        return autocomplete(code, 0);
+    public AutoCompletionResult autocomplete(String code, ScriptEngine engine) {
+        return autocomplete(code, 0, engine);
     }
-    
+
     @Override
-    public Map<String, Object> autocomplete(String code, int i) {
-        Map<String, Object> result = new HashMap<>();
-        result.put("matches", new ArrayList<>());
-        result.put("startIndex", 0);
-        return result;
+    public AutoCompletionResult autocomplete(String code, int index, ScriptEngine engine) {
+
+        List<String> matches = new ArrayList<>();
+        int startIndex = 0;
+
+        // Naive autocompletion with variables in the engine scope
+        matches.addAll(engineVariablesCompleter(code, index, engine));
+
+        // Sort matches alphabetcially
+        Collections.sort(matches, new SortIgnoreCase());
+
+        // Return results. For now we ignore index and startIndex.
+        return new AutoCompletionResult(matches, startIndex);
     }
 
-    @Override
-    public ScriptEngine getScriptEngine() {
-        return this.engine;
+    private List<String> engineVariablesCompleter(String code, int index, ScriptEngine engine) {
+        List<String> matches = new ArrayList<>();
+
+        Bindings bindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
+
+        for (String key : bindings.keySet()) {
+            if (key.toLowerCase().startsWith(code.toLowerCase())) {
+                matches.add(key);
+            }
+        }
+
+        return matches;
+    }
+
+    public class SortIgnoreCase implements Comparator<Object> {
+
+        @Override
+        public int compare(Object o1, Object o2) {
+            String s1 = (String) o1;
+            String s2 = (String) o2;
+            return s1.toLowerCase().compareTo(s2.toLowerCase());
+        }
     }
 }

src/main/java/org/scijava/script/autocompletion/AutoCompleter.java

@@ -30,7 +30,6 @@
  */
 package org.scijava.script.autocompletion;
 
-import java.util.Map;
 import javax.script.ScriptEngine;
 
 /**
@@ -39,9 +38,7 @@
  */
 public interface AutoCompleter {
 
-    public Map<String, Object> autocomplete(String code);
+    public AutoCompletionResult autocomplete(String code, ScriptEngine engine);
 
-    public Map<String, Object> autocomplete(String code, int i);
-
-    public ScriptEngine getScriptEngine();
+    public AutoCompletionResult autocomplete(String code, int startIndex, ScriptEngine engine);
 }

src/main/java/org/scijava/script/autocompletion/AutoCompletionResult.java

@@ -0,0 +1,36 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.scijava.script.autocompletion;
+
+import java.util.List;
+
+/**
+ *
+ * @author hadim
+ */
+public class AutoCompletionResult {
+
+    protected List<String> matches;
+    protected int startIndex;
+
+    public AutoCompletionResult(List<String> matches) {
+        this(matches, 0);
+    }
+
+    public AutoCompletionResult(List<String> matches, int startIndex) {
+        this.matches = matches;
+        this.startIndex = startIndex;
+    }
+
+    public int getStartIndex() {
+        return this.startIndex;
+    }
+
+    public List<String> getMatches() {
+        return this.matches;
+    }
+
+}

src/main/java/org/scijava/script/autocompletion/DefaultAutoCompleter.java

@@ -30,16 +30,16 @@
  */
 package org.scijava.script.autocompletion;
 
-import javax.script.ScriptEngine;
+import org.scijava.script.ScriptLanguage;
 
 /**
  *
  * @author Hadrien Mary
  */
 public class DefaultAutoCompleter extends AbstractAutoCompleter {
 
-    public DefaultAutoCompleter(ScriptEngine engine) {
-        super(engine);
+    public DefaultAutoCompleter(ScriptLanguage scriptLanguage) {
+        super(scriptLanguage);
     }
 
 }

src/test/java/org/scijava/menu/MenuServiceTest.java

@@ -68,6 +68,6 @@ public void tearDown() {
 	 */
 	@Test
 	public void testMenuCreation() {
-		//menuService.getMenu();
+		menuService.getMenu();
 	}
 }

src/test/java/org/scijava/script/ScriptEngineTest.java

@@ -101,11 +101,6 @@ public List<String> getNames() {
 		public List<String> getExtensions() {
 			return Arrays.asList("rot13");
 		}
-
-        @Override
-        public AutoCompleter getAutoCompleter() {
-            return new DefaultAutoCompleter(getScriptEngine());
-        }
 	}
 
 	private static class Rot13Engine extends AbstractScriptEngine {

src/test/java/org/scijava/script/ScriptFinderTest.java

@@ -243,11 +243,6 @@ public ScriptEngine getScriptEngine() {
 			throw new IllegalStateException();
 		}
 
-        @Override
-        public AutoCompleter getAutoCompleter() {
-            return new DefaultAutoCompleter(getScriptEngine());
-        }
-
 	}
 
 }

src/test/java/org/scijava/script/ScriptInfoTest.java

@@ -287,11 +287,6 @@ public List<String> getNames() {
 		public List<String> getExtensions() {
 			return Arrays.asList("bsizes");
 		}
-
-        @Override
-        public AutoCompleter getAutoCompleter() {
-            return new DefaultAutoCompleter(getScriptEngine());
-        }
 	}
 
 	// -- Test script langauge --