From d68988ec2412cff4d50b2553a053f515aec1d54a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 13 Dec 2025 17:19:31 +0000 Subject: [PATCH 1/3] Initial plan From 418b37d9e7ffbcac25e63a0f3f848e2401e3aa0e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 13 Dec 2025 17:24:21 +0000 Subject: [PATCH 2/3] Fix CI build errors: update since-build, add @OptIn annotations, fix deprecated methods Co-authored-by: hsluoyz <3787410+hsluoyz@users.noreply.github.com> --- gradle.properties | 2 +- .../plugins/casbin/executor/CasbinDocumentManager.kt | 2 ++ .../plugins/casbin/executor/CasbinEnforcementProducer.kt | 2 ++ .../plugins/casbin/executor/CasbinExecutorManager.kt | 2 ++ .../casbin/language/reference/CasbinUsagesProvider.kt | 2 +- .../casbin/language/structure/CasbinStructureViewElement.kt | 4 ++-- .../plugins/casbin/view/ui/CasbinExecutorToolWindowImp.kt | 2 ++ .../casbincsv/language/lexer/CasbinCSVValueSeparator.kt | 6 +++--- 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5243251..25a7174 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ psiViewerVersion=221-SNAPSHOT pluginName_=casbin-idea-plugin pluginGroup=io.github.will7200.plugins.casbin pluginVersion=0.1.16 -pluginSinceBuild=213.* +pluginSinceBuild=221.* pluginUntilBuild=231.* # 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 diff --git a/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinDocumentManager.kt b/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinDocumentManager.kt index 5f18731..a542dab 100644 --- a/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinDocumentManager.kt +++ b/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinDocumentManager.kt @@ -4,7 +4,9 @@ import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.editor.Document import com.intellij.openapi.project.Project import io.github.will7200.plugins.casbin.* +import kotlinx.coroutines.ExperimentalCoroutinesApi +@OptIn(ExperimentalCoroutinesApi::class) class CasbinDocumentManager(private val project: Project) : CasbinDocumentService() { private val log: Logger = Logger.getInstance(this::class.java) var document: Document? = null diff --git a/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinEnforcementProducer.kt b/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinEnforcementProducer.kt index cd8fe21..a9203f3 100644 --- a/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinEnforcementProducer.kt +++ b/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinEnforcementProducer.kt @@ -11,10 +11,12 @@ import io.github.will7200.plugins.casbin.CasbinExecutorRequest import io.github.will7200.plugins.casbin.CasbinTopics import io.github.will7200.plugins.casbin.language.CasbinLanguage import io.github.will7200.plugins.casbin.language.psi.CasbinPsiFile +import kotlinx.coroutines.ExperimentalCoroutinesApi import org.casbin.jcasbin.main.Enforcer import java.io.File +@OptIn(ExperimentalCoroutinesApi::class) class CasbinEnforcementProducer( private val modelPath: String?, private val policyFile: String?, diff --git a/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinExecutorManager.kt b/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinExecutorManager.kt index 7bc73a6..5e75b59 100644 --- a/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinExecutorManager.kt +++ b/src/kotlin/io/github/will7200/plugins/casbin/executor/CasbinExecutorManager.kt @@ -9,10 +9,12 @@ import io.github.will7200.plugins.casbin.CasbinExecutorRequest import io.github.will7200.plugins.casbin.CasbinExecutorService import io.github.will7200.plugins.casbin.CasbinTopics import io.github.will7200.plugins.casbin.view.ui.CasbinExecutorErrorsNotifier +import kotlinx.coroutines.ExperimentalCoroutinesApi import java.time.LocalDateTime typealias EnforcerKey = Pair +@OptIn(ExperimentalCoroutinesApi::class) class CasbinExecutorManager(private val myProject: Project) : CasbinExecutorService() { private val log: Logger = Logger.getInstance(CasbinExecutorManager::class.java) private val enforcers: MutableUsageMap = MutableUsageMap() diff --git a/src/kotlin/io/github/will7200/plugins/casbin/language/reference/CasbinUsagesProvider.kt b/src/kotlin/io/github/will7200/plugins/casbin/language/reference/CasbinUsagesProvider.kt index 29d44c7..867f588 100644 --- a/src/kotlin/io/github/will7200/plugins/casbin/language/reference/CasbinUsagesProvider.kt +++ b/src/kotlin/io/github/will7200/plugins/casbin/language/reference/CasbinUsagesProvider.kt @@ -38,7 +38,7 @@ class CasbinUsagesProvider : FindUsagesProvider { } override fun getType(element: PsiElement): String { - return element.node.elementType.toString().toLowerCase() + return element.node.elementType.toString().lowercase() } override fun getHelpId(psiElement: PsiElement): String? { diff --git a/src/kotlin/io/github/will7200/plugins/casbin/language/structure/CasbinStructureViewElement.kt b/src/kotlin/io/github/will7200/plugins/casbin/language/structure/CasbinStructureViewElement.kt index 4352576..da76891 100644 --- a/src/kotlin/io/github/will7200/plugins/casbin/language/structure/CasbinStructureViewElement.kt +++ b/src/kotlin/io/github/will7200/plugins/casbin/language/structure/CasbinStructureViewElement.kt @@ -35,8 +35,8 @@ class CasbinStructureViewElement(private val element: PsiElement) : StructureVie } override fun getAlphaSortKey() = when (element) { - is PsiFile -> element.name.toLowerCase() - else -> element.text.toLowerCase() + is PsiFile -> element.name.lowercase() + else -> element.text.lowercase() } override fun canNavigate() = (element as? NavigationItem)?.canNavigate() ?: false diff --git a/src/kotlin/io/github/will7200/plugins/casbin/view/ui/CasbinExecutorToolWindowImp.kt b/src/kotlin/io/github/will7200/plugins/casbin/view/ui/CasbinExecutorToolWindowImp.kt index f024326..34889ec 100644 --- a/src/kotlin/io/github/will7200/plugins/casbin/view/ui/CasbinExecutorToolWindowImp.kt +++ b/src/kotlin/io/github/will7200/plugins/casbin/view/ui/CasbinExecutorToolWindowImp.kt @@ -10,9 +10,11 @@ import com.intellij.openapi.util.Disposer import com.intellij.openapi.wm.ToolWindow import io.github.will7200.plugins.casbin.* import io.github.will7200.plugins.casbin.view.editors.CasbinCSVEditor +import kotlinx.coroutines.ExperimentalCoroutinesApi import java.awt.event.ItemEvent import javax.swing.event.DocumentEvent.EventType +@OptIn(ExperimentalCoroutinesApi::class) class CasbinExecutorToolWindowImp(private val project: Project, private val toolWindow: ToolWindow) : CasbinExecutorToolWindow(project, toolWindow), CasbinExecutorConsumer { private val log: Logger = Logger.getInstance(CasbinExecutorToolWindowImp::class.java) diff --git a/src/kotlin/io/github/will7200/plugins/casbincsv/language/lexer/CasbinCSVValueSeparator.kt b/src/kotlin/io/github/will7200/plugins/casbincsv/language/lexer/CasbinCSVValueSeparator.kt index a64e26f..afe78a1 100644 --- a/src/kotlin/io/github/will7200/plugins/casbincsv/language/lexer/CasbinCSVValueSeparator.kt +++ b/src/kotlin/io/github/will7200/plugins/casbincsv/language/lexer/CasbinCSVValueSeparator.kt @@ -41,11 +41,11 @@ class CasbinCSVValueSeparator private constructor( return Objects.hash(character, isCustom) } - override fun equals(obj: Any?): Boolean { - if (obj == null || obj !is CasbinCSVValueSeparator) { + override fun equals(other: Any?): Boolean { + if (other == null || other !is CasbinCSVValueSeparator) { return false } - val otherObj = obj + val otherObj = other return otherObj.character == character && otherObj.isCustom == isCustom } From f5941a4c2b6e6049c1ef5caf386ace644d399d8e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 14 Dec 2025 13:21:03 +0000 Subject: [PATCH 3/3] Fix pluginSinceBuild to use 221 without wildcard for proper version compatibility Co-authored-by: hsluoyz <3787410+hsluoyz@users.noreply.github.com> --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 25a7174..f2ba4c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ psiViewerVersion=221-SNAPSHOT pluginName_=casbin-idea-plugin pluginGroup=io.github.will7200.plugins.casbin pluginVersion=0.1.16 -pluginSinceBuild=221.* +pluginSinceBuild=221 pluginUntilBuild=231.* # 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