Merge pull request #2294 from Haehnchen/feature/querybuilder-dot-duplicate

add workaround to remove duplicate element for querybuilder after dot…

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java

@@ -1,11 +1,12 @@
 package fr.adrienbrault.idea.symfony2plugin.doctrine.querybuilder;
 
 import com.intellij.codeInsight.completion.*;
+import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
-import com.intellij.patterns.PatternCondition;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.patterns.PlatformPatterns;
-import com.intellij.patterns.StandardPatterns;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ProcessingContext;
@@ -534,6 +535,8 @@ private void buildLookupElements(CompletionResultSet completionResultSet, QueryB
                 lookup = lookup.withBoldness(true);
             }
 
+            lookup = lookup.withInsertHandler(new DottedClearWorkoutInsertHandler());
+
             completionResultSet.addElement(lookup);
         }
     }
@@ -548,4 +551,35 @@ public static QueryBuilderMethodReferenceParser getQueryBuilderParser(MethodRefe
             addAll(processor.getQueryBuilderMethodReferences());
         }});
     }
+
+    /**
+     * Workaround to fix duplicated elements after a dot sign
+     *
+     * "https://blog.jetbrains.com/phpstorm/2023/09/phpstorm-public-roadmap-whats-coming-in-2023-3/#doctrine-query-language-support-inside-querybuilder"
+     *
+     * Some methods provide language injection from PhpStorm itself, and therefore have supported for dotted prefix ".":
+     * - $qb->select('fooBar.id', 'fooBar.');
+     * - $qb->select('fooBar.fooBar.id', 'fooBar.id');
+     */
+    private static class DottedClearWorkoutInsertHandler implements InsertHandler<LookupElement> {
+        @Override
+        public void handleInsert(@NotNull InsertionContext context, @NotNull LookupElement item) {
+            Editor editor = context.getEditor();
+            String insertedText = editor.getDocument().getText(new TextRange(context.getStartOffset(), context.getTailOffset()));
+            String lookupString = item.getLookupString();
+
+            int substring = lookupString.indexOf(".");
+            if (substring > 0) {
+                String beforeDot = lookupString.substring(0, substring);
+                TextRange rangeBeforeInserted = new TextRange(context.getStartOffset() - beforeDot.length() - 1, context.getStartOffset());
+                String textBeforeDot = editor.getDocument().getText(rangeBeforeInserted);
+
+                // if final inserted lookup string result in duplication remove it
+                if (insertedText.startsWith(textBeforeDot)) {
+                    context.getDocument().deleteString(rangeBeforeInserted.getStartOffset(), rangeBeforeInserted.getEndOffset());
+                    context.commitDocument();
+                }
+            }
+        }
+    }
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/MatcherUtil.java

@@ -11,13 +11,13 @@
  */
 public class MatcherUtil {
 
-    private static MethodMatcher.CallToSignature[] SELECT_FIELDS = new MethodMatcher.CallToSignature[] {
+    private static final MethodMatcher.CallToSignature[] SELECT_FIELDS = new MethodMatcher.CallToSignature[] {
         new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "orderBy"),
         new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "addOrderBy"),
         new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "set"),
     };
 
-    private static MethodMatcher.CallToSignature[] SELECT_FIELDS_VARIADIC = new MethodMatcher.CallToSignature[] {
+    private static final MethodMatcher.CallToSignature[] SELECT_FIELDS_VARIADIC = new MethodMatcher.CallToSignature[] {
         new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "select"),
         new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "addSelect"),
         new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "groupBy"),