Fix line count issue.

cs125-illinois · Jan 24, 2022 · 480d53b · 480d53b
1 parent eb5f379
commit 480d53b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 subprojects {
     group = "com.github.cs125-illinois.questioner"
-    version = "2022.1.3"
+    version = "2022.1.4"
     tasks.withType<KotlinCompile> {
         kotlinOptions {
             jvmTarget = JavaVersion.VERSION_16.toString()

diff --git a/lib/src/main/kotlin/Question.kt b/lib/src/main/kotlin/Question.kt
@@ -49,7 +49,7 @@ data class Question(
     val importWhitelist: Set<String>,
     val importBlacklist: Set<String>,
     val slug: String,
-    val kotlinSolution: FlatFile? = alternativeSolutions.find { it.language == Language.kotlin },
+    val kotlinSolution: FlatFile?,
     val detemplatedJavaStarter: String? = incorrect.find { it.language == Language.java && it.starter }?.contents,
     val detemplatedKotlinStarter: String? = incorrect.find { it.language == Language.kotlin && it.starter }?.contents,
     val hasKotlin: Boolean =

diff --git a/lib/src/main/kotlin/QuestionHelpers.kt b/lib/src/main/kotlin/QuestionHelpers.kt
@@ -299,11 +299,7 @@ fun Question.computeComplexity(contents: String, language: Question.Language): T
 }
 
 fun Question.computeLineCounts(contents: String, language: Question.Language): TestResults.LineCountComparison {
-    val solutionLineCount = if (language == Question.Language.java) {
-        correct.lineCount
-    } else {
-        alternativeSolutions.filter { it.language == language }.mapNotNull { it.lineCount }.minByOrNull { it.source }
-    }
+    val solutionLineCount = published.lineCounts[language]
     check(solutionLineCount != null) { "Solution line count not available" }
     val type = when (language) {
         Question.Language.java -> Source.FileType.JAVA

diff --git a/plugin/src/main/kotlin/save/SaveQuestions.kt b/plugin/src/main/kotlin/save/SaveQuestions.kt
@@ -429,7 +429,8 @@ fun List<ParsedJavaFile>.findQuestions(
                 kotlinTemplate,
                 solution.whitelist.toSet(),
                 solution.blacklist.toSet(),
-                solution.correct.path ?: slugify.slugify(solution.correct.name)
+                solution.correct.path ?: slugify.slugify(solution.correct.name),
+                kotlinSolution?.toAlternateFile(kotlinCleanSpec)
             )
         } catch (e: Exception) {
             throw Exception("Process ${solution.path} failed: $e", e)

diff --git a/server/src/main/resources/edu.illinois.cs.cs125.questioner.server.version b/server/src/main/resources/edu.illinois.cs.cs125.questioner.server.version
@@ -1 +1 @@
-version=2022.1.3
+version=2022.1.4