Merge pull request #745 from zhelenskiy/fir-extended-checkers

Fir extended checkers

Author: zoobestik

common/src/main/kotlin/component/KotlinEnvironment.kt

@@ -48,7 +48,9 @@ class KotlinEnvironment(
       "-opt-in=kotlin.contracts.ExperimentalContracts",
       "-opt-in=kotlin.experimental.ExperimentalTypeInference",
       "-Xcontext-receivers",
-      "-XXLanguage:+ExplicitBackingFields"
+      "-Xreport-all-warnings",
+      "-Xuse-fir-extended-checkers",
+      "-XXLanguage:+ExplicitBackingFields",
     )
   }
 

src/main/kotlin/com/compiler/server/compiler/components/CliUtils.kt

@@ -12,8 +12,8 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation
 import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
 import org.jetbrains.kotlin.psi.KtFile
+import java.io.File
 import java.nio.file.Path
-import java.nio.file.Paths
 import java.util.*
 import kotlin.io.path.*
 
@@ -126,7 +126,7 @@ fun <T> usingTempDirectory(action: (path: Path) -> T): T {
 private fun getTempDirectory(): Path {
   val dir = System.getProperty("java.io.tmpdir")
   val sessionId = UUID.randomUUID().toString().replace("-", "")
-  return Paths.get(dir, sessionId)
+  return File(dir).canonicalFile.resolve(sessionId).toPath()
 }
 
 fun List<KtFile>.writeToIoFiles(inputDir: Path): List<Path> {
@@ -137,4 +137,4 @@ fun List<KtFile>.writeToIoFiles(inputDir: Path): List<Path> {
   return ioFiles
 }
 
-val PATH_SEPARATOR: String = java.io.File.pathSeparator
+val PATH_SEPARATOR: String = File.pathSeparator

src/main/kotlin/com/compiler/server/compiler/components/KotlinToJSTranslator.kt

@@ -94,6 +94,8 @@ class KotlinToJSTranslator(
         val filePaths = ioFiles.map { it.toFile().canonicalPath }
         val klibPath = (outputDir / "klib").toFile().canonicalPath
         val additionalCompilerArgumentsForKLib = listOf(
+          "-Xreport-all-warnings",
+          "-Xuse-fir-extended-checkers",
           "-Xir-only",
           "-Xir-produce-klib-dir",
           "-libraries=${kotlinEnvironment.JS_LIBRARIES.joinToString(PATH_SEPARATOR)}",
@@ -103,6 +105,8 @@ class KotlinToJSTranslator(
         k2JsIrCompiler.tryCompilation(inputDir, ioFiles, filePaths + additionalCompilerArgumentsForKLib)
           .flatMap {
             k2JsIrCompiler.tryCompilation(inputDir, ioFiles, listOf(
+              "-Xreport-all-warnings",
+              "-Xuse-fir-extended-checkers",
               "-Xir-only",
               "-Xir-produce-js",
               "-Xir-dce",
@@ -152,6 +156,8 @@ class KotlinToJSTranslator(
                   }
               } ?: emptyList()
           val additionalCompilerArgumentsForKLib: List<String> = listOf(
+            "-Xreport-all-warnings",
+          "-Xuse-fir-extended-checkers",
           "-Xwasm",
           "-Xir-produce-klib-dir",
           "-libraries=${dependencies.joinToString(PATH_SEPARATOR)}",
@@ -162,6 +168,8 @@ class KotlinToJSTranslator(
         k2JsIrCompiler.tryCompilation(inputDir, ioFiles, filePaths + additionalCompilerArgumentsForKLib)
           .flatMap {
             k2JsIrCompiler.tryCompilation(inputDir, ioFiles, listOf(
+              "-Xreport-all-warnings",
+              "-Xuse-fir-extended-checkers",
               "-Xwasm",
               "-Xwasm-generate-wat",
               "-Xir-produce-js",

src/test/kotlin/com/compiler/server/HighlightTest.kt

@@ -4,7 +4,6 @@ import com.compiler.server.base.BaseExecutorTest
 import com.compiler.server.base.errorContains
 import com.compiler.server.base.warningContains
 import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 
 class HighlightTest : BaseExecutorTest() {
@@ -27,22 +26,22 @@ class HighlightTest : BaseExecutorTest() {
     Assertions.assertTrue(highlights.isEmpty())
   }
 
-  @Test @Disabled
+  @Test
   fun `base highlight unused variable`() {
     val highlights = highlight("fun main() {\n\tval a = \"d\"\n}")
-    warningContains(highlights, "Variable 'a' is never used")
+    warningContains(highlights, "Variable is unused")
   }
 
-  @Test @Disabled
+  @Test
   fun `base highlight unused variable js`() {
     val highlights = highlightJS("fun main() {\n\tval a = \"d\"\n}")
-    warningContains(highlights, "Variable 'a' is never used")
+    warningContains(highlights, "Variable is unused")
   }
 
-  @Test @Disabled
+  @Test
   fun `base highlight unused variable wasm`() {
     val highlights = highlightWasm("fun main() {\n\tval a = \"d\"\n}")
-    warningContains(highlights, "Variable 'a' is never used")
+    warningContains(highlights, "Variable is unused")
   }
 
   @Test

src/test/kotlin/com/compiler/server/JvmRunnerTest.kt

@@ -107,4 +107,33 @@ class JvmRunnerTest : BaseExecutorTest() {
       result.compilerDiagnostics[0].message
     )
   }
+
+  @Test
+  fun `warnings after exception`() {
+    // language=kotlin
+    val result = run(
+      """
+        fun main() {
+          println("")g
+          var someVar = 1
+        }
+      """.trimIndent(), ""
+    )
+
+    assertContains(result.compilerDiagnostics.map { it.message }, "Variable is unused.")
+  }
+
+  @Test
+  fun `warnings without exception`() {
+    // language=kotlin
+    val result = run(
+      """
+        fun main() {
+          println("")
+          var someVar = 1
+        }
+      """.trimIndent(), "")
+
+    assertContains(result.compilerDiagnostics.map { it.message }, "Variable is unused.")
+  }
 }

src/test/kotlin/com/compiler/server/ResourceE2ECompileTest.kt

@@ -1,10 +1,8 @@
 package com.compiler.server
 
 import com.compiler.server.generator.generateSingleProject
-import com.compiler.server.model.ExecutionResult
-import com.compiler.server.model.ProjectType
+import com.compiler.server.model.*
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.test.context.SpringBootTest
@@ -34,15 +32,21 @@ class ResourceE2ECompileTest : BaseResourceCompileTest {
             generateSingleProject(code, projectType = platform)
         )
 
+        val resultClass = when (platform) {
+            ProjectType.JUNIT -> JunitExecutionResult::class.java
+            ProjectType.JAVA -> JvmExecutionResult::class.java
+            ProjectType.JS, ProjectType.CANVAS, ProjectType.JS_IR -> TranslationJSResult::class.java
+            ProjectType.WASM, ProjectType.COMPOSE_WASM -> TranslationWasmResult::class.java
+        }
         val result = RestTemplate().postForObject(
-            "${getHost()}$url", HttpEntity(body, headers), ExecutionResult::class.java
+            "${getHost()}$url", HttpEntity(body, headers), resultClass
         )
 
         return result ?:
             throw IllegalStateException("Result is null")
     }
 
-    @Test @Disabled
+    @Test
     fun `http requests from resource folder`() {
         checkResourceExamples(listOf(testDirJVM, testDirJS)) { result, file ->
             val json = jacksonObjectMapper().writeValueAsString(result)
@@ -89,5 +93,6 @@ private fun File.isInconsistentOutput(): Boolean {
         ".inWholeNanoseconds",
         " measureTime {",
         " measureTimedValue {",
+        "LocalDate.now()",
     ).any { code.contains(it) }
 }

src/test/resources/test-compile-data/jvm/kotlin-web-site/basic-syntax/5ec261721162729866abc1e8f7293ef4.29.kt

@@ -10,11 +10,13 @@ fun getStringLength(obj: Any): Int? {
 }
 //sampleEnd
 
+data object Some
+
 fun main() {
     fun printLength(obj: Any) {
         println("Getting the length of '$obj'. Result: ${getStringLength(obj) ?: "Error: The object is not a string"} ")
     }
     printLength("Incomprehensibilities")
     printLength(1000)
-    printLength(listOf(Any()))
+    printLength(listOf(Some))
 }

src/test/resources/test-compile-data/jvm/kotlin-web-site/basic-syntax/5ec261721162729866abc1e8f7293ef4.30.kt

@@ -7,11 +7,13 @@ fun getStringLength(obj: Any): Int? {
 }
 //sampleEnd
 
+data object Some
+
 fun main() {
     fun printLength(obj: Any) {
         println("Getting the length of '$obj'. Result: ${getStringLength(obj) ?: "Error: The object is not a string"} ")
     }
     printLength("Incomprehensibilities")
     printLength(1000)
-    printLength(listOf(Any()))
+    printLength(listOf(Some))
 }

src/test/resources/test-compile-data/jvm/kotlin-web-site/java-to-kotlin-collections-guide/57cc463d64510535f01862401a66c55d.7.kt

@@ -1,4 +1,4 @@
-class Request(
+data class Request(
     val url: String,
     val responseCode: Int
 )

src/test/resources/test-compile-data/jvm/kotlin-web-site/whatsnew11/8ca7b9291f3de4ce4943237efbe85652.20.kt

@@ -1,7 +1,7 @@
 fun main(args: Array<String>) {
 //sampleStart
     val array = arrayOf("a", "b", "c")
-    println(array.toString())  // JVM implementation: type-and-hash gibberish
+    println(array.toString().substringBefore('@'))  // JVM implementation: type-and-hash gibberish
     println(array.contentToString())  // nicely formatted as list
 //sampleEnd
 }