#21 Support nested properties in code-completion

agudian · agudian · commit 88321825ae61 · 2017-01-17T23:05:56.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # Eclipse
 .metadata
+.recommenders
 .classpath
 .project
 .settings
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/Bindings.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/Bindings.java
@@ -44,30 +44,30 @@ private Bindings() {
 
     /**
      * @param type the type
-     * @return the method names declared in the class or a super type of it
+     * @return the methods declared in the class or a super type of it
      */
-    public static Set<String> findAllMethodNames(ITypeBinding type) {
-        Set<String> result = new HashSet<String>();
+    public static Set<IMethodBinding> findAllMethods(ITypeBinding type) {
+        Set<IMethodBinding> result = new HashSet<IMethodBinding>();
 
-        collectMethodNames( type, new HashSet<ITypeBinding>(), result );
+        collectMethods( type, new HashSet<ITypeBinding>(), result );
 
         return result;
     }
 
-    private static void collectMethodNames(ITypeBinding type, Set<ITypeBinding> visited,
-                                           Collection<String> methodNames) {
+    private static void collectMethods(ITypeBinding type, Set<ITypeBinding> visited,
+                                       Collection<IMethodBinding> methods) {
         if ( !isJavaLangObject( type ) && visited.add( type ) ) {
             for ( IMethodBinding methodBinding : type.getDeclaredMethods() ) {
-                methodNames.add( methodBinding.getName() );
+                methods.add( methodBinding );
             }
 
             for ( ITypeBinding ifc : type.getInterfaces() ) {
-                collectMethodNames( ifc, visited, methodNames );
+                collectMethods( ifc, visited, methods );
             }
 
             ITypeBinding superClass = type.getSuperclass();
             if ( superClass != null ) {
-                collectMethodNames( superClass, visited, methodNames );
+                collectMethods( superClass, visited, methods );
             }
         }
     }
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MapStructAPIConstants.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MapStructAPIConstants.java
@@ -95,4 +95,9 @@ private MapStructAPIConstants() {
      * Fully qualified name of the annotation MappingTarget
      */
     public static final String MAPPING_TARGET_FQ_NAME = "org.mapstruct.MappingTarget"; //$NON-NLS-1$
+
+    /**
+     * Fully qualified name of the annotation Context
+     */
+    public static final String CONTEXT_FQ_NAME = "org.mapstruct.Context"; //$NON-NLS-1$
 }
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MappingAnnotationCompletionProposalComputer.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MappingAnnotationCompletionProposalComputer.java

Original file line number	Diff line number	Diff line change
`@@ -44,30 +44,30 @@ private Bindings() {`
`44`	`44`
`45`	`45`	`/**`
`46`	`46`	`* @param type the type`
`47`		`- * @return the method names declared in the class or a super type of it`
	`47`	`+ * @return the methods declared in the class or a super type of it`
`48`	`48`	`*/`
`49`		`- public static Set<String> findAllMethodNames(ITypeBinding type) {`
`50`		`- Set<String> result = new HashSet<String>();`
	`49`	`+ public static Set<IMethodBinding> findAllMethods(ITypeBinding type) {`
	`50`	`+ Set<IMethodBinding> result = new HashSet<IMethodBinding>();`
`51`	`51`
`52`		`- collectMethodNames( type, new HashSet<ITypeBinding>(), result );`
	`52`	`+ collectMethods( type, new HashSet<ITypeBinding>(), result );`
`53`	`53`
`54`	`54`	`return result;`
`55`	`55`	`}`
`56`	`56`
`57`		`- private static void collectMethodNames(ITypeBinding type, Set<ITypeBinding> visited,`
`58`		`- Collection<String> methodNames) {`
	`57`	`+ private static void collectMethods(ITypeBinding type, Set<ITypeBinding> visited,`
	`58`	`+ Collection<IMethodBinding> methods) {`
`59`	`59`	`if ( !isJavaLangObject( type ) && visited.add( type ) ) {`
`60`	`60`	`for ( IMethodBinding methodBinding : type.getDeclaredMethods() ) {`
`61`		`- methodNames.add( methodBinding.getName() );`
	`61`	`+ methods.add( methodBinding );`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`for ( ITypeBinding ifc : type.getInterfaces() ) {`
`65`		`- collectMethodNames( ifc, visited, methodNames );`
	`65`	`+ collectMethods( ifc, visited, methods );`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`ITypeBinding superClass = type.getSuperclass();`
`69`	`69`	`if ( superClass != null ) {`
`70`		`- collectMethodNames( superClass, visited, methodNames );`
	`70`	`+ collectMethods( superClass, visited, methods );`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`