Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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?,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, String>

@OptIn(ExperimentalCoroutinesApi::class)
class CasbinExecutorManager(private val myProject: Project) : CasbinExecutorService() {
private val log: Logger = Logger.getInstance(CasbinExecutorManager::class.java)
private val enforcers: MutableUsageMap<EnforcerKey, CasbinEnforcementProducer> = MutableUsageMap()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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? {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading