[jnigen] Include superinterface methods (#2013)

Author: HosseinYousefi

pkgs/jni/CHANGELOG.md

@@ -14,11 +14,11 @@
   instead use the default value of `build/jni_libs`.
 - Added `JArray.of`, which allows a `JArray` to be constructed from an
   `Iterable`.
-- Added `JObject.isA`, which checks whether a `JObject` is a instance of a
-  java class.
+- Added `JObject.isA`, which checks whether a `JObject` is a instance of a java
+  class.
 - Do not require JAWT when building for desktop.
-- Added `JByteArray.from`, which allows a `JByteArray` to be constructed
-  from an `Iterable<int>`.
+- Added `JByteArray.from`, which allows a `JByteArray` to be constructed from an
+  `Iterable<int>`.
 
 ## 0.13.0
 

pkgs/jnigen/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 0.14.1-wip
+
 - Added support for generating matching Kotlin operators as Dart operators.
+- Include the methods of the superinterfaces of a class or interface in the
+  bindings.
 
 ## 0.14.0
 

pkgs/jnigen/java/src/main/java/com/github/dart_lang/jnigen/apisummarizer/Main.java

@@ -123,8 +123,7 @@ public static void main(String[] args) throws FileNotFoundException {
         break;
       case AUTO:
         Map<String, ClassDecl> classes = new LinkedHashMap<>();
-        // Preferring DOCLET as the source of summary a class exists in
-        // both ASM and DOCLET.
+        // Prefer DOCLET as the source of summary if a class exists in both ASM and DOCLET.
         if (!classStreamProviders.isEmpty()) {
           classes.putAll(AsmSummarizer.run(classStreamProviders));
         }

pkgs/jnigen/java/src/main/java/com/github/dart_lang/jnigen/apisummarizer/doclet/SummarizerDoclet.java

@@ -157,12 +157,6 @@ public Void visitExecutable(ExecutableElement element, SummaryCollector collecto
             Log.info("Skip method: %s", element.getSimpleName());
           }
           break;
-        case STATIC_INIT:
-          cls.hasStaticInit = true;
-          break;
-        case INSTANCE_INIT:
-          cls.hasInstanceInit = true;
-          break;
       }
       return null;
     }

pkgs/jnigen/java/src/main/java/com/github/dart_lang/jnigen/apisummarizer/elements/ClassDecl.java

@@ -33,8 +33,6 @@ public class ClassDecl {
   public TypeUsage superclass;
   public String outerClassBinaryName;
   public List<TypeUsage> interfaces = new ArrayList<>();
-  public boolean hasStaticInit;
-  public boolean hasInstanceInit;
   public JavaDocComment javadoc;
   public List<JavaAnnotation> annotations = new ArrayList<>();
   public KotlinClass kotlinClass;

pkgs/jnigen/lib/src/bindings/descriptor.dart

@@ -26,7 +26,10 @@ extension on String {
       this != '<clinit>';
 }
 
-class Excluder extends Visitor<Classes, void> {
+class Excluder extends Visitor<Classes, void> with TopLevelVisitor {
+  @override
+  final GenerationStage stage = GenerationStage.excluder;
+
   final Config config;
 
   const Excluder(this.config);
@@ -62,7 +65,7 @@ class _ClassExcluder extends Visitor<ClassDecl, void> {
   @override
   void visit(ClassDecl node) {
     node.methods = node.methods.where((method) {
-      final isExcluded = method.isExcluded;
+      final isExcluded = method.userDefinedIsExcluded;
       final isPrivate = method.isPrivate;
       final isAbstractCtor = method.isConstructor && node.isAbstract;
       final isBridgeMethod = method.isSynthetic && method.isBridge;

pkgs/jnigen/lib/src/bindings/excluder.dart

@@ -32,7 +32,10 @@ String _toJavaBinaryName(String kotlinBinaryName) {
 
 /// A [Visitor] that adds the the information from Kotlin's metadata to the Java
 /// classes and methods.
-class KotlinProcessor extends Visitor<Classes, void> {
+class KotlinProcessor extends Visitor<Classes, void> with TopLevelVisitor {
+  @override
+  final GenerationStage stage = GenerationStage.kotlinProcessor;
+
   @override
   void visit(Classes node) {
     final classProcessor = _KotlinClassProcessor();