fixes

Author: Arseniy Volynets

clion-plugin/.run/Run IDE with Plugin.run.xml

@@ -5,7 +5,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
+      <option name="scriptParameters" value="--info" />
       <option name="taskDescriptions">
         <list />
       </option>

clion-plugin/build.gradle.kts

@@ -35,7 +35,7 @@ plugins {
     // Kotlin support
     id("org.jetbrains.kotlin.jvm") version "1.6.10"
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.4.0"
+    id("org.jetbrains.intellij") version "1.5.2"
     // Gradle Changelog Plugin
     id("org.jetbrains.changelog") version "1.3.0"
     // Gradle Qodana Plugin

clion-plugin/gradle.properties

@@ -8,14 +8,14 @@ pluginVersion = 0.0.1
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild = 203
-pluginUntilBuild = 221.*
+pluginUntilBuild = 222.*
 
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
-pluginVerifierIdeVersions = CL-2021.3.3
+pluginVerifierIdeVersions = CL-2022.2
 
 platformType = CL
-platformVersion = 2021.3.3
+platformVersion = 2022.1
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/handlers/CoverageAndResultsHandler.kt

@@ -69,10 +69,10 @@ class CoverageAndResultsHandler(
 
     private fun logCoverageResponse(response: Testgen.CoverageAndResultsResponse) {
         if (response.errorMessage.isNotEmpty())
-            logger.warn(response.errorMessage)
+            project.logger.warn { response.errorMessage }
         if (response.coveragesList.isEmpty())
-            logger.error("No coverage received from server!")
-        logger.trace("coverage list: \n${response.coveragesList}")
+            project.logger.error { "No coverage received from server!" }
+        project.logger.trace {  "coverage list: \n${response.coveragesList}" }
     }
 
     private fun notifyCoverageReceived() {

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/coverage/UTBotCoverageEngine.kt

@@ -15,6 +15,7 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
+import org.apache.commons.io.FilenameUtils
 import org.utbot.cpp.clion.plugin.utils.isCPPorCFileName
 import java.io.File
 
@@ -112,7 +113,7 @@ class UTBotCoverageEngine : CoverageEngine() {
      */
     override fun getQualifiedNames(sourceFile: PsiFile): MutableSet<String> {
         return sourceFile.virtualFile?.path?.let {
-            mutableSetOf(UTBotCoverageRunner.provideQualifiedNameForFile(it))
+            mutableSetOf(UTBotCoverageRunner.provideQualifiedNameForFile(FilenameUtils.separatorsToSystem(it)))
         } ?: mutableSetOf()
     }
 

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/coverage/UTBotCoverageRunner.kt

@@ -46,19 +46,20 @@ class UTBotCoverageRunner : CoverageRunner() {
                 }
                 val linesCount = getLineCount(localFilePath)
                 val lines = arrayOfNulls<LineData>(linesCount)
-                val classData = projectData.getOrCreateClassData(provideQualifiedNameForFile(localFilePath.toAbsolutePath().toString()))
+                val classData = projectData.getOrCreateClassData(provideQualifiedNameForFile(localFilePath.toString()))
                 fun processRanges(rangesList: List<Testgen.SourceLine?>, status: Byte) {
                     rangesList.filterNotNull().forEach { sourceLine ->
-                            val numberInFile = sourceLine.line - 1
-                            if (numberInFile >= linesCount) {
-                                log.warn("Skipping $localFilePath:${numberInFile} in coverage processing! Number of lines in file is $linesCount!")
-                                return@forEach
-                            }
-                            val lineData = LineData(sourceLine.line + 1, null)
-                            lineData.hits = status.toInt()
-                            lineData.setStatus(status)
-                            lines[numberInFile] = lineData
-                            classData.registerMethodSignature(lineData)
+                        val numberInFile = sourceLine.line - 1
+                        if (numberInFile >= linesCount) {
+                            log.warn("Skipping $localFilePath:${numberInFile} in coverage processing! Number of lines in file is $linesCount!")
+                            return@forEach
+                        }
+                        val lineData = LineData(sourceLine.line + 1, null)
+                        lineData.hits = status.toInt()
+                        lineData.setStatus(status)
+                        // todo: leave comments what is going on
+                        lines[numberInFile + 1] = lineData
+                        classData.registerMethodSignature(lineData)
                     }
                 }
                 processRanges(simplifiedCovInfo.fullCoverageLinesList, LineCoverage.FULL)

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/sourceFoldersView/UTBotProjectViewPane.kt

@@ -9,6 +9,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFileSystemItem
 import org.utbot.cpp.clion.plugin.listeners.SourceFoldersListener
 import org.utbot.cpp.clion.plugin.settings.settings
+import org.utbot.cpp.clion.plugin.utils.localPath
 import javax.swing.tree.DefaultTreeModel
 
 open class UTBotProjectViewPane(project: Project) : ProjectViewPane(project) {
@@ -27,7 +28,7 @@ open class UTBotProjectViewPane(project: Project) : ProjectViewPane(project) {
 
     override fun getWeight(): Int = 5
 
-    // required by IJ api, but not used. Otherwise there are exceptions
+    // required by IJ api, but not used. Otherwise, there are exceptions
     override fun createSelectInTarget(): SelectInTarget {
         return object : ProjectPaneSelectInTarget(myProject) {
             override fun toString(): String = "UTBot: Directories"
@@ -43,7 +44,7 @@ open class UTBotProjectViewPane(project: Project) : ProjectViewPane(project) {
     override fun createStructure() = object : AbstractProjectTreeStructure(myProject) {
         // replace directory nodes with our UTBotNodes, which check source dirs during node.update
         override fun getProviders() = listOf(
-            UTBotTreeStructureProvider(isMarked = { dir -> dir.virtualFile.path in myProject.settings.storedSettings.sourceDirs })
+            UTBotTreeStructureProvider(isMarked = { dir -> dir.virtualFile.localPath.toString() in myProject.settings.storedSettings.sourceDirs })
         )
     }
 }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/sourceFoldersView/UTBotProjectViewPaneForSettings.kt

@@ -6,6 +6,7 @@ import com.intellij.openapi.project.Project
 import org.utbot.cpp.clion.plugin.settings.UTBotProjectStoredSettings
 import org.utbot.cpp.clion.plugin.settings.settings
 import org.utbot.cpp.clion.plugin.ui.wizard.steps.ObservableValue
+import org.utbot.cpp.clion.plugin.utils.localPath
 import javax.swing.tree.DefaultTreeModel
 
 open class UTBotProjectViewPaneForSettings(project: Project) : UTBotProjectViewPane(project) {
@@ -44,6 +45,6 @@ open class UTBotProjectViewPaneForSettings(project: Project) : UTBotProjectViewP
     fun isModified() = settings.sourceDirs != sourceDirs.value
 
     override fun createStructure() = object : AbstractProjectTreeStructure(myProject) {
-        override fun getProviders() = listOf(UTBotTreeStructureProvider(isMarked = { dir -> dir.virtualFile.path in sourceDirs.value}))
+        override fun getProviders() = listOf(UTBotTreeStructureProvider(isMarked = { dir -> dir.virtualFile.localPath.toString() in sourceDirs.value}))
     }
 }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/sourceFoldersView/Updater.kt

@@ -1,6 +1,7 @@
 package org.utbot.cpp.clion.plugin.ui.sourceFoldersView
 
 import com.intellij.psi.PsiDirectory
+import org.utbot.cpp.clion.plugin.utils.localPath
 import org.utbot.cpp.clion.plugin.utils.visitAllDirectories
 
 interface DirectoriesStatusUpdater {
@@ -22,7 +23,7 @@ abstract class BaseUpdater(private val selectedDirectories: List<PsiDirectory>)
     override fun toggle() {
         val currentlyMarked = getCurrentMarkedDirs()
         selectedDirectories.partition {
-            it.virtualFile.path in currentlyMarked
+            it.virtualFile.localPath.toString() in currentlyMarked
         }.also {
             setCurrentMarkedDirs(currentlyMarked.removeDirectoriesRecursively(it.first).addDirectoriesRecursively(it.second))
         }
@@ -32,8 +33,8 @@ abstract class BaseUpdater(private val selectedDirectories: List<PsiDirectory>)
     private fun Set<String>.addDirectoriesRecursively(dirsToAdd: List<PsiDirectory>): Set<String> {
         val newSourceFolders = this.toMutableSet()
         dirsToAdd.forEach { dir ->
-            newSourceFolders.add(dir.virtualFile.path)
-            dir.virtualFile.toNioPath().visitAllDirectories {
+            newSourceFolders.add(dir.virtualFile.localPath.toString())
+            dir.virtualFile.localPath.visitAllDirectories {
                 newSourceFolders.add(it.toString())
             }
         }
@@ -44,8 +45,8 @@ abstract class BaseUpdater(private val selectedDirectories: List<PsiDirectory>)
     private fun Set<String>.removeDirectoriesRecursively(dirsToRemove: List<PsiDirectory>): Set<String> {
         val newSourceFolders = this.toMutableSet()
         dirsToRemove.forEach { dir ->
-            newSourceFolders.add(dir.virtualFile.path)
-            dir.virtualFile.toNioPath().visitAllDirectories {
+            newSourceFolders.add(dir.virtualFile.localPath.toString())
+            dir.virtualFile.localPath.visitAllDirectories {
                 newSourceFolders.remove(it.toString())
             }
         }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/targetsToolWindow/UTBotTargetsController.kt

@@ -100,8 +100,9 @@ class UTBotTargetsController(val project: Project) {
             connection.subscribe(
                 UTBotSettingsChangedListener.TOPIC,
                 UTBotSettingsChangedListener {
-                    val possiblyNewTargetPath = settings.storedSettings.targetPath
-                    addTargetPathIfNotPresent(possiblyNewTargetPath)
+                    // todo: remove custom target
+                    // val possiblyNewTargetPath = settings.storedSettings.targetPath
+                    // addTargetPathIfNotPresent(possiblyNewTargetPath)
                 })
             // when we reconnected to server, the targets should be updated, so we request them from server
             connection.subscribe(

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/utils/PathUtils.kt

@@ -1,6 +1,7 @@
 package org.utbot.cpp.clion.plugin.utils
 
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VirtualFile
 import org.apache.commons.io.FilenameUtils
 import org.utbot.cpp.clion.plugin.settings.settings
 import java.nio.file.FileVisitResult
@@ -156,5 +157,8 @@ private fun removeSuffix(path: Path, suffix: String): Path {
     )
 }
 
+val VirtualFile.localPath: Path get() = this.fileSystem.getNioPath(this) ?: error("Could not get filesystem path from $this")
+
+
 private const val DOT_SEP = "_dot_"
 private const val TEST_SUFFIX = "_test"