Improve module-info parsing (ignore comments)

Fixes #5

Author: jjohannes

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Java Module Testing Gradle Plugin - Changelog
 
+## Version 1.2
+* [#5](https://github.com/gradlex-org/java-module-testing/issues/5) Improve module-info parsing
+
 ## Version 1.1
 * Integrate with https://github.com/gradlex-org/java-module-dependencies/issues/19
 

src/main/java/org/gradlex/javamodule/testing/internal/ModuleInfoParser.java

@@ -47,11 +47,31 @@ public String moduleName(Set<File> sourceFolders) {
         return null;
     }
 
-    private String moduleName(String moduleInfoFileContent) {
+    static String moduleName(String moduleInfoFileContent) {
+        boolean inComment = false;
+        boolean moduleKeywordFound = false;
+
         for(String line: moduleInfoFileContent.split("\n")) {
-            List<String> tokens = Arrays.asList(line.replace("{","").trim().split("\\s+"));
-            if (!"//".equals(tokens.get(0)) && tokens.contains("module")) {
-                return tokens.get(tokens.size() - 1);
+            String cleanedLine = line
+                    .replaceAll("/\\*.*\\*/", "") // open & close in this line
+                    .replaceAll("//.*", ""); // line comment
+            inComment = inComment || cleanedLine.contains("/*");
+            cleanedLine = cleanedLine.replaceAll("/\\*.*", ""); // open in this line
+            inComment = inComment && !line.contains("*/");
+            cleanedLine = cleanedLine.replaceAll(".*\\*/", "").trim(); // closing part of comment
+
+            if (inComment) {
+                continue;
+            }
+
+            List<String> tokens = Arrays.asList(cleanedLine.split("\\s+"));
+            if (moduleKeywordFound && !tokens.isEmpty()) {
+                return tokens.get(0);
+            } else  if (tokens.indexOf("module") == 0) {
+                moduleKeywordFound = true;
+            }
+            if (tokens.size() > 1) {
+                return tokens.get(1);
             }
         }
         return null;

src/test/groovy/org/gradlex/javamodule/testing/internal/ModuleInfoParseTest.groovy

@@ -0,0 +1,62 @@
+package org.gradlex.javamodule.testing.internal
+
+import spock.lang.Specification
+
+class ModuleInfoParseTest extends Specification {
+
+    def "ignores single line comments"() {
+        given:
+        def nameFromFile = ModuleInfoParser.moduleName('''
+            // module some.thing.else
+            module some.thing {
+                requires transitive foo.bar.la;
+            }
+        ''')
+
+        expect:
+        nameFromFile == 'some.thing'
+    }
+
+    def "ignores single line comments late in line"() {
+        given:
+        def nameFromFile = ModuleInfoParser.moduleName('''
+            module some.thing { // module some.thing.else
+                requires transitive foo.bar.la;
+            }
+        ''')
+
+        expect:
+        nameFromFile == 'some.thing'
+    }
+
+    def "ignores multi line comments"() {
+        given:
+        def nameFromFile = ModuleInfoParser.moduleName('''
+            /*
+            module some.thing.else;
+            */
+            module some.thing {
+                requires static foo.bar.la;
+            }
+        ''')
+
+        expect:
+        nameFromFile == 'some.thing'
+    }
+
+    def "ignores multi line comments between keywords"() {
+        given:
+        def nameFromFile = ModuleInfoParser.moduleName('''
+            module /*module some.other*/ some.thing { /* module
+            odd comment*/ requires transitive foo.bar.la;
+                requires/* weird comment*/ static foo.bar.lo;
+                requires /*something to say*/foo.bar.li; /*
+                    requires only.a.comment
+                */
+            }
+        ''')
+
+        expect:
+        nameFromFile == 'some.thing'
+    }
+}