remove experimental api

remove experimental apiMerge pull request #13 from LeonDevLifeLog/fix/experimental-api

Author: LeonDevLifeLog

CHANGELOG.md

@@ -4,14 +4,20 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- issues about plugin verification
+
 ## [0.2.1] - 2023-08-16
 
 ### Fixed
+
 - issues about plugin verification
 
 ## [0.2.0] - 2023-08-14
 
 ### Added
+
 - Support Clone Gitea Repository
 
 ## [0.2.0-beta] - 2023-08-13

gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = com.github.leondevlifelog.gitea
 pluginName = Gitea
 pluginRepositoryUrl = https://github.com/LeonDevLifeLog/gitea-idea-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 0.2.1
+pluginVersion=0.2.2
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 223

src/main/kotlin/com/github/leondevlifelog/gitea/api/GiteaRepositoryCoordinates.kt

@@ -5,16 +5,14 @@
 
 package com.github.leondevlifelog.gitea.api
 
-
 import com.github.leondevlifelog.gitea.authentication.accounts.GiteaServerPath
 import com.intellij.collaboration.util.resolveRelative
-import git4idea.remote.hosting.HostedRepositoryCoordinates
 import com.intellij.openapi.util.NlsSafe
 import java.net.URI
 
 data class GiteaRepositoryCoordinates(
-    override val serverPath: GiteaServerPath, val repositoryPath: GiteaRepositoryPath
-) : HostedRepositoryCoordinates {
+    val serverPath: GiteaServerPath, val repositoryPath: GiteaRepositoryPath
+) {
 
     fun toUrl(): String {
         return serverPath.toURI().toString() + "/" + repositoryPath
@@ -32,9 +30,7 @@ data class GiteaRepositoryCoordinates(
         if (other !is GiteaRepositoryCoordinates) return false
 
         if (serverPath != other.serverPath) return false
-        if (repositoryPath != other.repositoryPath) return false
-
-        return true
+        return repositoryPath == other.repositoryPath
     }
 
     override fun hashCode(): Int {

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

@@ -8,19 +8,17 @@ package com.github.leondevlifelog.gitea.ui
 import com.github.leondevlifelog.gitea.GiteaBundle
 import com.github.leondevlifelog.gitea.authentication.accounts.GiteaAccountManager
 import com.github.leondevlifelog.gitea.authentication.accounts.GiteaServerPath
-import com.intellij.collaboration.async.DisposingMainScope
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.asContextElement
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.DialogWrapper.IS_VISUAL_PADDING_COMPENSATED_ON_COMPONENT_LEVEL_KEY
 import com.intellij.openapi.ui.ValidationInfo
+import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.NlsContexts
 import git4idea.i18n.GitBundle
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import java.awt.Component
 import javax.swing.JComponent
 
@@ -33,7 +31,11 @@ internal sealed class GiteaLoginDialog(
     parent: Component?
 ) : DialogWrapper(project, parent, false, IdeModalityType.PROJECT) {
 
-    private val cs = DisposingMainScope(disposable)
+    private val cs = MainScope().also {
+        Disposer.register(disposable!!) {
+            it.cancel()
+        }
+    }
 
     protected val loginPanel = GiteaLoginPanel() { login, server ->
         model.isAccountUnique(server, login)
@@ -61,8 +63,7 @@ internal sealed class GiteaLoginDialog(
                 accountManager.updateAccount(acc, token)
                 model.saveLogin(loginPanel.getServer(), login, token)
                 close(OK_EXIT_CODE, true)
-            }
-            catch (e: Exception) {
+            } catch (e: Exception) {
                 if (e is CancellationException) {
                     close(CANCEL_EXIT_CODE, false)
                     throw e

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

@@ -10,15 +10,17 @@ import com.github.leondevlifelog.gitea.GiteaConfig
 import com.github.leondevlifelog.gitea.authentication.accounts.GiteaAccountManager
 import com.github.leondevlifelog.gitea.authentication.accounts.GiteaProjectDefaultAccountHolder
 import com.github.leondevlifelog.gitea.services.GiteaSettings
-import com.intellij.collaboration.async.DisposingMainScope
 import com.intellij.collaboration.auth.ui.AccountsPanelFactory
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.asContextElement
 import com.intellij.openapi.components.service
 import com.intellij.openapi.options.BoundConfigurable
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogPanel
+import com.intellij.openapi.util.Disposer
 import com.intellij.ui.dsl.builder.*
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.plus
 
 class GiteaSettingsConfigurable internal constructor(private val project: Project) :
@@ -28,7 +30,11 @@ class GiteaSettingsConfigurable internal constructor(private val project: Projec
         val accountManager = service<GiteaAccountManager>()
         val settings = GiteaSettings.getInstance()
 
-        val scope = DisposingMainScope(disposable!!) + ModalityState.any().asContextElement()
+        val scope = MainScope().also {
+            Disposer.register(disposable!!) {
+                it.cancel()
+            }
+        } + ModalityState.any().asContextElement()
         val accountsModel = GiteaAccountsListModel()
         val detailsProvider = GiteaAccountsDetailsProvider(scope, accountManager, accountsModel)
 

src/main/kotlin/com/github/leondevlifelog/gitea/ui/clone/CloneDialogLoginPanel.kt

@@ -9,7 +9,6 @@ import com.github.leondevlifelog.gitea.GiteaBundle
 import com.github.leondevlifelog.gitea.authentication.accounts.GiteaAccount
 import com.github.leondevlifelog.gitea.authentication.accounts.GiteaAccountManager
 import com.github.leondevlifelog.gitea.ui.GiteaLoginPanel
-import com.intellij.collaboration.async.disposingMainScope
 import com.intellij.ide.IdeBundle
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionUpdateThread
@@ -22,6 +21,7 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.ui.ComponentValidator
 import com.intellij.openapi.ui.ValidationInfo
+import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.wm.IdeFocusManager
 import com.intellij.ui.SimpleColoredComponent
 import com.intellij.ui.SimpleTextAttributes.ERROR_ATTRIBUTES
@@ -34,10 +34,7 @@ import com.intellij.util.ui.JBInsets
 import com.intellij.util.ui.JBUI.Borders.empty
 import com.intellij.util.ui.JBUI.Panels.simplePanel
 import com.intellij.util.ui.UIUtil.getRegularPanelInsets
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
+import kotlinx.coroutines.*
 import java.awt.Dimension
 import java.awt.LayoutManager
 import java.awt.Rectangle
@@ -46,7 +43,11 @@ import javax.swing.*
 internal class CloneDialogLoginPanel(private val account: GiteaAccount?) :
     JBPanel<CloneDialogLoginPanel>(ListLayout.vertical(0)), Disposable {
 
-    private val cs = disposingMainScope()
+    private val cs = MainScope().also {
+        Disposer.register(this) {
+            it.cancel()
+        }
+    }
 
     private val accountManager get() = service<GiteaAccountManager>()
 

src/main/kotlin/com/github/leondevlifelog/gitea/ui/clone/GiteaCloneDialogExtensionComponentBase.kt

@@ -18,7 +18,6 @@ import com.github.leondevlifelog.gitea.util.GiteaGitHelper
 import com.github.leondevlifelog.gitea.util.GiteaNotificationIdsHolder
 import com.github.leondevlifelog.gitea.util.GiteaNotifications
 import com.github.leondevlifelog.gitea.util.GiteaUrlUtil
-import com.intellij.collaboration.async.disposingMainScope
 import com.intellij.collaboration.auth.ui.CompactAccountsPanelFactory
 import com.intellij.collaboration.ui.CollaborationToolsUIUtil
 import com.intellij.collaboration.util.CollectionDelta
@@ -61,12 +60,9 @@ import git4idea.GitUtil
 import git4idea.checkout.GitCheckoutProvider
 import git4idea.commands.Git
 import git4idea.remote.GitRememberedInputs
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
+import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.plus
 import org.jetbrains.annotations.Nls
 import java.awt.event.ActionEvent
 import java.nio.file.Paths
@@ -89,7 +85,11 @@ public abstract class GiteaCloneDialogExtensionComponentBase(
 
     private val giteaGitHelper: GiteaGitHelper = GiteaGitHelper.getInstance()
 
-    private val cs = disposingMainScope() + modalityState.asContextElement()
+    private val cs = MainScope().also {
+        Disposer.register(this) {
+            it.cancel()
+        }
+    } + modalityState.asContextElement()
 
     // UI
     private val wrapper: Wrapper = Wrapper()