Support rider 2022.2 (#128)

shalom938 · web-flow · commit 34a44c763da5 · 2022-08-04T13:50:34.000+03:00
* support rider 2022.2

Signed-off-by: shalom &lt;shalom938@gmail.com&gt;

* upgrade to rider 2022.2

Signed-off-by: shalom &lt;shalom938@gmail.com&gt;

* upgrade to rider 2022.2

Signed-off-by: shalom &lt;shalom938@gmail.com&gt;

* upgrade to rider 2022.2

Signed-off-by: shalom &lt;shalom938@gmail.com&gt;
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -157,14 +157,16 @@ tasks {
         // Rider's backend doesn't support dynamic plugins. It might be possible to work with auto-reload of the frontend
         // part of a plugin, but there are dangers about keeping plugins in sync
         autoReloadPlugins.set(false)
+        //workaround, it's a Gradle IntelliJ Plugin issue
+        jvmArgs = listOf("--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED")
     }
 
 
     listProductsReleases {
 //        types.set(listOf("RD","IC","PC","IU"))
         types.set(listOf("RD"))
         sinceVersion.set("2022.1")
-        untilVersion.set("2022.1.2")
+        untilVersion.set("2022.2")
 //        sinceBuild.set("221.5787.35")
 //        untilBuild.set("221.5591.21")
     }
@@ -203,7 +205,7 @@ tasks {
 
     create("printVersion", DefaultTask::class.java) {
         doLast {
-            println("The project current version is ${project.semanticVersion.version.get()}")
+            logger.lifecycle("The project current version is ${project.semanticVersion.version.get()}")
         }
     }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,8 +12,8 @@ repositories {
 
 dependencies {
     //Note: gradle-intellij-plugin 1.5.3 has some bugs with runIde that does not detect changes in kotlin UI DSL
-    implementation("org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.5.2")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
+    implementation("org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.7.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
     implementation("com.dorongold.plugins:task-tree:2.1.0")
     implementation("com.glovoapp.semantic-versioning:com.glovoapp.semantic-versioning.gradle.plugin:1.1.10")
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,22 +1,18 @@
 ##Note: after changes in this file a clean build is necessary: gradlew clean build
-
 # IntelliJ Platform Artifacts Repositories
 # -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
-
-pluginGroup = org.digma.plugins
-pluginName = digma-intellij
+pluginGroup=org.digma.plugins
+pluginName=digma-intellij
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 # See https://www.jetbrains.com/intellij-repository/releases/
-pluginSinceBuild = 221
-pluginUntilBuild = 221.*
-
+pluginSinceBuild=222
+pluginUntilBuild=222.*
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 ## supported IDEs : IC,IU,PC,PY,RD,CI
 ## default is rider
-platformType = RD
-platformVersion = 2022.1.1
-
+platformType=RD
+platformVersion=2022.2
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:213.7172.25
 # to load IC with python support:
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java b/ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java
@@ -80,6 +80,7 @@ public Environment getEnvironment() {
     }
 
     //just replace the client and do not fire any events
+    //this method should be synchronized, and it shouldn't be a problem that really doesn't happen too often.
     private synchronized void replaceClient(String url, String token) {
         if (analyticsProviderProxy != null) {
             try {
diff --git a/rider/Digma.Rider.Plugin/Plugin.props b/rider/Digma.Rider.Plugin/Plugin.props
@@ -1,7 +1,7 @@
 ﻿<Project>
 
   <PropertyGroup>
-    <SdkVersion>2022.1.1</SdkVersion>
+    <SdkVersion>2022.2.0</SdkVersion>
 
     <Title>DigmaRiderPlugin</Title>
     <Description>Digma Rider Plugin</Description>
diff --git a/rider/build.gradle.kts b/rider/build.gradle.kts
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id("plugin-library")
     id("common-kotlin")
-    id("com.jetbrains.rdgen") version libs.versions.intellij.platform.get()
+    id("com.jetbrains.rdgen") version libs.versions.rider.rdgen.get()
 }
 
 
@@ -117,7 +117,7 @@ tasks {
 
     //the file rider.kotlin_module is generated by kotlin and as i noticed in rider plugin template it is
     //packaged into the plugin. couldn't understand if this file is necessary or not and even jetbrains guys
-    //couldn't tell what it is. its in every rider plugin i saw, so copy this file to our main plugin whatever it is.
+    //couldn't tell what it is. it's in every rider plugin i saw, so copy this file to our main plugin whatever it is.
     create("copyKotlinModuleFile",Copy::class.java){
         dependsOn(classes)
         from(project.layout.buildDirectory.dir("classes/kotlin/main/META-INF").get().file("rider.kotlin_module"))
diff --git a/rider/gradle.properties b/rider/gradle.properties
@@ -3,7 +3,7 @@
 
 DotnetPluginId=Digma.Rider.Plugin
 DotnetSolution=Digma.Rider.Plugin.sln
-RiderPluginId=org.rider.plugins.sampleriderplugin
+RiderPluginId=org.digma.rider.plugins
 BuildConfiguration=Debug
 
 
diff --git a/rider/src/main/kotlin/org/digma/intellij/plugin/rider/ServicesStarter.kt b/rider/src/main/kotlin/org/digma/intellij/plugin/rider/ServicesStarter.kt
@@ -1,5 +1,6 @@
 package org.digma.intellij.plugin.rider
 
+import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupActivity
 import org.digma.intellij.plugin.document.DocumentAnalyzer
@@ -10,7 +11,7 @@ import org.digma.intellij.plugin.rider.protocol.ShowToolWindowHost
 import java.util.*
 
 //todo : delete
-class ServicesStarter : StartupActivity {
+class ServicesStarter : StartupActivity, DumbAware {
 
     //with rider some services need to start when the project starts.
     //StartupActivity is a good option. but if the tool window is re-opened on startup
diff --git a/rider/src/main/kotlin/org/digma/intellij/plugin/rider/protocol/DocumentCodeObjectsListener.kt b/rider/src/main/kotlin/org/digma/intellij/plugin/rider/protocol/DocumentCodeObjectsListener.kt
@@ -22,12 +22,8 @@ class DocumentCodeObjectsListener(project: Project) : LifetimedProjectComponent(
         Log.log(logger::info, "DocumentCodeObjectsListener registering for solution startup..")
 
 
-        //todo: remove
-        project.solution.isLoaded.advise(project.lifetime) {
-            Log.log(logger::info, "in isLoaded")
-        }
 
-        project.solution.solutionLifecycle.fullStartupFinished.advise(project.lifetime) {
+        project.solution.isLoaded.advise(project.lifetime) {
 
             Log.log(logger::info, "Starting DocumentCodeObjectsListener")
 
diff --git a/rider/src/main/kotlin/org/digma/intellij/plugin/rider/protocol/ElementUnderCaretDetector.kt b/rider/src/main/kotlin/org/digma/intellij/plugin/rider/protocol/ElementUnderCaretDetector.kt
@@ -25,12 +25,8 @@ class ElementUnderCaretDetector(project: Project) : LifetimedProjectComponent(pr
 
         Log.log(logger::info,project, "ElementUnderCaretDetector registering for solution startup..")
 
-        //todo: remove
-        project.solution.isLoaded.advise(project.lifetime) {
-            Log.log(logger::info,"in isLoaded")
-        }
 
-        project.solution.solutionLifecycle.fullStartupFinished.advise(project.lifetime) {
+        project.solution.isLoaded.advise(project.lifetime) {
             Log.log(logger::info, "Starting ElementUnderCaretDetector")
 
             //maybe there is already a MethodUnderCaretEvent in the protocol. the backend may fire events
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -29,15 +29,18 @@ the version alias where ever possible
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-            version("intellij-platform", "2022.1.1")
+            //if necessary can be used as libs.versions.intellij.platform.get()
+            version("intellij-platform", "2022.2")
+            //rdgen version is not always the same as platform version
+            version("rider-rdgen", "2022.2.5")
             version("junit", "5.8.2")
-            version("kotlin-stdlib", "1.6.20")
+            version("kotlin-stdlib", "1.7.10")
             library("kotlin-stdlib-jdk8", "org.jetbrains.kotlin", "kotlin-stdlib-jdk8").versionRef("kotlin-stdlib")
             library("guava", "com.google.guava", "guava").version("31.1-jre")
             version("retrofit", "2.9.0")
             library("retrofit-client", "com.squareup.retrofit2", "retrofit").versionRef("retrofit")
-            library("retrofit-jackson","com.squareup.retrofit2","converter-jackson").versionRef("retrofit")
-            library("logging-interceptor","com.squareup.retrofit2","converter-jackson").versionRef("retrofit")
+            library("retrofit-jackson", "com.squareup.retrofit2", "converter-jackson").versionRef("retrofit")
+            library("logging-interceptor", "com.squareup.retrofit2", "converter-jackson").versionRef("retrofit")
             version("okhttp", "4.9.3")
             library("okhttp", "com.squareup.okhttp3", "okhttp").versionRef("okhttp")
             library("okhttp-mockwebserver", "com.squareup.okhttp3", "mockwebserver").versionRef("okhttp")
diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
-#Wed Aug 03 11:55:36 UTC 2022
+#Wed Aug 03 18:55:18 IDT 2022
 version=1.0.16

Original file line number	Diff line number	Diff line change
`@@ -157,14 +157,16 @@ tasks {`
`157`	`157`	`// Rider's backend doesn't support dynamic plugins. It might be possible to work with auto-reload of the frontend`
`158`	`158`	`// part of a plugin, but there are dangers about keeping plugins in sync`
`159`	`159`	`autoReloadPlugins.set(false)`
	`160`	`+ //workaround, it's a Gradle IntelliJ Plugin issue`
	`161`	`+ jvmArgs = listOf("--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED")`
`160`	`162`	`}`
`161`	`163`
`162`	`164`
`163`	`165`	`listProductsReleases {`
`164`	`166`	`// types.set(listOf("RD","IC","PC","IU"))`
`165`	`167`	`types.set(listOf("RD"))`
`166`	`168`	`sinceVersion.set("2022.1")`
`167`		`- untilVersion.set("2022.1.2")`
	`169`	`+ untilVersion.set("2022.2")`
`168`	`170`	`// sinceBuild.set("221.5787.35")`
`169`	`171`	`// untilBuild.set("221.5591.21")`
`170`	`172`	`}`
`@@ -203,7 +205,7 @@ tasks {`
`203`	`205`
`204`	`206`	`create("printVersion", DefaultTask::class.java) {`
`205`	`207`	`doLast {`
`206`		`- println("The project current version is ${project.semanticVersion.version.get()}")`
	`208`	`+ logger.lifecycle("The project current version is ${project.semanticVersion.version.get()}")`
`207`	`209`	`}`
`208`	`210`	`}`
`209`	`211`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ public Environment getEnvironment() {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`//just replace the client and do not fire any events`
	`83`	`+ //this method should be synchronized, and it shouldn't be a problem that really doesn't happen too often.`
`83`	`84`	`private synchronized void replaceClient(String url, String token) {`
`84`	`85`	`if (analyticsProviderProxy != null) {`
`85`	`86`	`try {`