proper implementation of basic vs smart completion of bean references, fixes #1160

Author: rastislavpapp

src/main/java/com/github/cameltooling/idea/completion/contributor/CamelJavaReferenceContributor.java

@@ -49,7 +49,7 @@ public CamelJavaReferenceContributor() {
         addCompletionExtension(new CamelEndpointNameCompletionExtension());
         addCompletionExtension(new CamelEndpointSmartCompletionExtension(false));
         addCompletionExtension(new CamelPropertyPlaceholderSmartCompletionExtension());
-        extend(CompletionType.BASIC, psiElement().and(psiElement().inside(PsiFile.class).inFile(matchFileType("java"))),
+        extend(null, psiElement().and(psiElement().inside(PsiFile.class).inFile(matchFileType("java"))),
             new CompositeCompletionProvider(getCamelCompletionExtensions())
         );
         extend(CompletionType.BASIC, psiElement(PsiJavaToken.class).with(new PatternCondition<>("CamelJavaBeanReferenceSmartCompletion") {

src/main/java/com/github/cameltooling/idea/completion/contributor/CamelPropertiesFileReferenceContributor.java

@@ -36,7 +36,7 @@ public CamelPropertiesFileReferenceContributor() {
         addCompletionExtension(new CamelEndpointSmartCompletionExtension(false));
         // To match with file with "properties" as extension
         final PsiFilePattern.Capture<PsiFile> filePattern = matchFileType("properties");
-        extend(CompletionType.BASIC,
+        extend(null,
                 psiElement().and(psiElement().inside(PsiFile.class).inFile(filePattern)),
                 new CompositeCompletionProvider(getCamelCompletionExtensions())
         );

src/main/java/com/github/cameltooling/idea/completion/contributor/CamelYamlFileReferenceContributor.java

@@ -88,7 +88,7 @@ public CamelYamlFileReferenceContributor() {
         addCompletionExtension(new CamelEndpointNameCompletionExtension());
         addCompletionExtension(new CamelEndpointSmartCompletionExtension(false));
         addCompletionExtension(new CamelPropertyPlaceholderSmartCompletionExtension());
-        extend(CompletionType.BASIC,
+        extend(null,
             psiElement().and(psiElement().inside(PsiFile.class).inFile(matchFileType("yaml", "yml"))),
             new CompositeCompletionProvider(getCamelCompletionExtensions())
         );

src/main/java/com/github/cameltooling/idea/completion/extension/BeanReferenceCompletionExtension.java

@@ -25,6 +25,7 @@
 import com.github.cameltooling.idea.service.CamelPreferenceService;
 import com.github.cameltooling.idea.util.BeanUtils;
 import com.intellij.codeInsight.completion.CompletionParameters;
+import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.lookup.AutoCompletionPolicy;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.openapi.module.Module;
@@ -43,9 +44,14 @@ public BeanReferenceCompletionExtension() {
         super(BeanReference.class);
     }
 
+    @Override
+    public boolean supportsSmartCompletion() {
+        return true;
+    }
+
     @Override
     protected List<LookupElement> findResults(@NotNull CompletionParameters parameters, @NotNull PsiElement element, @NotNull String query) {
-        List<ReferenceableBeanId> targets = findTargets(element, query);
+        List<ReferenceableBeanId> targets = findTargets(parameters, element, query);
         return targets.stream()
                 .map(bean -> createLookupElementBuilder(bean.getId(), bean.getElement())
                 .withTypeText(getReferencedClassName(bean))
@@ -58,20 +64,20 @@ private String getReferencedClassName(ReferenceableBeanId bean) {
         return psiClass != null ? psiClass.getName() : null;
     }
 
-    private List<ReferenceableBeanId> findTargets(PsiElement element, String query) {
+    private List<ReferenceableBeanId> findTargets(@NotNull CompletionParameters parameters, PsiElement element, String query) {
         Module module = ModuleUtilCore.findModuleForPsiElement(element);
         if (module == null) {
             return Collections.emptyList();
         }
 
-        PsiType expectedType = getExpectedType(element);
-
         Predicate<String> beanIdPredicate = b -> b.startsWith(query);
-        if (expectedType != null) {
-            return BeanUtils.getService().findReferenceableBeanIdsByType(module, beanIdPredicate, expectedType);
-        } else {
-            return BeanUtils.getService().findReferenceableBeanIds(module, beanIdPredicate);
+        if (CompletionType.SMART.equals(parameters.getCompletionType())) {
+            PsiType expectedType = getExpectedType(element);
+            if (expectedType != null) {
+                return BeanUtils.getService().findReferenceableBeanIdsByType(module, beanIdPredicate, expectedType);
+            }
         }
+        return BeanUtils.getService().findReferenceableBeanIds(module, beanIdPredicate);
     }
 
     private PsiType getExpectedType(PsiElement element) {

src/test/java/com/github/cameltooling/idea/completion/extension/BeanReferenceCompletionExtensionIT.java

@@ -92,34 +92,38 @@ protected String getTestDataPath() {
         "  </camelContext>" +
         "</blueprint>";
 
-    public void testBeanInjectValue() {
+    public void testBeanInjectValueBasic() {
         myFixture.configureByFiles("TestClass1.java", "TestClass2.java", "TestClass3.java", "beans.xml");
         myFixture.complete(CompletionType.BASIC);
         List<String> strings = myFixture.getLookupElementStrings();
         assertNotNull(strings);
-        assertEquals(2, strings.size());
-        assertContainsElements(strings, "testClass2Bean", "testClass2Bean2");
+        assertSameElements(strings, "testClass1Bean", "testClass2Bean", "testClass2Bean2");
+    }
+
+    public void testBeanInjectValueSmart() {
+        myFixture.configureByFiles("TestClass1.java", "TestClass2.java", "TestClass3.java", "beans.xml");
+        myFixture.complete(CompletionType.SMART);
+        List<String> strings = myFixture.getLookupElementStrings();
+        assertNotNull(strings);
+        assertSameElements(strings, "testClass2Bean", "testClass2Bean2");
     }
 
     public void testPropertyReference() {
         List<String> strings = doTestCompletionAtCaret(PROPERTY_REFERENCE);
         assertNotNull(strings);
-        assertEquals(3, strings.size());
-        assertContainsElements(strings, "bean1", "bean2", "boo");
+        assertSameElements(strings, "bean1", "bean2", "boo");
     }
 
     public void testRouteReference() {
         List<String> strings = doTestCompletionAtCaret(ROUTE_REFERENCE);
         assertNotNull(strings);
-        assertEquals(2, strings.size());
-        assertContainsElements(strings, "myBean", "myBean2");
+        assertSameElements(strings, "myBean", "myBean2");
     }
 
     public void testEndpointReference() {
         List<String> strings = doTestCompletionAtCaret(ENDPOINT_REFERENCE);
         assertNotNull(strings);
-        assertEquals(2, strings.size());
-        assertContainsElements(strings, "myBean", "myEndpoint");
+        assertSameElements(strings, "myBean", "myEndpoint");
     }
 
     public void testNoResultsWhenUsedAsEndpoint() {