Update to Rider 2023.2 EAP

Closes #2
chylex · Jul 16, 2023 · ce55d81 · ce55d81
1 parent fdc20aa
commit ce55d81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,12 +20,12 @@ kotlin {
 
 intellij {
 	type.set("RD")
-	version.set("2023.1")
+	version.set("2023.2-SNAPSHOT")
 	updateSinceUntilBuild.set(false)
 }
 
 tasks.patchPluginXml {
-	sinceBuild.set("231")
+	sinceBuild.set("232")
 }
 
 tasks.buildSearchableOptions {

diff --git a/src/main/kotlin/com/chylex/intellij/rider/vcsgroupbyproject/ChangesBrowserProjectNode.kt b/src/main/kotlin/com/chylex/intellij/rider/vcsgroupbyproject/ChangesBrowserProjectNode.kt
@@ -8,6 +8,7 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNodeRenderer
 import com.jetbrains.rider.model.RdCustomLocation
 import com.jetbrains.rider.model.RdProjectModelItemDescriptor
 import java.io.File
+import java.io.Serial
 
 class ChangesBrowserProjectNode(private val descriptor: RdProjectModelItemDescriptor) : ChangesBrowserNode<RdProjectModelItemDescriptor>(descriptor) {
 	private val type = getType(descriptor)
@@ -30,6 +31,7 @@ class ChangesBrowserProjectNode(private val descriptor: RdProjectModelItemDescri
 	}
 
 	companion object {
+		@Serial
 		private const val serialVersionUID = 2641007635909904963L
 
 		private fun getType(descriptor: RdProjectModelItemDescriptor): FileType? {

diff --git a/src/main/kotlin/com/chylex/intellij/rider/vcsgroupbyproject/ProjectChangesGroupingPolicy.kt b/src/main/kotlin/com/chylex/intellij/rider/vcsgroupbyproject/ProjectChangesGroupingPolicy.kt
@@ -9,8 +9,8 @@ import com.intellij.openapi.vcs.changes.ui.ChangesGroupingPolicyFactory
 import com.intellij.openapi.vcs.changes.ui.StaticFilePath
 import com.intellij.openapi.vcs.changes.ui.TreeModelBuilder
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.platform.backend.workspace.WorkspaceModel
 import com.intellij.vcsUtil.VcsUtil
-import com.intellij.workspaceModel.ide.WorkspaceModel
 import com.jetbrains.rider.model.RdCustomLocation
 import com.jetbrains.rider.model.RdProjectDescriptor
 import com.jetbrains.rider.model.RdProjectModelItemDescriptor
@@ -64,11 +64,10 @@ class ProjectChangesGroupingPolicy(private val project: Project, private val mod
 	}
 
 	private companion object {
-		private val NODE_CACHE = NotNullLazyKey.create<MutableMap<RdProjectModelItemDescriptor?, ChangesBrowserNode<*>>, ChangesBrowserNode<*>>("ChangesTree.ProjectCache") {
+		private val NODE_CACHE = NotNullLazyKey.createLazyKey<MutableMap<RdProjectModelItemDescriptor?, ChangesBrowserNode<*>>, ChangesBrowserNode<*>>("ChangesTree.ProjectCache") {
 			mutableMapOf()
 		}
 
-		@Suppress("UnstableApiUsage")
 		private fun getSingleProjectEntity(file: VirtualFile, project: Project): ProjectModelEntity? {
 			val workspaceModel = WorkspaceModel.getInstance(project)
 			val entities = walkFileParentsUntilResultIsNotEmpty(file) { workspaceModel.getProjectModelEntities(it, project) }