#226: Filter internal methods and support methods from super class

Author: thunderhook

src/main/java/org/mapstruct/intellij/codeinsight/references/MapstructMappingQualifiedByNameReference.java

@@ -111,8 +111,9 @@ private Stream<PsiMethod> findAllNamedMethodsFromThisAndReferencedMappers(@NotNu
             return Stream.empty();
         }
 
-        Stream<PsiMethod> internalMethods = Stream.of( containingClass.getMethods() )
-            .filter( MapstructUtil::isNamedMethod );
+        Stream<PsiMethod> internalMethods = Stream.of( containingClass.getAllMethods() )
+            .filter( MapstructUtil::isNamedMethod )
+            .filter( m -> !m.hasModifierProperty( PsiModifier.PRIVATE ) );
 
         Stream<PsiMethod> externalMethods = findNamedMethodsInUsedMappers( containingClass )
             .filter( method -> methodIsAccessibleFrom( method, containingClass ) );

src/test/java/org/mapstruct/intellij/completion/MappingQualifiedByNameCompletionTestCase.java

@@ -100,9 +100,11 @@ private void assertAutoCompleteOfValidVisibilities() {
             .extracting( LookupElement::getLookupString )
             .containsExactlyInAnyOrder(
                 "internalModifierPackagePrivate",
-                "internalModifierPrivate",
                 "internalModifierProtected",
                 "internalModifierPublic",
+                "superClassModifierPackagePrivate",
+                "superClassModifierProtected",
+                "superClassModifierPublic",
                 "samePackageModifierPackagePrivate",
                 "samePackageModifierPublic",
                 "externalPackageModifierPublic"
@@ -117,9 +119,19 @@ private void assertAutoCompleteOfValidVisibilities() {
                     "String",
                     " CarMapper#internalModifierPackagePrivate(String)"
                 ),
-                createMethod( "internalModifierPrivate", "String", " CarMapper#internalModifierPrivate(String)" ),
                 createMethod( "internalModifierProtected", "String", " CarMapper#internalModifierProtected(String)" ),
                 createMethod( "internalModifierPublic", "String", " CarMapper#internalModifierPublic(String)" ),
+                createMethod(
+                    "superClassModifierPackagePrivate",
+                    "String",
+                    " BaseMapper#superClassModifierPackagePrivate(String)"
+                ),
+                createMethod(
+                    "superClassModifierProtected",
+                    "String",
+                    " BaseMapper#superClassModifierProtected(String)"
+                ),
+                createMethod( "superClassModifierPublic", "String", " BaseMapper#superClassModifierPublic(String)" ),
                 createMethod(
                     "samePackageModifierPackagePrivate",
                     "String",

testData/completion/qualifiedbyname/MappingQualifiedByNameWithAllPossibleVisibilities.java

@@ -10,14 +10,15 @@
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
+import org.mapstruct.ap.test.complex.BaseMapper;
 import org.mapstruct.ap.test.complex.SamePackageMapper;
 import org.mapstruct.helper.qualifiedbyname.external.ExternalMapper;
 
 @Mapper(uses = { ExternalMapper.class, SamePackageMapper.class })
-public interface CarMapper {
+public abstract class CarMapper extends BaseMapper {
 
     @Mapping(target = "make", qualifiedByName = "<caret>")
-    CarDto carToCarDto(Car car);
+    public abstract CarDto carToCarDto(Car car);
 
     @Named("internalModifierPackagePrivate")
     String internalModifierPackagePrivate(String value) {

testData/completion/qualifiedbyname/mapper/BaseMapper.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at https://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.complex;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Named;
+
+@Mapper
+public abstract class BaseMapper {
+
+    @Named("superClassModifierPackagePrivate")
+    String superClassModifierPackagePrivate(String value) {
+        return "";
+    }
+
+    @Named("superClassModifierPrivate")
+    private String superClassModifierPrivate(String value) {
+        return "";
+    }
+
+    @Named("superClassModifierProtected")
+    protected String superClassModifierProtected(String value) {
+        return "";
+    }
+
+    @Named("superClassModifierPublic")
+    public String superClassModifierPublic(String value) {
+        return "";
+    }
+
+}