Trigger auto-popup for constant arg completion

klesun · Feb 13, 2019 · 460a802 · 460a802
1 parent 8749680
commit 460a802
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/src/org/klesun/deep_assoc_completion/completion_providers/ArgCstPvdr.java b/src/org/klesun/deep_assoc_completion/completion_providers/ArgCstPvdr.java
@@ -44,7 +44,7 @@ private static Opt<T2<String, Integer>> assertBuiltInFuncArg(PsiElement caretLea
             .cst(ConstantReferenceImpl.class) // IntellijIdeaRulezzz
             .fop(cst -> opt(cst.getParent()))
             .map(lst -> Tls.cast(BinaryExpressionImpl.class, lst) // doStuff(A | B)
-                .map(bin -> bin.getParent()).def(lst))
+                .fop(bin -> opt(bin.getParent())).def(lst))
             .cst(ParameterList.class)
             .fop(cst -> opt(cst.getParent()))
             .cst(FunctionReferenceImpl.class)
@@ -84,4 +84,28 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
 
         suggestions.fch(result::addElement);
     }
+
+    public static boolean invokeAutoPopup(@NotNull PsiElement position, char typeChar)
+    {
+        if (typeChar == ' ') {
+            if (position.getText().equals(",")) {
+                return opt(position.getParent())
+                    .cst(ParameterList.class)
+                    .fop(cst -> opt(cst.getParent()))
+                    .cst(FunctionReferenceImpl.class)
+                    .any(call -> !"".equals(opt(call.getName()).def("")));
+            } else if (position.getText().equals("|")) {
+                return opt(position.getParent())
+                    .fop(lst -> Tls.cast(BinaryExpressionImpl.class, lst))
+                    .fop(cst -> opt(cst.getParent()))
+                    .cst(ParameterList.class)
+                    .fop(cst -> opt(cst.getParent()))
+                    .cst(FunctionReferenceImpl.class)
+                    .any(call -> !"".equals(opt(call.getName()).def("")));
+            }
+        } else if (typeChar == '(') {
+            return position.getParent() instanceof ConstantReferenceImpl;
+        }
+        return false;
+    }
 }
diff --git a/src/org/klesun/deep_assoc_completion/entry/DeepAssocCbtr.java b/src/org/klesun/deep_assoc_completion/entry/DeepAssocCbtr.java
@@ -160,8 +160,8 @@ public boolean invokeAutoPopup(@NotNull PsiElement position, char typeChar) {
                 .map(par -> par.getLastChild())
                 .flt(lst -> lst.isEquivalentTo(position))
                 .uni(var -> true, () -> false);
-//        } else if (typeChar == ',' || typeChar == ' ') {
-//            return ArgCstPvdr.assertBuiltInFuncArgFromLeaf(position).has();
+        } else if (ArgCstPvdr.invokeAutoPopup(position, typeChar)) {
+            return true;
         } else {
             return false;
         }

diff --git a/tests/index.php b/tests/index.php
@@ -1157,7 +1157,7 @@ function __construct(array $options = array())
 
 pcntl_signal();
 file_put_contents('text.txt', 'abababa', );
-json_encode(['a' => 5, 'b' => 6], JSON_PRETTY_PRINT | i);
+json_encode(['a' => 5, 'b' => 6], JSON_PRETTY_PRINT | );
 file_put_contents('text.txt', 'abababa', '');
 
 preg_match('/asd/', 'asd', $matches, '');