Merge pull request #62 from fujaba/fix/fmethod-import

Improve import(...) syntax
fujaba · Sep 2, 2020 · 39eaa39 · 39eaa39
2 parents d713fca + 31d365a
commit 39eaa39
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 23 deletions.
diff --git a/src/main/antlr/FulibClass.g4 b/src/main/antlr/FulibClass.g4
@@ -59,20 +59,22 @@ typeParamList: LANGLE (typeParam (COMMA typeParam)*)? RANGLE;
 typeParam: annotation* IDENTIFIER (EXTENDS annotatedType (AMP annotatedType)*)?;
 typeArg: annotation* (QMARK (EXTENDS annotatedType | SUPER annotatedType)? | type);
 
-type: (primitiveType | referenceType) arraySuffix*;
+type: (primitiveType | referenceType | importType) arraySuffix*;
 arraySuffix: annotation* LBRACKET RBRACKET;
 annotatedType: annotation* type;
 annotatedTypeList: annotatedType (COMMA annotatedType)*;
 
 primitiveType: VOID | BOOLEAN | BYTE | SHORT | CHAR | INT | LONG | FLOAT | DOUBLE;
 referenceType: referenceTypePart (DOT annotation* referenceTypePart)*;
 referenceTypePart: IDENTIFIER typeArgList?;
+importTypeName: IMPORT LPAREN qualifiedName RPAREN;
+importType: importTypeName typeArgList?;
 typeArgList: LANGLE (typeArg (COMMA typeArg)*)? RANGLE;
 
 // --------------- Misc. ---------------
 
 modifier: PUBLIC | PROTECTED | PRIVATE | ABSTRACT | STATIC | FINAL | TRANSIENT | VOLATILE | SYNCHRONIZED | NATIVE | STRICTFP | DEFAULT;
-annotation: AT qualifiedName balancedParens?;
+annotation: AT (qualifiedName | importTypeName) balancedParens?;
 
 expr: (balancedBraces
       | balancedParens

diff --git a/src/main/java/org/fulib/parser/FragmentMapBuilder.java b/src/main/java/org/fulib/parser/FragmentMapBuilder.java
@@ -297,6 +297,10 @@ private static void writeType(TypeContext typeCtx, StringBuilder builder)
       {
          writeType(typeCtx.primitiveType(), builder);
       }
+      else if (typeCtx.importType() != null)
+      {
+         writeType(typeCtx.importType(), builder);
+      }
       else
       {
          writeType(typeCtx.referenceType(), builder);
@@ -327,11 +331,22 @@ private static void writeType(ReferenceTypeContext referenceTypeCtx, StringBuild
       }
    }
 
+   private static void writeType(ImportTypeContext importTypeCtx, StringBuilder builder)
+   {
+      // import(org.example.Foo) ends up as only Foo in the code, so the signature should also use the simple name
+      final List<TerminalNode> identifiers = importTypeCtx.importTypeName().qualifiedName().IDENTIFIER();
+      builder.append(identifiers.get(identifiers.size() - 1).getText());
+      writeTypeArgs(importTypeCtx.typeArgList(), builder);
+   }
+
    private static void writeType(ReferenceTypePartContext referenceTypePartCtx, StringBuilder builder)
    {
       builder.append(referenceTypePartCtx.IDENTIFIER().getText());
+      writeTypeArgs(referenceTypePartCtx.typeArgList(), builder);
+   }
 
-      final TypeArgListContext typeArgListCtx = referenceTypePartCtx.typeArgList();
+   private static void writeTypeArgs(TypeArgListContext typeArgListCtx, StringBuilder builder)
+   {
       if (typeArgListCtx == null)
       {
          return;

diff --git a/src/main/java/org/fulib/util/AbstractGenerator4ClassFile.java b/src/main/java/org/fulib/util/AbstractGenerator4ClassFile.java
@@ -31,7 +31,7 @@ public abstract class AbstractGenerator4ClassFile
    // =============== Constants ===============
 
    private static final Pattern SIGNATURE_PATTERN = Pattern.compile("^\\s*(\\w+)\\s*:\\s*(.*)\\s*$");
-   private static final Pattern IMPORT_PATTERN = Pattern.compile("import\\(((?:\\w+\\.)*(\\w+))\\)");
+   private static final Pattern IMPORT_PATTERN = Pattern.compile("import\\(((?:static\\s+)?(?:\\w+\\.)*(\\w+))\\)");
 
    // =============== Fields ===============
 

diff --git a/src/main/java/org/fulib/util/Generator4ClassFile.java b/src/main/java/org/fulib/util/Generator4ClassFile.java
@@ -240,19 +240,10 @@ private void generateMethod(FileFragmentMap fragmentMap, FMethod method)
          body = body.substring(0, body.length() - 1);
       }
 
-      final String signature = method.getSignature();
-      if (method.getModified())
-      {
-         fragmentMap.remove(signature);
-      }
-      else
-      {
-         final STGroup group = this.getSTGroup("org/fulib/templates/method.stg");
-         final ST method1 = group.getInstanceOf("method");
-         method1.add("method", method);
-         method1.add("body", body);
-         fragmentMap.add(signature, method1.render(), METHOD_NEWLINES);
-      }
+      final STGroup group = this.getSTGroup("org/fulib/templates/method.stg");
+      final String finalBody = body;
+      this.generateFromSignatures(fragmentMap, group, "methodSignatures", method.getModified(),
+                                  st -> st.add("method", method).add("body", finalBody));
    }
 
    // --------------- Additional Fragments ---------------

diff --git a/src/main/resources/org/fulib/templates/method.stg b/src/main/resources/org/fulib/templates/method.stg
@@ -1,3 +1,7 @@
+methodSignatures(method, body) ::= <<
+method: <method.signature>
+>>
+
 method(method, body) ::= <<
    <if(method.annotations)><method.annotations>
    <endif>

diff --git a/src/test/java/org/fulib/generator/FMethodTest.java b/src/test/java/org/fulib/generator/FMethodTest.java
@@ -68,12 +68,8 @@ public void testFMethods() throws Exception
       returnCode = Tools.javac(outFolder, model.getPackageSrcFolder());
       assertThat("compiler return code: ", returnCode, is(0));
 
-      party.withImports("import org.junit.jupiter.api.Test;");
-      party.withImports("import static org.hamcrest.CoreMatchers.*;");
-      party.withImports("import static org.hamcrest.MatcherAssert.assertThat;");
-
-      mm.haveMethod(party, "" + "@Test\n" + "public void testQuestion()",
-                    "" + "      assertThat(theAnswer(21), equalTo(42));\n");
+      mm.haveMethod(party, "@import(org.junit.jupiter.api.Test) public void testQuestion()",
+                    "import(static org.hamcrest.MatcherAssert.assertThat)(theAnswer(21), import(static org.hamcrest.CoreMatchers.equalTo)(42));");
 
       Fulib.generator().generate(model);