autocompletion: factored filtering of completions

Author: cmaglie

app/src/cc/arduino/autocomplete/ClangCompletionProvider.java

@@ -115,7 +115,14 @@ protected List<Completion> getCompletionsImpl(JTextComponent textarea) {
         e.printStackTrace();
         return res;
       }
+
+      String enteredText = getAlreadyEnteredText(textarea);
+
       for (ArduinoCompletion cc : allCc) {
+        // Filter completions based on already entered text
+        if (!cc.getCompletion().getTypedText().startsWith(enteredText)) {
+          continue;
+        }
 
         if (cc.type.equals("Function")) {
           List<Parameter> params = new ArrayList<>();
@@ -135,10 +142,6 @@ protected List<Completion> getCompletionsImpl(JTextComponent textarea) {
           }
           fancyParameters += ")";
 
-          if (!cc.getCompletion().getTypedText().startsWith(getAlreadyEnteredText(textarea))) {
-            continue;
-          }
-
           FunctionCompletion compl = new FunctionCompletion(this,
               cc.getCompletion().getTypedText(),
               cc.getCompletion().getResultType());
@@ -180,10 +183,8 @@ protected List<Completion> getCompletionsImpl(JTextComponent textarea) {
         }
         fancyParameters += ")";
         //System.out.println("TEMPLATE: " + template);
-        if (typedText.startsWith(getAlreadyEnteredText(textarea))) {
-          TemplateCompletion compl = new TemplateCompletion(this, typedText, fancyParameters + " : " + returnType , template);
-          res.add(compl);
-        }
+        TemplateCompletion compl = new TemplateCompletion(this, typedText, fancyParameters + " : " + returnType , template);
+        res.add(compl);
       }
       return res;
     } catch (Exception e) {