Rider plugin 223 (#2064)

* [utbot-rider]
1. Removed unnecessary SolutionComponents
2. ProjectPublisher now cancels correctly
3. ProjectPublisher correctly spawn publishing process
4. VSharp type loading fixes, this allows generating tests for Rider SDK classes
5. Assemblies now resolve from Rider-provided set of assemblies
6. Removed VSharp log directories after test generation
7. Correctly checks for overloads in method
8. Bumped minimum compatible version to .NET 7

* [utbot-rider]
1. Bumped rd version to 2022.3.3
2. Rider plugin now shows consoles for publish and vsharp processes
3. Rider version is targeting 223
4. Introduced UtBotRiderModel, which available when includeRiderInBuild=true. It copies rider-model.jar to generate necessary files

* [utbot-rider]
Changes.xml

* [utbot-rider]
review fixes

* [utbot-rider]
Review fix

Author: Domonion

gradle.properties

@@ -41,7 +41,7 @@ intellijPluginVersion=1.13.1
 # every time you bump rd version:
 # 1. regenerate all models
 # 2. check if rider plugin works
-rdVersion=2022.2.1
+rdVersion=2022.3.3
 # to enable - add -PincludeRiderInBuild=true in build CLI
 includeRiderInBuild=false
 jacocoVersion=0.8.8

utbot-framework/src/main/kotlin/org/utbot/framework/process/generated/EngineProcessModel.Generated.kt

@@ -65,10 +65,7 @@ class EngineProcessModel private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): EngineProcessModel  {
             EngineProcessRoot.register(protocol.serializers)
 
-            return EngineProcessModel().apply {
-                identify(protocol.identity, RdId.Null.mix("EngineProcessModel"))
-                bind(lifetime, protocol, "EngineProcessModel")
-            }
+            return EngineProcessModel()
         }
 
 

utbot-framework/src/main/kotlin/org/utbot/framework/process/generated/RdInstrumenterAdapter.Generated.kt

@@ -42,10 +42,7 @@ class RdInstrumenterAdapter private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): RdInstrumenterAdapter  {
             EngineProcessRoot.register(protocol.serializers)
 
-            return RdInstrumenterAdapter().apply {
-                identify(protocol.identity, RdId.Null.mix("RdInstrumenterAdapter"))
-                bind(lifetime, protocol, "RdInstrumenterAdapter")
-            }
+            return RdInstrumenterAdapter()
         }
 
         private val __StringNullableSerializer = FrameworkMarshallers.String.nullable()

utbot-framework/src/main/kotlin/org/utbot/framework/process/generated/RdSourceFindingStrategy.Generated.kt

@@ -44,10 +44,7 @@ class RdSourceFindingStrategy private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): RdSourceFindingStrategy  {
             EngineProcessRoot.register(protocol.serializers)
 
-            return RdSourceFindingStrategy().apply {
-                identify(protocol.identity, RdId.Null.mix("RdSourceFindingStrategy"))
-                bind(lifetime, protocol, "RdSourceFindingStrategy")
-            }
+            return RdSourceFindingStrategy()
         }
 
         private val __StringNullableSerializer = FrameworkMarshallers.String.nullable()

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/rd/generated/InstrumentedProcessModel.Generated.kt

@@ -54,10 +54,7 @@ class InstrumentedProcessModel private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): InstrumentedProcessModel  {
             InstrumentedProcessRoot.register(protocol.serializers)
 
-            return InstrumentedProcessModel().apply {
-                identify(protocol.identity, RdId.Null.mix("InstrumentedProcessModel"))
-                bind(lifetime, protocol, "InstrumentedProcessModel")
-            }
+            return InstrumentedProcessModel()
         }
 
 

utbot-rd/build.gradle

@@ -1,10 +1,16 @@
 plugins {
-    id 'com.jetbrains.rdgen' version "2022.2.1"
+    id 'com.jetbrains.rdgen' version "2022.3.3"
 }
 
 import com.jetbrains.rd.generator.gradle.RdGenExtension
 import com.jetbrains.rd.generator.gradle.RdGenTask
 
+if (includeRiderInBuild.toBoolean()) {
+    def utbotRider = project.rootProject.childProjects["utbot-rider"]
+    evaluationDependsOn(utbotRider.path)
+    tasks.getByName("classes").dependsOn(utbotRider.tasks.getByName("addRiderModelsToUtbotModels"))
+}
+
 compileKotlin {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8
@@ -26,6 +32,8 @@ configurations {
     lifetimedProcessMockCompileClasspath.extendsFrom configurations.compileClasspath
     processWithRdServerMockCompileClasspath.extendsFrom configurations.compileClasspath
     rdgenModelsCompileClasspath.extendsFrom configurations.compileClasspath
+    if (includeRiderInBuild.toBoolean())
+        riderRdgenModelsCompileClasspath.extendsFrom configurations.rdgenModelsCompileClasspath
 }
 
 sourceSets {
@@ -44,8 +52,17 @@ sourceSets {
             srcDirs = ["src/main/rdgen"]
         }
     }
+    if (includeRiderInBuild.toBoolean()) {
+        riderRdgenModels {
+            kotlin {
+                srcDirs = ["src/main/riderRdgenModels"]
+            }
+        }
+    }
 }
 
+def riderModelJar = new File(project.buildDir, "libs/rider-model.jar")
+
 dependencies {
     implementation project(':utbot-core')
     implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: rdVersion
@@ -56,6 +73,10 @@ dependencies {
     processWithRdServerMockImplementation project(':utbot-rd')
 
     rdgenModelsCompileClasspath group: 'com.jetbrains.rd', name: 'rd-gen', version: rdVersion
+
+    if (includeRiderInBuild.toBoolean()) {
+        riderRdgenModelsCompileClasspath files(riderModelJar)
+    }
 }
 
 task lifetimedProcessMockJar(type: Jar) {
@@ -99,6 +120,50 @@ test {
     systemProperty("PROCESS_WITH_RD_SERVER_MOCK", processWithRdServerMockJar.archiveFile.get().getAsFile().canonicalPath)
 }
 
+if (includeRiderInBuild.toBoolean()) {
+    def currentProjectDir = project.projectDir
+    def riderProject = project.rootProject.childProjects["utbot-rider"]
+    def riderTask = riderProject.tasks.getByName("addRiderModelsToUtbotModels")
+    // !!!! IMPORTANT !!!!
+    // after generation you should MANUALLY correct kotlin generated code as it is incorrectly references some rider model
+    // mandatory steps:
+    // 1. In UtBotRiderModel.Generated.kt change package to `package org.utbot.rider.generated`
+    // 2. then import all unreferenced classes
+    // otherwise you will have broken plugin initialization and ClassNotFoundException
+    task generateRiderModels(type: RdGenTask) {
+        dependsOn(riderTask)
+
+        def riderProjectDir = riderProject.projectDir
+        def generatedOutputDir = new File(riderProjectDir, "src/main/kotlin/org/utbot/rider/generated")
+        def hashDir = generatedOutputDir
+        def sourcesDir = new File(currentProjectDir, "src/main/riderRdgenModels/org/utbot/rider/rd/models")
+        def rdParams = extensions.getByName("params") as RdGenExtension
+
+        group = "rdgen"
+        rdParams.verbose = true
+        rdParams.sources(sourcesDir)
+        rdParams.hashFolder = hashDir.canonicalPath
+        rdParams.packages = "org.utbot.rider.rd.models"
+        rdParams.classpath(riderModelJar)
+
+        rdParams.generator {
+            language = "kotlin"
+            transform = "symmetric"
+            root = "com.jetbrains.rider.model.nova.ide.IdeRoot"
+            directory = generatedOutputDir.canonicalPath
+            namespace = "org.utbot.rider.generated"
+        }
+
+        rdParams.generator {
+            language = "csharp"
+            transform = "symmetric"
+            root = "com.jetbrains.rider.model.nova.ide.IdeRoot"
+            namespace = "UtBot"
+            directory = new File(riderProjectDir, "src/dotnet/UtBot/UtBot/Generated")
+        }
+    }
+}
+
 task generateInstrumentedProcessModels(type: RdGenTask) {
     def currentProjectDir = project.projectDir
     def instrumentationProjectDir = project.rootProject.childProjects["utbot-instrumentation"].projectDir

utbot-rd/src/main/kotlin/org/utbot/rd/generated/LoggerModel.Generated.kt

@@ -43,10 +43,7 @@ class LoggerModel private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): LoggerModel  {
             LoggerRoot.register(protocol.serializers)
 
-            return LoggerModel().apply {
-                identify(protocol.identity, RdId.Null.mix("LoggerModel"))
-                bind(lifetime, protocol, "LoggerModel")
-            }
+            return LoggerModel()
         }
 
 

utbot-rd/src/main/kotlin/org/utbot/rd/generated/SettingsModel.Generated.kt

@@ -43,10 +43,7 @@ class SettingsModel private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): SettingsModel  {
             SettingsRoot.register(protocol.serializers)
 
-            return SettingsModel().apply {
-                identify(protocol.identity, RdId.Null.mix("SettingsModel"))
-                bind(lifetime, protocol, "SettingsModel")
-            }
+            return SettingsModel()
         }
 
 

utbot-rd/src/main/kotlin/org/utbot/rd/generated/SynchronizationModel.Generated.kt

@@ -44,10 +44,7 @@ class SynchronizationModel private constructor(
         fun create(lifetime: Lifetime, protocol: IProtocol): SynchronizationModel  {
             SynchronizationRoot.register(protocol.serializers)
 
-            return SynchronizationModel().apply {
-                identify(protocol.identity, RdId.Null.mix("SynchronizationModel"))
-                bind(lifetime, protocol, "SynchronizationModel")
-            }
+            return SynchronizationModel()
         }
 
 

utbot-rd/src/main/rdgen/org/utbot/rd/models/CSharpModel.kt

@@ -13,13 +13,19 @@ object VSharpModel: Ext(CSharpRoot) {
         field("parameters", immutableList(PredefinedType.string))
     }
 
+    val mapEntry = structdef {
+        field("key", PredefinedType.string)
+        field("value", PredefinedType.string)
+    }
+
     val generateArguments = structdef {
         field("assemblyPath", PredefinedType.string)
         field("projectCsprojPath", PredefinedType.string)
         field("solutionFilePath", PredefinedType.string)
         field("methods", immutableList(methodDescriptor))
         field("generationTimeoutInSeconds", PredefinedType.int)
         field("targetFramework", PredefinedType.string.nullable)
+        field("assembliesFullNameToTheirPath", immutableList(mapEntry))
     }
 
     val generateResults = structdef {