Move from the deprecated horizontalAlign (#2303)

mkondratek · web-flow · commit 5cc566c2e626 · 2024-09-16T14:41:01.000+02:00
A prerequisite for #2304. ## Test plan 1. Verify Settings UI
diff --git a/src/main/kotlin/com/sourcegraph/cody/config/CodyTokenCredentialsUi.kt b/src/main/kotlin/com/sourcegraph/cody/config/CodyTokenCredentialsUi.kt
@@ -5,9 +5,9 @@ import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.openapi.ui.setEmptyState
 import com.intellij.ui.components.JBTextField
 import com.intellij.ui.components.fields.ExtendableTextField
+import com.intellij.ui.dsl.builder.AlignX
 import com.intellij.ui.dsl.builder.MAX_LINE_LENGTH_NO_WRAP
 import com.intellij.ui.dsl.builder.Panel
-import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import com.sourcegraph.cody.api.SourcegraphApiRequestExecutor
 import com.sourcegraph.cody.api.SourcegraphApiRequests
 import com.sourcegraph.cody.api.SourcegraphAuthenticationException
@@ -36,16 +36,16 @@ internal class CodyTokenCredentialsUi(
 
   override fun Panel.centerPanel() {
     row(CodyBundle.getString("login.dialog.instance-url.label")) {
-      cell(serverTextField).horizontalAlign(HorizontalAlign.FILL)
+      cell(serverTextField).align(AlignX.FILL)
     }
     row(CodyBundle.getString("login.dialog.token.label")) {
-      cell(tokenTextField).horizontalAlign(HorizontalAlign.FILL)
+      cell(tokenTextField).align(AlignX.FILL)
     }
     group(CodyBundle.getString("login.dialog.optional.group"), indent = false) {
       row(CodyBundle.getString("login.dialog.custom-headers.label")) {
         customRequestHeadersField = ExtendableTextField("", 0)
         cell(customRequestHeadersField)
-            .horizontalAlign(HorizontalAlign.FILL)
+            .align(AlignX.FILL)
             .comment(
                 CodyBundle.getString("login.dialog.custom-headers.comment").trimMargin(),
                 MAX_LINE_LENGTH_NO_WRAP)
diff --git a/src/main/kotlin/com/sourcegraph/cody/config/SourcegraphInstanceLoginDialog.kt b/src/main/kotlin/com/sourcegraph/cody/config/SourcegraphInstanceLoginDialog.kt
@@ -22,9 +22,9 @@ import com.intellij.ui.AnimatedIcon
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBTextField
 import com.intellij.ui.components.fields.ExtendableTextField
+import com.intellij.ui.dsl.builder.AlignX
 import com.intellij.ui.dsl.builder.MAX_LINE_LENGTH_NO_WRAP
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import com.intellij.ui.layout.not
 import com.intellij.ui.layout.selected
 import com.intellij.util.ui.UIUtil.getInactiveTextColor
@@ -98,7 +98,7 @@ class SourcegraphInstanceLoginDialog(
                 instanceUrlField = this
                 text = defaultInstanceUrl
               }
-              .horizontalAlign(HorizontalAlign.FILL)
+              .align(AlignX.FILL)
         }
         .rowComment(
             CodyBundle.getString("login.dialog.instance-url.comment"),
@@ -110,13 +110,13 @@ class SourcegraphInstanceLoginDialog(
                 tokenField = this
                 tokenField.document.whenTextChanged { tokenAcquisitionError = null }
               }
-              .horizontalAlign(HorizontalAlign.FILL)
+              .align(AlignX.FILL)
         }
         .visibleIf(advancedSettings.selected)
     group(CodyBundle.getString("login.dialog.optional.group"), indent = false) {
           row(CodyBundle.getString("login.dialog.custom-headers.label")) {
             cell(ExtendableTextField(/*columns =*/ 0))
-                .horizontalAlign(HorizontalAlign.FILL)
+                .align(AlignX.FILL)
                 .comment(
                     CodyBundle.getString("login.dialog.custom-headers.comment"),
                     maxLineLength = MAX_LINE_LENGTH_NO_WRAP)
diff --git a/src/main/kotlin/com/sourcegraph/cody/config/ui/AccountConfigurable.kt b/src/main/kotlin/com/sourcegraph/cody/config/ui/AccountConfigurable.kt
@@ -9,11 +9,10 @@ import com.intellij.openapi.ui.DialogPanel
 import com.intellij.openapi.updateSettings.impl.UpdateSettings
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.SimpleListCellRenderer
+import com.intellij.ui.dsl.builder.Align
 import com.intellij.ui.dsl.builder.bindItem
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.gridLayout.HorizontalAlign
-import com.intellij.ui.dsl.gridLayout.VerticalAlign
 import com.intellij.util.ui.EmptyIcon
 import com.sourcegraph.cody.auth.Account
 import com.sourcegraph.cody.auth.ui.customAccountsPanel
@@ -65,8 +64,7 @@ class AccountConfigurable(val project: Project) :
                   EmptyIcon.ICON_16) {
                     it.copy(server = it.server.copy())
                   }
-              .horizontalAlign(HorizontalAlign.FILL)
-              .verticalAlign(VerticalAlign.FILL)
+              .align(Align.FILL)
               .applyToComponent { this.preferredSize = Dimension(Int.MAX_VALUE, 200) }
               .also {
                 DataManager.registerDataProvider(it.component) { key ->
diff --git a/src/main/kotlin/com/sourcegraph/cody/config/ui/CodeSearchConfigurable.kt b/src/main/kotlin/com/sourcegraph/cody/config/ui/CodeSearchConfigurable.kt
@@ -5,10 +5,10 @@ import com.intellij.openapi.options.BoundConfigurable
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.openapi.ui.setEmptyState
+import com.intellij.ui.dsl.builder.AlignX
 import com.intellij.ui.dsl.builder.MAX_LINE_LENGTH_NO_WRAP
 import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import com.sourcegraph.cody.config.CodyProjectSettings
 import com.sourcegraph.cody.config.SettingsModel
 import com.sourcegraph.config.ConfigUtil
@@ -26,7 +26,7 @@ class CodeSearchConfigurable(val project: Project) :
           textField()
               .label("Default branch name:")
               .comment("The branch to use if the current branch is not yet pushed")
-              .horizontalAlign(HorizontalAlign.FILL)
+              .align(AlignX.FILL)
               .bindText(settingsModel::defaultBranchName)
               .applyToComponent {
                 this.setEmptyState("main")
@@ -43,7 +43,7 @@ class CodeSearchConfigurable(val project: Project) :
                   """
                       .trimMargin(),
                   MAX_LINE_LENGTH_NO_WRAP)
-              .horizontalAlign(HorizontalAlign.FILL)
+              .align(AlignX.FILL)
               .bindText(settingsModel::remoteUrlReplacements)
               .applyToComponent {
                 this.setEmptyState("search1, replacement1, search2, replacement2, ...")
diff --git a/src/main/kotlin/com/sourcegraph/cody/config/ui/CodyConfigurable.kt b/src/main/kotlin/com/sourcegraph/cody/config/ui/CodyConfigurable.kt
@@ -6,14 +6,14 @@ import com.intellij.openapi.ui.DialogPanel
 import com.intellij.ui.ColorPanel
 import com.intellij.ui.JBColor
 import com.intellij.ui.components.JBCheckBox
+import com.intellij.ui.dsl.builder.AlignX
 import com.intellij.ui.dsl.builder.Cell
 import com.intellij.ui.dsl.builder.MAX_LINE_LENGTH_NO_WRAP
 import com.intellij.ui.dsl.builder.Row
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.builder.selected
 import com.intellij.ui.dsl.builder.toMutableProperty
-import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import com.intellij.ui.layout.and
 import com.sourcegraph.cody.config.CodyApplicationSettings
 import com.sourcegraph.cody.config.SettingsModel
@@ -97,7 +97,7 @@ class CodyConfigurable(val project: Project) : BoundConfigurable(ConfigUtil.CODY
         row {
           autocompleteLanguageTable()
               .enabledIf(enableAutocompleteCheckbox.selected)
-              .horizontalAlign(HorizontalAlign.FILL)
+              .align(AlignX.FILL)
               .bind(
                   AutocompleteLanguageTableWrapper::getBlacklistedLanguageIds,
                   AutocompleteLanguageTableWrapper::setBlacklistedLanguageIds,
diff --git a/src/main/kotlin/com/sourcegraph/cody/initialization/PostStartupActivity.kt b/src/main/kotlin/com/sourcegraph/cody/initialization/PostStartupActivity.kt
@@ -5,7 +5,7 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.EditorFactory
 import com.intellij.openapi.editor.ex.EditorEventMulticasterEx
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
+import com.intellij.openapi.startup.ProjectActivity
 import com.sourcegraph.cody.agent.CodyAgentService
 import com.sourcegraph.cody.config.CodyAuthenticationManager
 import com.sourcegraph.cody.config.CodySettingsChangeListener
@@ -21,18 +21,12 @@ import com.sourcegraph.config.CodyAuthNotificationActivity
 import com.sourcegraph.config.ConfigUtil
 import com.sourcegraph.telemetry.TelemetryInitializerActivity
 
-/**
- * StartupActivity is obsolete in recent platform versions.
- *
- * TODO: We should migrate to com.intellij.openapi.startup.ProjectActivity when we bump
- *   compatibility.
- */
-class PostStartupActivity : StartupActivity.DumbAware {
+class PostStartupActivity : ProjectActivity {
 
   // TODO(olafurpg): this activity is taking ~2.5s to run during tests, which indicates that we're
   // doing something wrong, which may be slowing down agent startup. Not fixing it now but this
   // deserves more investigation.
-  override fun runActivity(project: Project) {
+  override suspend fun execute(project: Project) {
     TelemetryInitializerActivity().runActivity(project)
     SettingsMigration().runActivity(project)
     CodyAuthNotificationActivity().runActivity(project)
