Fix for Rider 2025.3.1

Author: Fernthedev

build.gradle.kts

@@ -1,3 +1,4 @@
+
 import com.jetbrains.plugin.structure.base.utils.isFile
 import groovy.ant.FileNameFinder
 import org.apache.tools.ant.taskdefs.condition.Os
@@ -7,7 +8,7 @@ import java.io.ByteArrayOutputStream
 plugins {
     id("java")
     alias(libs.plugins.kotlinJvm)
-    id("org.jetbrains.intellij.platform") version "2.2.0"     // See https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
+    id("org.jetbrains.intellij.platform") version "2.10.5"     // See https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
     id("me.filippov.gradle.jvm.wrapper") version "0.14.0"
 }
 
@@ -54,8 +55,11 @@ sourceSets {
     }
 }
 
-tasks.compileKotlin {
-    kotlinOptions { jvmTarget = "17" }
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+//    compilerOptions { jvmTarget = JvmTarget.JVM_17 }
 }
 
 val setBuildTool by tasks.registering {

gradle.properties

@@ -4,7 +4,7 @@
 DotnetPluginId=ReSharperPlugin.BSMT
 DotnetSolution=ReSharperPlugin.BSMT-Rider.sln
 RiderPluginId=bsmt_rider
-PluginVersion=0.1.30
+PluginVersion=0.1.31
 
 BuildConfiguration=Release
 
@@ -15,7 +15,7 @@ PublishToken="_PLACEHOLDER_"
 #   Release:  2020.2
 #   Nightly:  2020.3-SNAPSHOT
 #   EAP:      2020.3-EAP2-SNAPSHOT
-ProductVersion=2024.3
+ProductVersion=2025.3.1
 # 2021.3.3
 
 # Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.24" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
+kotlin = "2.2.20" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
 rdGen = "2024.3.1" # https://github.com/JetBrains/rd/releases
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/rider/main/kotlin/com/github/fernthedev/bsmt_rider/BeatSaberProjectManager.kt

@@ -9,9 +9,9 @@ import com.intellij.openapi.application.readActionBlocking
 import com.intellij.openapi.application.writeAction
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
+import com.intellij.openapi.progress.checkCanceled
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
-import com.jetbrains.cidr.util.checkCanceled
 import com.jetbrains.rider.projectView.workspace.ProjectModelEntity
 import kotlinx.coroutines.CoroutineScope
 import java.io.File
@@ -65,8 +65,8 @@ class BeatSaberProjectManager(
         val content = generateFileContent(userString)
 
 
+        checkCanceled()
         writeAction {
-            checkCanceled()
             userFile.createNewFile()
             VfsUtil.saveText(VfsUtil.findFileByIoFile(userFile, true)!!, content)
         }
@@ -79,13 +79,13 @@ class BeatSaberProjectManager(
 
         if (!file.exists()) return false
 
+        checkCanceled()
         val vfsFile = readActionBlocking {
-            checkCanceled()
             VfsUtil.findFileByIoFile(file, true)!!
         }
 
+        checkCanceled()
         val contents = readActionBlocking {
-            checkCanceled()
             VfsUtil.loadText(vfsFile)
         }
 
@@ -99,8 +99,8 @@ class BeatSaberProjectManager(
     private suspend fun updateUserFile(userCsprojFile: File, beatSaberFolder: String): Boolean {
         val file = VfsUtil.findFileByIoFile(userCsprojFile, true)!!
 
+        checkCanceled()
         val contents = readActionBlocking {
-            checkCanceled()
             VfsUtil.loadText(file)
         }
 
@@ -198,8 +198,8 @@ class BeatSaberProjectManager(
             }
         }
 
+        checkCanceled()
         writeAction {
-            checkCanceled()
             VfsUtil.saveText(file, finalString.toString())
         }
 

src/rider/main/kotlin/com/github/fernthedev/bsmt_rider/RiderProtocolHandler.kt

@@ -1,26 +1,20 @@
 package com.github.fernthedev.bsmt_rider
 
-import com.github.fernthedev.bsmt_rider.settings.AppSettingsState
 import com.intellij.openapi.application.ApplicationManager
-import com.jetbrains.rd.platform.util.lifetime
-import com.jetbrains.rd.util.lifetime.Lifetime
-import com.jetbrains.rider.model.BSMT_RiderModel
-import com.jetbrains.rider.model.ConfigSettings
-import com.jetbrains.rider.protocol.ProtocolManager
 
 // TODO: This doesn't work
 private class RiderProtocolHandler {
     companion object {
-        val instance: RiderProtocolHandler
-            get() = ApplicationManager.getApplication().getService(RiderProtocolHandler::class.java)
+//        val instance: RiderProtocolHandler
+//            get() = ApplicationManager.getApplication().getService(RiderProtocolHandler::class.java)
     }
 
 
 //    val bsmtRidermodel: BSMT_RiderModel
 
 
     init {
-        val protocol = ProtocolManager.createProtocol(ApplicationManager.getApplication(), Lifetime.Eternal)
+//        val protocol = ProtocolManager.createProtocol(ApplicationManager.getApplication(), Lifetime.Eternal)
 //        bsmtRidermodel = BSMT_RiderModel(ApplicationManager.getApplication().lifetime, protocol)
 
         ApplicationManager.getApplication().invokeLater {

src/rider/main/kotlin/com/github/fernthedev/bsmt_rider/helpers/ProjectUtils.kt

@@ -10,10 +10,9 @@ import com.intellij.ide.SaveAndSyncHandler
 import com.intellij.openapi.application.EDT
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
+import com.intellij.openapi.progress.checkCanceled
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
-import com.intellij.warmup.util.yieldThroughInvokeLater
-import com.jetbrains.cidr.util.checkCanceled
 import com.jetbrains.rider.model.ReloadCommand
 import com.jetbrains.rider.model.UnloadCommand
 import com.jetbrains.rider.model.projectModelTasks

src/rider/main/kotlin/com/github/fernthedev/bsmt_rider/helpers/ThreadHelpers.kt

@@ -5,6 +5,15 @@ import com.intellij.openapi.application.invokeLater
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.progress.ProgressManager
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
+
+suspend fun yieldThroughInvokeLater(): Unit = suspendCancellableCoroutine { cont ->
+    ApplicationManager.getApplication().invokeLater {
+        if (!cont.isCancelled) cont.resume(Unit)
+    }
+    cont.invokeOnCancellation { /* no-op */ }
+}
 
 // https://plugins.jetbrains.com/docs/intellij/general-threading-rules.html#read-action-cancellability
 @Deprecated("Use Kotlin coroutines")

src/rider/main/kotlin/com/github/fernthedev/bsmt_rider/settings/AppSettingsComponent.kt

@@ -1,10 +1,10 @@
 package com.github.fernthedev.bsmt_rider.settings
 
 import com.intellij.icons.AllIcons
+import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.fileChooser.FileChooser
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
-import com.intellij.ui.AnActionButton
 import com.intellij.ui.CollectionListModel
 import com.intellij.ui.ToolbarDecorator
 import com.intellij.ui.components.JBCheckBox
@@ -94,28 +94,27 @@ class AppSettingsComponent {
             (_beatSaberFolders.model as CollectionListModel<String>).remove(_beatSaberFolders.selectedIndex)
         }
 
-        val selectDefault = object: AnActionButton() {
-            override fun actionPerformed(p0: AnActionEvent) {
+        val selectDefault = object : AnAction(
+            "Set as default beat saber directory",
+            null,
+            AllIcons.Actions.Checked_selected
+        ) {
+            override fun actionPerformed(e: AnActionEvent) {
                 _defaultFolder.text = _beatSaberFolders.selectedValue
             }
         }
 
-
-
-        selectDefault.templatePresentation.text = "Set as default beat saber directory"
-        selectDefault.isEnabled = useDefaultFolder
-        selectDefault.templatePresentation.icon = AllIcons.Actions.Checked_selected
+        selectDefault.templatePresentation.isEnabled = useDefaultFolder
 
         _useDefaultFolder.addActionListener {
-            selectDefault.isEnabled = useDefaultFolder
+            selectDefault.templatePresentation.isEnabled = useDefaultFolder
         }
 
         _useDefaultFolder.addChangeListener {
-            selectDefault.isEnabled = useDefaultFolder
+            selectDefault.templatePresentation.isEnabled = useDefaultFolder
         }
 
         _beatSaberFoldersToolbar.addExtraAction(selectDefault)
-        _beatSaberFoldersToolbar.disableUpDownActions()
 
 
         _defaultFolder.isEditable = false