Fix complexity calculation.

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

@@ -1 +1 @@
-version=2021.6.6
+version=2021.6.7

core/src/main/kotlin/KotlinComplexity.kt

@@ -26,7 +26,7 @@ class KotlinComplexityListener(val source: Source, entry: Map.Entry<String, Stri
         } else {
             ClassComplexity(
                 name,
-                SourceRange(name, source.mapLocation(name, start), source.mapLocation(name, end))
+                SourceRange(fileName, source.mapLocation(fileName, start), source.mapLocation(fileName, end))
             )
         }
         if (complexityStack.isNotEmpty()) {
@@ -193,7 +193,8 @@ class KotlinComplexityListener(val source: Source, entry: Map.Entry<String, Stri
     // lambdas and throws
     override fun enterFunctionLiteral(ctx: KotlinParser.FunctionLiteralContext) {
         require(complexityStack.isNotEmpty())
-        currentComplexity.complexity++
+        // TODO: For Ben to rethink...
+        // currentComplexity.complexity++
     }
 
     // if & else if

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

@@ -1 +1 @@
-version=2021.6.6
+version=2021.6.7

core/src/test/kotlin/TestKotlinComplexity.kt

@@ -19,6 +19,23 @@ fun main(first: Int, second: String, third: Blah?): Int {
         }
     }
 
+    "should compute complexity for Kotlin snippet" {
+        Source.fromSnippet(
+            """
+class Dog(val name: String)
+
+listOf(Dog("Shadow"), Dog("Chuchu"), Dog("Lulu"))
+  .map { it.name }
+  .sorted()
+  .forEach { println(it) }
+""".trim(), SnippetArguments(fileType = Source.FileType.KOTLIN)
+        ).also {
+            println(it.rewrittenSource)
+        }.complexity().also {
+            it.lookup("", "").complexity shouldBe 1
+        }
+    }
+
     "should compute complexity from sources map" {
         Source(
             mapOf(
@@ -349,7 +366,7 @@ class PingPonger constructor(private var state: String) {
                 """.trim()
             )
         ).complexity().also {
-            it.lookup("PingPonger", "Test.kt").complexity shouldBe 7
+            it.lookup("PingPonger", "Test.kt").complexity shouldBe 5
         }
     }
 
@@ -524,7 +541,7 @@ fun main() {
 }
             """.trim()
         ).complexity().also {
-            it.lookup("main()", "Main.kt").complexity shouldBe 5
+            it.lookup("main()", "Main.kt").complexity shouldBe 2
         }
     }
 
@@ -539,7 +556,7 @@ fun main() {
 }
             """.trim()
         ).complexity().also {
-            it.lookup("main()", "Main.kt").complexity shouldBe 2
+            it.lookup("main()", "Main.kt").complexity shouldBe 1
         }
     }