impl: support for GW 2023

fioan89 · fioan89 · commit aeff36721ed6 · 2023-03-02T18:50:30.000+02:00
- there were a couple of API incompatibilities especially around remote path validation
  which now expects a more complex parameter. Fortunately there is an already existing
  helper hiding all that, that is also compatible with 2022.3
- some deprecated horizontal alignment parameters are now removed in GW 2023. Replaced them
  with the recommendations.
diff --git a/gradle.properties b/gradle.properties
@@ -7,12 +7,12 @@ pluginVersion=2.1.7
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild=223.7571.70
-pluginUntilBuild=223.*
+pluginUntilBuild=231.*
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 # Gateway available build versions https://www.jetbrains.com/intellij-repository/snapshots and https://www.jetbrains.com/intellij-repository/releases
 platformType=GW
-platformVersion=223.8617.56-CUSTOM-SNAPSHOT
-instrumentationCompiler=223.8617.56-CUSTOM-SNAPSHOT
+platformVersion=231.7665.28-CUSTOM-SNAPSHOT
+instrumentationCompiler=231.7665.28-CUSTOM-SNAPSHOT
 platformDownloadSources=true
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
@@ -29,11 +29,11 @@ import com.intellij.ui.AnimatedIcon
 import com.intellij.ui.ColoredListCellRenderer
 import com.intellij.ui.DocumentAdapter
 import com.intellij.ui.components.JBTextField
+import com.intellij.ui.dsl.builder.AlignX
 import com.intellij.ui.dsl.builder.BottomGap
 import com.intellij.ui.dsl.builder.RowLayout
 import com.intellij.ui.dsl.builder.TopGap
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import com.intellij.util.ui.JBFont
 import com.intellij.util.ui.UIUtil
 import com.intellij.util.ui.update.MergingUpdateQueue
@@ -47,6 +47,7 @@ import com.jetbrains.gateway.ssh.HighLevelHostAccessor
 import com.jetbrains.gateway.ssh.IdeStatus
 import com.jetbrains.gateway.ssh.IdeWithStatus
 import com.jetbrains.gateway.ssh.IntelliJPlatformProduct
+import com.jetbrains.gateway.ssh.util.validateRemotePath
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -62,7 +63,7 @@ import kotlinx.coroutines.withContext
 import java.awt.Component
 import java.awt.FlowLayout
 import java.time.Duration
-import java.util.Locale
+import java.util.*
 import javax.swing.ComboBoxModel
 import javax.swing.DefaultComboBoxModel
 import javax.swing.JLabel
@@ -99,13 +100,13 @@ class CoderLocateRemoteProjectStepView(private val disableNextAction: () -> Unit
                 label("IDE:")
                 cbIDE = cell(IDEComboBox(ideComboBoxModel).apply {
                     renderer = IDECellRenderer()
-                }).resizableColumn().horizontalAlign(HorizontalAlign.FILL).comment("The IDE will be downloaded from jetbrains.com").component
+                }).resizableColumn().align(AlignX.FILL).comment("The IDE will be downloaded from jetbrains.com").component
                 cell()
             }.topGap(TopGap.NONE).layout(RowLayout.PARENT_GRID)
 
             row {
                 label("Project directory:")
-                cell(tfProject).resizableColumn().horizontalAlign(HorizontalAlign.FILL).component
+                cell(tfProject).resizableColumn().align(AlignX.FILL).component
                 cell()
             }.topGap(TopGap.NONE).bottomGap(BottomGap.NONE).layout(RowLayout.PARENT_GRID)
             row {
@@ -190,8 +191,8 @@ class CoderLocateRemoteProjectStepView(private val disableNextAction: () -> Unit
                 pathValidationJobs.queue(Update.create("validate-remote-path") {
                     runBlocking {
                         try {
-                            val isPathPresent = executor.isPathPresentOnRemote(tfProject.text)
-                            if (!isPathPresent) {
+                            val isPathPresent = validateRemotePath(tfProject.text, executor)
+                            if (isPathPresent.pathOrNull == null) {
                                 ComponentValidator.getInstance(tfProject).ifPresent {
                                     it.updateInfo(ValidationInfo("Can't find directory: ${tfProject.text}", tfProject))
                                 }
