(WIP) fix for Windows

SonarSource · Nov 27, 2024 · 8f4117e · 8f4117e
1 parent aa6621d
commit 8f4117e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sonar-kotlin-api/src/main/java/org/sonarsource/kotlin/api/frontend/KotlinTree.kt b/sonar-kotlin-api/src/main/java/org/sonarsource/kotlin/api/frontend/KotlinTree.kt
@@ -20,6 +20,7 @@
 package org.sonarsource.kotlin.api.frontend
 
 import com.intellij.openapi.editor.Document
+import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiErrorElement
 import com.intellij.psi.PsiFile
@@ -45,11 +46,10 @@ data class KotlinSyntaxStructure(val ktFile: KtFile, val document: Document, val
         fun of(content: String, environment: Environment, inputFile: InputFile): KotlinSyntaxStructure {
 
             val psiFile: KtFile = if (environment.k2session != null) {
-                // FIXME quick hack
+                val inputFilePath = FileUtil.toSystemIndependentName(inputFile.file().path)
                 environment.k2session!!.modulesWithFiles.values.first()
                     .find {
-                        // FIXME fails on Windows?
-                        it.virtualFile.path == inputFile.uri().path
+                        it.virtualFile.path == inputFilePath
                     } as KtFile
             } else
                 environment.ktPsiFactory.createFile(inputFile.uri().path, normalizeEol(content))

diff --git a/sonar-kotlin-test-api/src/main/java/org/sonarsource/kotlin/testapi/KotlinVerifier.kt b/sonar-kotlin-test-api/src/main/java/org/sonarsource/kotlin/testapi/KotlinVerifier.kt
@@ -80,7 +80,7 @@ class KotlinVerifier(private val check: AbstractCheck) {
         )
         val converter = { content: String ->
             val inputFile = TestInputFileBuilder("moduleKey", filePath.fileName.pathString)
-//                .setModuleBaseDir(filePath.parent) // otherwise projectKey "moduleKey" leaks into absolutePath
+                .setModuleBaseDir(filePath.parent) // otherwise projectKey "moduleKey" leaks into absolutePath
                 .setCharset(StandardCharsets.UTF_8)
                 .initMetadata(content).build()