Merge pull request #15 from zayass/feature/errors-location

andriydruk · web-flow · commit f1dde484a717 · 2018-03-20T20:34:47.000+02:00
[RFC] More granular error reporting
diff --git a/compiler/src/main/java/com/readdle/codegen/JavaSwiftProcessor.java b/compiler/src/main/java/com/readdle/codegen/JavaSwiftProcessor.java
@@ -79,6 +79,17 @@ public SourceVersion getSupportedSourceVersion() {
 
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        try {
+            return processImpl(annotations, roundEnv);
+        }
+        catch(SwiftMappingException exc) {
+            exc.printStackTrace();
+            error(exc.getElement(), exc.getMessage());
+            return true;
+        }
+    }
+
+    private boolean processImpl(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         Filer filer = processingEnv.getFiler();
         messager.printMessage(Diagnostic.Kind.NOTE, "Start SwiftJava code generation:");
 
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftCallbackFuncDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftCallbackFuncDescriptor.java
@@ -65,15 +65,15 @@ public class SwiftCallbackFuncDescriptor {
             int paramEnd = funcFullName.indexOf(")");
 
             if (paramStart <= 0 || paramEnd <= 0 || paramEnd <= paramStart) {
-                throw new IllegalArgumentException("Wrong func name");
+                throw new SwiftMappingException("Wrong func name", executableElement);
             }
 
             this.swiftMethodName = funcFullName.substring(0, paramStart);
             String arguments = funcFullName.substring(paramStart + 1, paramEnd);
             String[] paramNames = arguments.split(":");
 
             if (paramNames.length != params.size()) {
-                throw new IllegalArgumentException("Wrong count of arguments in func name");
+                throw new SwiftMappingException("Wrong count of arguments in func name", executableElement);
             }
 
             this.paramNames = Arrays.asList(paramNames);
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftDelegateDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftDelegateDescriptor.java
@@ -81,15 +81,15 @@ class SwiftDelegateDescriptor {
                     ExecutableElement executableElement = (ExecutableElement) element;
                     if (executableElement.getSimpleName().toString().equals("release")) {
                         if (!executableElement.getModifiers().contains(Modifier.NATIVE)) {
-                            throw new IllegalArgumentException(String.format("%s is not native method",
-                                    executableElement.getSimpleName()));
+                            throw new SwiftMappingException(String.format("%s is not native method",
+                                    executableElement.getSimpleName()), executableElement);
                         }
                         releaseExecutableElement = executableElement;
                     }
                     if (executableElement.getSimpleName().toString().equals("init")) {
                         if (!executableElement.getModifiers().contains(Modifier.NATIVE)) {
-                            throw new IllegalArgumentException(String.format("%s is not native method",
-                                    executableElement.getSimpleName()));
+                            throw new SwiftMappingException(String.format("%s is not native method",
+                                    executableElement.getSimpleName()), executableElement);
                         }
                         initExecutableElement = executableElement;
                     }
@@ -147,8 +147,9 @@ class SwiftDelegateDescriptor {
             if (element.getKind() == ElementKind.METHOD && element.getAnnotation(SwiftCallbackFunc.class) != null) {
                 ExecutableElement executableElement = (ExecutableElement) element;
                 if (executableElement.getModifiers().contains(Modifier.NATIVE)) {
-                    throw new IllegalArgumentException(String.format("%s is native method. Only java methods can be annotated with @%s",
-                            executableElement.getSimpleName(), SwiftCallbackFunc.class.getSimpleName()));
+                    String message = String.format("%s is native method. Only java methods can be annotated with @%s",
+                            executableElement.getSimpleName(), SwiftCallbackFunc.class.getSimpleName());
+                    throw new SwiftMappingException(message, executableElement);
                 }
 
                 callbackFunctions.add(new SwiftCallbackFuncDescriptor(executableElement));
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftFuncDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftFuncDescriptor.java
@@ -51,7 +51,7 @@ class SwiftFuncDescriptor implements JavaSwiftProcessor.WritableElement {
             int paramEnd = funcFullName.indexOf(")");
 
             if (paramStart <= 0 || paramEnd <= 0 || paramEnd <= paramStart) {
-                throw new IllegalArgumentException("Wrong func name");
+                throw new SwiftMappingException("Wrong func name", executableElement);
             }
 
             this.swiftMethodName = funcFullName.substring(0, paramStart);
@@ -60,7 +60,7 @@ class SwiftFuncDescriptor implements JavaSwiftProcessor.WritableElement {
             String[] paramNames = arguments.split(":");
 
             if (paramNames.length != params.size()) {
-                throw new IllegalArgumentException("Wrong count of arguments in func name");
+                throw new SwiftMappingException("Wrong count of arguments in func name", executableElement);
             }
 
             for (String paramName : paramNames) {
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftGetterDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftGetterDescriptor.java
@@ -24,11 +24,11 @@ class SwiftGetterDescriptor implements JavaSwiftProcessor.WritableElement {
         this.isReturnTypeOptional = JavaSwiftProcessor.isNullable(executableElement);
 
         if (executableElement.getThrownTypes().size() != 0) {
-            throw new IllegalArgumentException("Getter can't throw");
+            throw new SwiftMappingException("Getter can't throw", executableElement);
         }
 
         if (executableElement.getParameters().size() != 0) {
-            throw new IllegalArgumentException("Getter can't has parameters");
+            throw new SwiftMappingException("Getter can't has parameters", executableElement);
         }
 
         if (getterAnnotation != null && !getterAnnotation.value().isEmpty()) {
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftMappingException.java b/compiler/src/main/java/com/readdle/codegen/SwiftMappingException.java
@@ -0,0 +1,21 @@
+package com.readdle.codegen;
+
+import javax.lang.model.element.Element;
+
+public class SwiftMappingException extends RuntimeException {
+    private final Element element;
+
+    public SwiftMappingException(String message, Element element) {
+        super(message);
+        this.element = element;
+    }
+
+    public SwiftMappingException(String message, Element element, Throwable parent) {
+        super(message, parent);
+        this.element = element;
+    }
+
+    public Element getElement() {
+        return element;
+    }
+}
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftReferenceDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftReferenceDescriptor.java
@@ -69,8 +69,9 @@ class SwiftReferenceDescriptor {
                 ExecutableElement executableElement = (ExecutableElement) element;
                 if (executableElement.getSimpleName().toString().equals("release")) {
                     if (!executableElement.getModifiers().contains(Modifier.NATIVE)) {
-                        throw new IllegalArgumentException(String.format("%s is not native method",
-                                executableElement.getSimpleName()));
+                        String message = String.format("%s is not native method",
+                                executableElement.getSimpleName());
+                        throw new SwiftMappingException(message, executableElement);
                     }
                     releaseExecutableElement = executableElement;
                 }
diff --git a/compiler/src/main/java/com/readdle/codegen/SwiftSetterDescriptor.java b/compiler/src/main/java/com/readdle/codegen/SwiftSetterDescriptor.java
@@ -21,11 +21,11 @@ class SwiftSetterDescriptor implements JavaSwiftProcessor.WritableElement {
         this.isStatic = executableElement.getModifiers().contains(Modifier.STATIC);
 
         if (executableElement.getThrownTypes().size() != 0) {
-            throw new IllegalArgumentException("Setter can't throw");
+            throw new SwiftMappingException("Setter can't throw", executableElement);
         }
 
         if (executableElement.getParameters().size() != 1) {
-            throw new IllegalArgumentException("Setter should have exactly 1 parameter");
+            throw new SwiftMappingException("Setter should have exactly 1 parameter", executableElement);
         }
 
         param = new SwiftParamDescriptor(executableElement.getParameters().get(0));

Original file line number	Diff line number	Diff line change
`@@ -65,15 +65,15 @@ public class SwiftCallbackFuncDescriptor {`
`65`	`65`	`int paramEnd = funcFullName.indexOf(")");`
`66`	`66`
`67`	`67`	`if (paramStart <= 0 \|\| paramEnd <= 0 \|\| paramEnd <= paramStart) {`
`68`		`- throw new IllegalArgumentException("Wrong func name");`
	`68`	`+ throw new SwiftMappingException("Wrong func name", executableElement);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`this.swiftMethodName = funcFullName.substring(0, paramStart);`
`72`	`72`	`String arguments = funcFullName.substring(paramStart + 1, paramEnd);`
`73`	`73`	`String[] paramNames = arguments.split(":");`
`74`	`74`
`75`	`75`	`if (paramNames.length != params.size()) {`
`76`		`- throw new IllegalArgumentException("Wrong count of arguments in func name");`
	`76`	`+ throw new SwiftMappingException("Wrong count of arguments in func name", executableElement);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`this.paramNames = Arrays.asList(paramNames);`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class SwiftFuncDescriptor implements JavaSwiftProcessor.WritableElement {`
`51`	`51`	`int paramEnd = funcFullName.indexOf(")");`
`52`	`52`
`53`	`53`	`if (paramStart <= 0 \|\| paramEnd <= 0 \|\| paramEnd <= paramStart) {`
`54`		`- throw new IllegalArgumentException("Wrong func name");`
	`54`	`+ throw new SwiftMappingException("Wrong func name", executableElement);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`this.swiftMethodName = funcFullName.substring(0, paramStart);`
`@@ -60,7 +60,7 @@ class SwiftFuncDescriptor implements JavaSwiftProcessor.WritableElement {`
`60`	`60`	`String[] paramNames = arguments.split(":");`
`61`	`61`
`62`	`62`	`if (paramNames.length != params.size()) {`
`63`		`- throw new IllegalArgumentException("Wrong count of arguments in func name");`
	`63`	`+ throw new SwiftMappingException("Wrong count of arguments in func name", executableElement);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`for (String paramName : paramNames) {`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ class SwiftGetterDescriptor implements JavaSwiftProcessor.WritableElement {`
`24`	`24`	`this.isReturnTypeOptional = JavaSwiftProcessor.isNullable(executableElement);`
`25`	`25`
`26`	`26`	`if (executableElement.getThrownTypes().size() != 0) {`
`27`		`- throw new IllegalArgumentException("Getter can't throw");`
	`27`	`+ throw new SwiftMappingException("Getter can't throw", executableElement);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`if (executableElement.getParameters().size() != 0) {`
`31`		`- throw new IllegalArgumentException("Getter can't has parameters");`
	`31`	`+ throw new SwiftMappingException("Getter can't has parameters", executableElement);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`if (getterAnnotation != null && !getterAnnotation.value().isEmpty()) {`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,9 @@ class SwiftReferenceDescriptor {`
`69`	`69`	`ExecutableElement executableElement = (ExecutableElement) element;`
`70`	`70`	`if (executableElement.getSimpleName().toString().equals("release")) {`
`71`	`71`	`if (!executableElement.getModifiers().contains(Modifier.NATIVE)) {`
`72`		`- throw new IllegalArgumentException(String.format("%s is not native method",`
`73`		`- executableElement.getSimpleName()));`
	`72`	`+ String message = String.format("%s is not native method",`
	`73`	`+ executableElement.getSimpleName());`
	`74`	`+ throw new SwiftMappingException(message, executableElement);`
`74`	`75`	`}`
`75`	`76`	`releaseExecutableElement = executableElement;`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ class SwiftSetterDescriptor implements JavaSwiftProcessor.WritableElement {`
`21`	`21`	`this.isStatic = executableElement.getModifiers().contains(Modifier.STATIC);`
`22`	`22`
`23`	`23`	`if (executableElement.getThrownTypes().size() != 0) {`
`24`		`- throw new IllegalArgumentException("Setter can't throw");`
	`24`	`+ throw new SwiftMappingException("Setter can't throw", executableElement);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`if (executableElement.getParameters().size() != 1) {`
`28`		`- throw new IllegalArgumentException("Setter should have exactly 1 parameter");`
	`28`	`+ throw new SwiftMappingException("Setter should have exactly 1 parameter", executableElement);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`param = new SwiftParamDescriptor(executableElement.getParameters().get(0));`