Merge pull request #1892 from Haehnchen/feature/duplicate

prevent duplicate complete for already known elements

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/PhpRouteReferenceContributor.java

@@ -4,6 +4,8 @@
 import com.intellij.psi.*;
 import com.intellij.util.ProcessingContext;
 import com.jetbrains.php.lang.PhpLanguage;
+import com.jetbrains.php.lang.psi.elements.MethodReference;
+import com.jetbrains.php.lang.psi.elements.PhpExpression;
 import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.util.MethodMatcher;
@@ -50,9 +52,17 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar psiReferen
             new PsiReferenceProvider() {
                 @NotNull
                 @Override
-                public PsiReference[] getReferencesByElement(@NotNull PsiElement psiElement, @NotNull ProcessingContext processingContext) {
+                public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement psiElement, @NotNull ProcessingContext processingContext) {
+
+                    MethodMatcher.MethodMatchParameter matchedSignatureWithDepth = MethodMatcher.getMatchedSignatureWithDepth(psiElement, GENERATOR_SIGNATURES);
+                    if (matchedSignatureWithDepth == null) {
+                        return new PsiReference[0];
+                    }
 
-                    if (MethodMatcher.getMatchedSignatureWithDepth(psiElement, GENERATOR_SIGNATURES) == null) {
+                    // @TODO: find better solution; prevent duplicate on proxy frpm twig to php eg on path() or url()
+                    MethodReference methodReference = matchedSignatureWithDepth.getMethodReference();
+                    PhpExpression classReference = methodReference.getClassReference();
+                    if (classReference != null && "____proxy____".equalsIgnoreCase(classReference.getName())) {
                         return new PsiReference[0];
                     }
 

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java

@@ -318,9 +318,9 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC
         extend(
             CompletionType.BASIC,
             TwigPattern.getAutocompletableRoutePattern(),
-            new CompletionProvider<CompletionParameters>() {
+            new CompletionProvider<>() {
                 public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) {
-                    if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) {
+                    if (!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) {
                         return;
                     }
 
@@ -994,7 +994,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull
                 return;
             }
 
-            // @TODO: support more the first argument
+            // @TODO: support more then the first argument
             int wantParameter = 0;
 
             Collection<Pair<PhpNamedElement, Integer>> sources = new ArrayList<>();
@@ -1043,23 +1043,23 @@ protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull
                     if (containingClass != null) {
                         @NotNull ParameterList phpPsiFromText = PhpPsiElementFactory.createPhpPsiFromText(parameters.getPosition().getProject(), ParameterList.class, "" +
                             "<?php\n" +
-                            "/** @var " + containingClass.getFQN() + " $x */\n" +
-                            "$x->" + psiElement.getName() + "(" + join + ");\n");
+                            "/** @var " + containingClass.getFQN() + " $____proxy____ */\n" +
+                            "$____proxy____->" + psiElement.getName() + "(" + join + ");\n");
 
                         PsiElement[] parameters1 = phpPsiFromText.getParameters();
                         targets.add(parameters1[parameters1.length - 1]);
                     }
                 } else if (psiElement instanceof com.jetbrains.php.lang.psi.elements.Function) {
                     @NotNull ParameterList phpPsiFromText = PhpPsiElementFactory.createPhpPsiFromText(parameters.getPosition().getProject(), ParameterList.class, "" +
                         "<?php\n" +
-                        psiElement.getName() + "(" + join + ");\n");
+                        "$____proxy____ = " + psiElement.getName() + "(" + join + ");\n");
 
                     PsiElement[] parameters1 = phpPsiFromText.getParameters();
                     targets.add(parameters1[parameters1.length - 1]);
                 } else if (psiElement instanceof PhpClass) {
                     @NotNull ParameterList phpPsiFromText = PhpPsiElementFactory.createPhpPsiFromText(parameters.getPosition().getProject(), ParameterList.class, "" +
                         "<?php\n" +
-                        "new " + psiElement.getFQN() + "(" + join + ");\n");
+                        "$____proxy____ = new " + psiElement.getFQN() + "(" + join + ");\n");
 
                     PsiElement[] parameters1 = phpPsiFromText.getParameters();
                     targets.add(parameters1[parameters1.length - 1]);

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java

@@ -70,32 +70,41 @@ public String getMethod() {
     }
 
     public static class MethodMatchParameter {
-
+        @NotNull
         final private CallToSignature signature;
+
+        @NotNull
         final private ParameterBag parameterBag;
+
+        @NotNull
         final private PsiElement[] parameters;
+
+        @NotNull
         final private MethodReference methodReference;
 
-        public MethodMatchParameter(CallToSignature signature, ParameterBag parameterBag, PsiElement[] parameters, MethodReference methodReference) {
+        public MethodMatchParameter(@NotNull CallToSignature signature, @NotNull ParameterBag parameterBag, @NotNull PsiElement[] parameters, @NotNull MethodReference methodReference) {
             this.signature = signature;
             this.parameterBag = parameterBag;
             this.parameters = parameters;
             this.methodReference = methodReference;
         }
 
-        @Nullable
+        @NotNull
         public CallToSignature getSignature() {
             return signature;
         }
 
+        @NotNull
         public ParameterBag getParameterBag() {
             return this.parameterBag;
         }
 
+        @NotNull
         public PsiElement[] getParameters() {
             return parameters;
         }
 
+        @NotNull
         public MethodReference getMethodReference() {
             return methodReference;
         }