Ignore multi-line comments in more cases

In particular, multi-line comments that span only a single line.

Author: jjohannes

src/main/java/org/gradlex/javamodule/dependencies/internal/utils/ModuleInfo.java

@@ -90,7 +90,11 @@ private boolean parse(String moduleLine, boolean insideComment) {
             return !moduleLine.contains("*/");
         }
 
-        List<String> tokens = Arrays.asList(moduleLine.replace(";","").replace("{","").trim().split("\\s+"));
+        List<String> tokens = Arrays.asList(moduleLine
+                .replace(";","")
+                .replace("{","")
+                .replaceAll("/\\*.*?\\*/"," ")
+                .trim().split("\\s+"));
         int singleLineCommentStartIndex = tokens.indexOf("//");
         if (singleLineCommentStartIndex >= 0) {
             tokens = tokens.subList(0, singleLineCommentStartIndex);
@@ -110,6 +114,6 @@ private boolean parse(String moduleLine, boolean insideComment) {
                 requires.add(tokens.get(1));
             }
         }
-        return moduleLine.contains("/*");
+        return moduleLine.lastIndexOf("/*") > moduleLine.lastIndexOf("*/");
     }
 }

src/test/groovy/org/gradlex/javamodule/dependencies/test/ModuleInfoParseTest.groovy

@@ -61,4 +61,23 @@ class ModuleInfoParseTest extends Specification {
         moduleInfo.get(REQUIRES_STATIC_TRANSITIVE) == []
     }
 
+    def "ignores multi line comments between keywords"() {
+        given:
+        def moduleInfo = new ModuleInfo('''
+            module some.thing {
+                /*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:
+        moduleInfo.get(REQUIRES) == ["foo.bar.li"]
+        moduleInfo.get(REQUIRES_TRANSITIVE) == ["foo.bar.la"]
+        moduleInfo.get(REQUIRES_STATIC) == ["foo.bar.lo"]
+        moduleInfo.get(REQUIRES_STATIC_TRANSITIVE) == []
+    }
+
 }