Fix Kotlin complexity bug, other updates.

build.gradle.kts

@@ -18,7 +18,7 @@ allprojects {
 }
 subprojects {
     group = "com.github.cs125-illinois.jeed"
-    version = "2021.10.0"
+    version = "2021.10.1"
     tasks.withType<Test> {
         useJUnitPlatform()
         enableAssertions = true

containerrunner/build.gradle.kts

@@ -5,7 +5,7 @@ import java.io.File
 plugins {
     kotlin("jvm")
     application
-    id("com.github.johnrengelman.shadow") version "7.0.0"
+    id("com.github.johnrengelman.shadow") version "7.1.0"
     id("com.palantir.docker") version "0.30.0"
     id("org.jmailen.kotlinter")
     id("io.gitlab.arturbosch.detekt")
@@ -14,7 +14,7 @@ dependencies {
     implementation("ch.qos.logback:logback-classic:1.2.6")
     implementation("io.github.microutils:kotlin-logging:2.0.11")
     implementation("com.github.ajalt:clikt:2.8.0")
-    implementation("io.github.classgraph:classgraph:4.8.120")
+    implementation("io.github.classgraph:classgraph:4.8.126")
 }
 application {
     @Suppress("DEPRECATION")

containerrunner/src/main/resources/edu.illinois.cs.cs125.jeed.containerrunner.version

@@ -1 +1 @@
-version=2021.10.0
+version=2021.10.1

core/build.gradle.kts

@@ -23,14 +23,14 @@ dependencies {
     implementation("com.puppycrawl.tools:checkstyle:9.0.1")
     implementation("com.pinterest.ktlint:ktlint-core:0.42.1")
     implementation("com.pinterest.ktlint:ktlint-ruleset-standard:0.42.1")
-    implementation("com.github.jknack:handlebars:4.2.1")
+    implementation("com.github.jknack:handlebars:4.3.0")
     implementation("com.squareup.moshi:moshi:1.12.0")
     implementation("org.ow2.asm:asm:9.2")
     implementation("org.ow2.asm:asm-util:9.2")
     implementation("org.slf4j:slf4j-api:1.7.32")
     implementation("ch.qos.logback:logback-classic:1.2.6")
     implementation("io.github.microutils:kotlin-logging:2.0.11")
-    implementation("io.github.classgraph:classgraph:4.8.120")
+    implementation("io.github.classgraph:classgraph:4.8.126")
     implementation("net.java.dev.jna:jna:5.9.0")
     implementation("io.github.java-diff-utils:java-diff-utils:4.11")
     implementation("com.google.googlejavaformat:google-java-format:1.11.0")

core/src/main/kotlin/Cache.kt

@@ -11,6 +11,7 @@ import kotlinx.coroutines.runBlocking
 import java.time.Instant
 
 const val JEED_DEFAULT_COMPILATION_CACHE_SIZE_MB = 256L
+
 @Suppress("TooGenericExceptionCaught")
 val compilationCacheSizeMB = try {
     System.getenv("JEED_COMPILATION_CACHE_SIZE")?.toLong() ?: JEED_DEFAULT_COMPILATION_CACHE_SIZE_MB
@@ -20,6 +21,7 @@ val compilationCacheSizeMB = try {
 }
 
 const val JEED_DEFAULT_USE_CACHE = false
+
 @Suppress("TooGenericExceptionCaught")
 val useCompilationCache = try {
     System.getenv("JEED_USE_CACHE")?.toBoolean() ?: JEED_DEFAULT_USE_CACHE
@@ -69,9 +71,9 @@ fun Source.tryCache(
     }
     MoreCacheStats.hits++
 
-    val cachedCompilationArguments = cachedResult.compilationArguments ?: require {
+    val cachedCompilationArguments = cachedResult.compilationArguments ?: error(
         "Cached compilation result missing arguments"
-    }
+    )
     if (cachedResult.compilerName != compilerName) {
         return null
     }
@@ -131,9 +133,9 @@ fun Source.tryCache(
         return null
     }
     MoreCacheStats.hits++
-    val cachedKompilationArguments = cachedResult.kompilationArguments ?: require {
+    val cachedKompilationArguments = cachedResult.kompilationArguments ?: error(
         "Cached kompilation result missing arguments"
-    }
+    )
     if (cachedResult.compilerName != compilerName) {
         return null
     }

core/src/main/kotlin/Kompile.kt

@@ -243,7 +243,7 @@ const val KOTLIN_COROUTINE_MIN_EXTRA_THREADS = 4
 fun CompiledSource.usesCoroutines(): Boolean = source.sources.keys
     .map { source.getParsed(it).tree }
     .any { tree ->
-        tree as? KotlinParser.KotlinFileContext ?: check { "Parse tree is not from a Kotlin file" }
+        tree as? KotlinParser.KotlinFileContext ?: error("Parse tree is not from a Kotlin file")
         tree.preamble().importList().importHeader().any { importName ->
             KOTLIN_COROUTINE_IMPORTS.any { importName.identifier().text.startsWith(it) }
         }

core/src/main/kotlin/KotlinComplexity.kt

@@ -13,6 +13,9 @@ class KotlinComplexityListener(val source: Source, entry: Map.Entry<String, Stri
     private val fileName = entry.key
     private var currentClass = ""
 
+    private var anonymousClassDepth = 0
+    private var objectLiteralCounter = 0
+
     private val currentComplexity: ComplexityValue
         get() = complexityStack[0]
 
@@ -136,7 +139,13 @@ class KotlinComplexityListener(val source: Source, entry: Map.Entry<String, Stri
                 it.last().text
             }
         }
-        val longName = "$name($parameters)${returnType?.let { ":$returnType" } ?: ""}"
+        val longName = ("$name($parameters)${returnType?.let { ":$returnType" } ?: ""}").let {
+            if (anonymousClassDepth > 0) {
+                "${it}${"$"}$objectLiteralCounter"
+            } else {
+                it
+            }
+        }
 
         enterMethodOrConstructor(
             longName,
@@ -168,24 +177,36 @@ class KotlinComplexityListener(val source: Source, entry: Map.Entry<String, Stri
 
     // ||
     override fun enterDisjunction(ctx: KotlinParser.DisjunctionContext) {
-        if (!ctx.text.contains("||")) return
-        if (ctx.text.contains("(") || ctx.text.contains(")")) return
+        if (!ctx.text.contains("||")) {
+            return
+        }
+        if (ctx.text.contains("(") || ctx.text.contains(")")) {
+            return
+        }
         require(complexityStack.isNotEmpty())
         currentComplexity.complexity++
     }
 
     // &&
     override fun enterConjunction(ctx: KotlinParser.ConjunctionContext) {
-        if (!ctx.text.contains("&&")) return
-        if (ctx.text.contains("(") || ctx.text.contains(")")) return
+        if (!ctx.text.contains("&&")) {
+            return
+        }
+        if (ctx.text.contains("(") || ctx.text.contains(")")) {
+            return
+        }
         require(complexityStack.isNotEmpty())
         currentComplexity.complexity++
     }
 
     // ?:
     override fun enterElvisExpression(ctx: KotlinParser.ElvisExpressionContext) {
-        if (!ctx.text.contains("?:")) return
-        if (ctx.text.contains("(") || ctx.text.contains(")")) return
+        if (!ctx.text.contains("?:")) {
+            return
+        }
+        if (ctx.text.contains("(") || ctx.text.contains(")")) {
+            return
+        }
         require(complexityStack.isNotEmpty())
         currentComplexity.complexity++
     }
@@ -199,7 +220,9 @@ class KotlinComplexityListener(val source: Source, entry: Map.Entry<String, Stri
 
     // if & else if
     override fun enterIfExpression(ctx: KotlinParser.IfExpressionContext) {
-        if (!ctx.text.contains("if")) return
+        if (!ctx.text.contains("if")) {
+            return
+        }
         require(complexityStack.isNotEmpty())
         currentComplexity.complexity++
     }
@@ -224,18 +247,35 @@ class KotlinComplexityListener(val source: Source, entry: Map.Entry<String, Stri
 
     // ?.
     override fun enterMemberAccessOperator(ctx: KotlinParser.MemberAccessOperatorContext) {
-        if (ctx.text != "?.") return
+        if (ctx.text != "?.") {
+            return
+        }
         require(complexityStack.isNotEmpty())
         currentComplexity.complexity++
     }
 
     // !!.
     override fun enterPostfixUnaryOperation(ctx: KotlinParser.PostfixUnaryOperationContext) {
-        if (ctx.text != "!!") return
+        if (ctx.text != "!!") {
+            return
+        }
         require(complexityStack.isNotEmpty())
         currentComplexity.complexity++
     }
 
+    override fun enterObjectLiteral(ctx: KotlinParser.ObjectLiteralContext) {
+        if (ctx.classBody() != null) {
+            anonymousClassDepth++
+            objectLiteralCounter++
+        }
+    }
+
+    override fun exitObjectLiteral(ctx: KotlinParser.ObjectLiteralContext) {
+        if (ctx.classBody() != null) {
+            anonymousClassDepth--
+        }
+    }
+
     init {
         ParseTreeWalker.DEFAULT.walk(this, source.getParsed(fileName).tree)
     }

core/src/main/kotlin/Sandbox.kt

@@ -351,6 +351,7 @@ object Sandbox {
                     confinedTask.truncatedLines,
                     executionArguments
                 )
+                @Suppress("ThrowingExceptionsWithoutMessageOrCause")
                 runBlocking { resultChannel.send(ExecutorResult(executionResult, Exception())) }
             } catch (e: Throwable) {
                 runBlocking { resultChannel.send(ExecutorResult(null, e)) }
@@ -1304,7 +1305,7 @@ object Sandbox {
 
     @JvmStatic
     fun redirectOutput(block: () -> Any?): JeedOutputCapture {
-        val confinedTask = confinedTaskByThreadGroup() ?: check { "should only be used from a confined task" }
+        val confinedTask = confinedTaskByThreadGroup() ?: error("should only be used from a confined task")
         check(!confinedTask.redirectingOutput) { "can't nest calls to redirectOutput" }
 
         confinedTask.redirectingOutput = true
@@ -1361,7 +1362,7 @@ object Sandbox {
      * But the result is that you have to implement the entire PrintStream public API. Leaving anything out means that
      * stuff doesn't get forwarded, and we have to make sure that nothing is shared.
      *
-     * Hence this sadness.
+     * Hence, this sadness.
      *
      * PS: also fuck you Java for leaving me no choice but to resort to this. There are a half-dozen different terrible
      * design decisions that led us to this place. Please do better next time.
@@ -1550,7 +1551,7 @@ object Sandbox {
 
         System.setOut(RedirectingPrintStream(TaskResults.OutputLine.Console.STDOUT))
         System.setErr(RedirectingPrintStream(TaskResults.OutputLine.Console.STDERR))
-        // Try to silence ThreadDeath error messages. Not sure this works but it can't hurt.
+        // Try to silence ThreadDeath error messages. Not sure if this works, but it can't hurt.
         // Thread.setDefaultUncaughtExceptionHandler { _, _ -> }
 
         threadPool = Executors.newFixedThreadPool(size)

core/src/main/kotlin/Snippet.kt

@@ -287,7 +287,7 @@ ${" ".repeat(snippetArguments.indent * 2)}@JvmStatic fun main() {""".lines().let
         SnippetTransformationError(
             SourceLocation(
                 SNIPPET_SOURCE,
-                looseCodeMapping[it.line] ?: require { "Missing loose code mapping " },
+                looseCodeMapping[it.line] ?: error("Missing loose code mapping"),
                 it.charPositionInLine
             ),
             "return statements not allowed at top level in snippets"

core/src/main/kotlin/Source.kt

@@ -113,7 +113,7 @@ open class Source(
             )
         }?.joinToString(separator = "") {
             String.format(Locale.US, "%02x", it)
-        } ?: require { "Problem computing hash" }
+        } ?: error("Problem computing hash")
     }
 
     override fun equals(other: Any?): Boolean {
@@ -136,7 +136,7 @@ open class Source(
             return when (val extension = filename.split("/").last().split(".").last()) {
                 "java" -> FileType.JAVA
                 "kt" -> FileType.KOTLIN
-                else -> require { "invalid extension: $extension" }
+                else -> error("invalid extension: $extension")
             }
         }
 
@@ -293,19 +293,6 @@ fun Method.getQualifiedName(): String {
     return "$name(${parameters.joinToString(separator = ", ")})"
 }
 
-// Overloads of built-in functions that can be used to the right of Elvis operators
-fun assert(block: () -> String): Nothing {
-    throw AssertionError(block())
-}
-
-fun check(block: () -> String): Nothing {
-    throw IllegalStateException(block())
-}
-
-fun require(block: () -> String): Nothing {
-    throw IllegalArgumentException(block())
-}
-
 class SourceMappingException(message: String) : Exception(message)
 
 fun Source.FileType.extension() = when {

core/src/main/kotlin/Template.kt

@@ -91,7 +91,7 @@ fun Source.Companion.fromTemplates(sourceMap: Map<String, String>, templateMap:
         } catch (e: HandlebarsException) {
             templatingErrors.add(TemplatingError(templateName, e.error.line, e.error.column, e.error.message))
             return@mapValues ""
-        } ?: assert { "should have created a template" }
+        } ?: error("should have created a template")
 
         try {
             val indentedSource = source.lines().mapIndexed { i, line ->

core/src/main/resources/edu.illinois.cs.cs125.jeed.core.version

@@ -1 +1 @@
-version=2021.10.0
+version=2021.10.1

core/src/test/kotlin/TestJavaComplexity.kt

@@ -192,13 +192,17 @@ interface Simple {
 interface Test {
   void test();
 }
-Test test = new Test() {
+Test first = new Test() {
+  @Override
+  public void test() { }
+};
+Test second = new Test() {
   @Override
   public void test() { }
 };
             """.trim()
         ).complexity().also {
-            it.lookup(".", "").complexity shouldBe 2
+            it.lookup(".", "").complexity shouldBe 3
         }
     }
     "should not fail on generic methods" {

core/src/test/kotlin/TestKotlinComplexity.kt

@@ -592,6 +592,20 @@ fun main2(first: Int, second: String, third: Blah?): Int {
             it.lookupFile("Main.kt") shouldBe 2
         }
     }
+    "should handle multiple anonymous classes" {
+        Source.fromKotlin(
+            """
+interface Adder {
+  fun addTo(value: Int): Int
+}
+val addOne = object : Adder {
+  override fun addTo(value: Int) = value + 1
+}
+val addEight = object : Adder {
+  override fun addTo(value: Int) = value + 8
+}""".trim()
+        ).complexity()
+    }
     "should not overflow on deep nesting" {
         shouldThrow<ComplexityFailed> {
             Source.fromKotlin(

server/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
     kotlin("kapt")
     application
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "7.0.0"
+    id("com.github.johnrengelman.shadow") version "7.1.0"
     id("com.palantir.docker") version "0.30.0"
     id("org.jmailen.kotlinter")
     id("io.gitlab.arturbosch.detekt")

server/src/main/resources/edu.illinois.cs.cs125.jeed.server.version

@@ -1 +1 @@
-version=2021.10.0
+version=2021.10.1