feat: support new Idea version (#42)

Author: LeonDevLifeLog

gradle.properties

@@ -4,15 +4,15 @@ pluginGroup = com.github.leondevlifelog.gitea
 pluginName = Gitea
 pluginRepositoryUrl = https://github.com/LeonDevLifeLog/gitea-idea-plugin
 # SemVer format -> https://semver.org
-pluginVersion=0.3.1
+pluginVersion=0.3.2
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 223
-pluginUntilBuild = 232.*
+pluginSinceBuild=233
+pluginUntilBuild = 233.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType=IC
-platformVersion = 2022.3.3
+platformVersion=2023.3.1
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

src/main/kotlin/com/github/leondevlifelog/gitea/authentication/accounts/GiteaProjectDefaultAccountHolder.kt

@@ -6,20 +6,18 @@ package com.github.leondevlifelog.gitea.authentication.accounts
 
 import com.github.leondevlifelog.gitea.GiteaBundle
 import com.github.leondevlifelog.gitea.util.GiteaNotificationIdsHolder
-import com.github.leondevlifelog.gitea.util.GiteaNotifications
 import com.intellij.collaboration.auth.PersistentDefaultAccountHolder
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.application.runInEdt
-import com.intellij.openapi.components.State
-import com.intellij.openapi.components.Storage
-import com.intellij.openapi.components.StoragePathMacros
-import com.intellij.openapi.components.service
-import com.intellij.openapi.diagnostic.thisLogger
+import com.intellij.openapi.components.*
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vcs.VcsNotifier
+import kotlinx.coroutines.CoroutineScope
 
 @State(name = "GiteaDefaultAccount", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)], reportStatistic = false)
-class GiteaProjectDefaultAccountHolder(project: Project) : PersistentDefaultAccountHolder<GiteaAccount>(project) {
+@Service(Service.Level.PROJECT)
+class GiteaProjectDefaultAccountHolder(project: Project, scope: CoroutineScope) :
+    PersistentDefaultAccountHolder<GiteaAccount>(project, scope) {
 
     override fun accountManager() = service<GiteaAccountManager>()
 

src/main/kotlin/com/github/leondevlifelog/gitea/services/GiteaGitAuthenticationFailureManager.kt

@@ -37,7 +37,7 @@ class GiteaChooseAccountDialog @JvmOverloads constructor(project: Project?, pare
     private val description: JTextArea? = descriptionText?.let {
         JTextArea().apply {
             minimumSize = Dimension(0, 0)
-            font = StartupUiUtil.getLabelFont()
+            font = StartupUiUtil.labelFont
             text = it
             lineWrap = true
             wrapStyleWord = true
@@ -95,4 +95,4 @@ class GiteaChooseAccountDialog @JvmOverloads constructor(project: Project?, pare
     }
 
     override fun getPreferredFocusedComponent() = accountsList
-}
+}

src/main/kotlin/com/github/leondevlifelog/gitea/services/HostedGitAuthenticationFailureManager.kt

@@ -32,7 +32,7 @@ internal sealed class GiteaLoginDialog(
 ) : DialogWrapper(project, parent, false, IdeModalityType.PROJECT) {
 
     private val cs = MainScope().also {
-        Disposer.register(disposable!!) {
+        Disposer.register(disposable) {
             it.cancel()
         }
     }
@@ -95,4 +95,4 @@ internal sealed class GiteaLoginDialog(
 internal interface GiteaLoginModel {
     fun isAccountUnique(server: GiteaServerPath, login: String): Boolean
     suspend fun saveLogin(server: GiteaServerPath, login: String, token: String)
-}
+}

src/main/kotlin/com/github/leondevlifelog/gitea/ui/GiteaChooseAccountDialog.kt

@@ -27,6 +27,7 @@ import com.intellij.ui.SimpleColoredComponent
 import com.intellij.ui.SimpleTextAttributes.ERROR_ATTRIBUTES
 import com.intellij.ui.components.JBPanel
 import com.intellij.ui.components.labels.LinkLabel
+import com.intellij.ui.components.panels.ListLayout
 import com.intellij.ui.dsl.builder.Panel
 import com.intellij.ui.scale.JBUIScale.scale
 import com.intellij.util.ui.JBEmptyBorder
@@ -237,4 +238,4 @@ private class ScrollablePanel(layout: LayoutManager?, private val orientation: I
 @Suppress("FunctionName")
 fun VerticalListPanel(gap: Int = 0): JPanel = ScrollablePanel(ListLayout.vertical(gap), SwingConstants.VERTICAL).apply {
     isOpaque = false
-}
+}

src/main/kotlin/com/github/leondevlifelog/gitea/ui/GiteaLoginDialog.kt

@@ -6,7 +6,7 @@
 package com.github.leondevlifelog.gitea.ui.clone
 
 import com.github.leondevlifelog.gitea.authentication.accounts.GiteaAccount
-import com.intellij.collaboration.ui.util.getName
+import com.intellij.collaboration.ui.util.name
 import com.intellij.openapi.util.NlsSafe
 import com.intellij.ui.CellRendererPanel
 import com.intellij.ui.ColoredListCellRenderer
@@ -67,7 +67,7 @@ class GiteaRepositoryListCellRenderer(private val errorHandler: ErrorHandler,
                 append(errorHandler.getPresentableText(error), SimpleTextAttributes.ERROR_ATTRIBUTES)
                 val action = errorHandler.getAction(value.account, error)
                 append(" ")
-                append(action.getName(), SimpleTextAttributes.LINK_ATTRIBUTES, action)
+                action.name?.let { append(it, SimpleTextAttributes.LINK_ATTRIBUTES, action) }
             }
         }
     }
@@ -106,4 +106,4 @@ class GiteaRepositoryListCellRenderer(private val errorHandler: ErrorHandler,
         fun getPresentableText(error: Throwable): @Nls String
         fun getAction(account: GiteaAccount, error: Throwable): Action
     }
-}
+}