Fix complexity for empty constructors.

cs125-illinois · Jun 17, 2021 · 2645695 · 2645695
1 parent bb4b00a
commit 2645695
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ allprojects {
 }
 subprojects {
     group = "com.github.cs125-illinois.jeed"
-    version = "2021.6.1"
+    version = "2021.6.2"
     tasks.withType<Test> {
         useJUnitPlatform()
         enableAssertions = true

diff --git a/containerrunner/src/main/resources/edu.illinois.cs.cs125.jeed.containerrunner.version b/containerrunner/src/main/resources/edu.illinois.cs.cs125.jeed.containerrunner.version
@@ -1 +1 @@
-version=2021.6.1
+version=2021.6.2
diff --git a/core/src/main/kotlin/JavaComplexity.kt b/core/src/main/kotlin/JavaComplexity.kt
@@ -132,9 +132,9 @@ class JavaComplexityListener(val source: Source, entry: Map.Entry<String, String
     override fun enterConstructorDeclaration(ctx: JavaParser.ConstructorDeclarationContext) {
         assert(complexityStack.isNotEmpty())
         val currentClass = currentComplexity as ClassComplexity
-        val parameters = ctx.formalParameters().formalParameterList().formalParameter().joinToString(",") {
+        val parameters = ctx.formalParameters().formalParameterList()?.formalParameter()?.joinToString(",") {
             it.typeType().text
-        }
+        } ?: ""
         enterMethodOrConstructor(
             "${currentClass.name}($parameters)",
             Location(ctx.start.line, ctx.start.charPositionInLine),

diff --git a/core/src/main/resources/edu.illinois.cs.cs125.jeed.core.version b/core/src/main/resources/edu.illinois.cs.cs125.jeed.core.version
@@ -1 +1 @@
-version=2021.6.1
+version=2021.6.2
diff --git a/core/src/test/kotlin/TestJavaComplexity.kt b/core/src/test/kotlin/TestJavaComplexity.kt
@@ -244,6 +244,16 @@ public class Example {
     int[] array = new int[] {1, 2, 4};
     System.out.println("ran");
   }
+}""".trim()
+        ).complexity().also {
+            it.lookup("Example", "").complexity shouldBe 1
+        }
+    }
+    "should parse empty constructors properly" {
+        Source.fromSnippet(
+            """
+public class Example {
+  public Example() { }
 }""".trim()
         ).complexity().also {
             it.lookup("Example", "").complexity shouldBe 1

diff --git a/server/src/main/resources/edu.illinois.cs.cs125.jeed.server.version b/server/src/main/resources/edu.illinois.cs.cs125.jeed.server.version
@@ -1 +1 @@
-version=2021.6.1
+version=2021.6.2