From e03f7fc922601c8af9b192ae71d76852eb7d2db6 Mon Sep 17 00:00:00 2001
From: Aleksandr Krasilnikov <aleksandr.krasilnikov@jetbrains.com>
Date: Mon, 9 Sep 2019 12:22:30 +0300
Subject: [PATCH] vcs: select Git by default in clone dialog

com.intellij.openapi.extensions.LoadingOrder are used to achieve this behavior.
It is not guaranteed that Git will be selected by default if external plugins define order="first", but Git will be default among all JB VCS-plugins (IDEA-222144).

GitOrigin-RevId: 94c279f4a546c93ff598d2ed70e7c524996e071c
---
 .../util/ui/cloneDialog/RepositoryUrlCloneDialogExtension.kt | 5 ++++-
 plugins/git4idea/resources/META-INF/plugin.xml               | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/util/ui/cloneDialog/RepositoryUrlCloneDialogExtension.kt b/platform/vcs-impl/src/com/intellij/util/ui/cloneDialog/RepositoryUrlCloneDialogExtension.kt
index 5a1e69aff9a5..85ac0eef4890 100644
--- a/platform/vcs-impl/src/com/intellij/util/ui/cloneDialog/RepositoryUrlCloneDialogExtension.kt
+++ b/platform/vcs-impl/src/com/intellij/util/ui/cloneDialog/RepositoryUrlCloneDialogExtension.kt
@@ -73,11 +73,14 @@ class RepositoryUrlCloneDialogExtension : VcsCloneDialogExtension {
         }
       }
 
-      val providers = CheckoutProvider.EXTENSION_POINT_NAME.extensions.sortedArrayWith(CheckoutProvider.CheckoutProviderComparator())
+      val providers = CheckoutProvider.EXTENSION_POINT_NAME.extensions
+      val selectedByDefaultProvider: CheckoutProvider? = if (providers.isNotEmpty()) providers[0] else null
+      providers.sortWith(CheckoutProvider.CheckoutProviderComparator())
       for (checkoutProvider in providers) {
         vcsComponents[checkoutProvider] = checkoutProvider.buildVcsCloneComponent(project)
         comboBox.addItem(checkoutProvider)
       }
+      comboBox.selectedItem = selectedByDefaultProvider
     }
 
     override fun getView() = mainPanel
diff --git a/plugins/git4idea/resources/META-INF/plugin.xml b/plugins/git4idea/resources/META-INF/plugin.xml
index 3a29daf3a89d..bccb5960ad84 100644
--- a/plugins/git4idea/resources/META-INF/plugin.xml
+++ b/plugins/git4idea/resources/META-INF/plugin.xml
@@ -189,7 +189,7 @@
   <extensions defaultExtensionNs="com.intellij">
     <search.projectOptionsTopHitProvider implementation="git4idea.config.GitOptionsTopHitProvider"/>
     <vcs name="Git" vcsClass="git4idea.GitVcs" displayName="Git" administrativeAreaName=".git"/>
-    <checkoutProvider implementation="git4idea.checkout.GitCheckoutProvider"/>
+    <checkoutProvider implementation="git4idea.checkout.GitCheckoutProvider" order="first"/>
     <vcs.checkoutProcessor implementation="git4idea.checkout.GitCheckoutProcessor"/>
     <vcsRootChecker implementation="git4idea.roots.GitRootChecker"/>
     <vcsIgnoreChecker implementation="git4idea.ignore.GitIgnoreChecker"/>