Skip to content

Commit

Permalink
[JetBrains] Update IDE images to new build version
Browse files Browse the repository at this point in the history
fix cli endpoint incompatiblities for stable
  • Loading branch information
roboquat authored and akosyakov committed Feb 1, 2023
1 parent 894ac21 commit 9ad3021
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 11 deletions.
16 changes: 8 additions & 8 deletions WORKSPACE.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ defaultArgs:
codeVersion: 1.75.0
codeQuality: stable
noVerifyJBPlugin: false
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2022.3.1.tar.gz"
golandDownloadUrl: "https://download.jetbrains.com/go/goland-2022.3.1.tar.gz"
pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.tar.gz"
phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.tar.gz"
rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.tar.gz"
webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.tar.gz"
riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.tar.gz"
clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2022.3.1.tar.gz"
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2022.3.2.tar.gz"
golandDownloadUrl: "https://download.jetbrains.com/go/goland-2022.3.2.tar.gz"
pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.tar.gz"
phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.tar.gz"
rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.tar.gz"
webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.tar.gz"
riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.tar.gz"
clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2022.3.2.tar.gz"
jbBackendVersion: "latest"
REPLICATED_API_TOKEN: ""
REPLICATED_APP: ""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
pluginSinceBuild=223.8617
pluginSinceBuild=223.6160
pluginUntilBuild=223.*
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
# See https://jb.gg/intellij-platform-builds-list for available build versions.
pluginVerifierIdeVersions=2022.3
# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
platformVersion=223.8617-EAP-CANDIDATE-SNAPSHOT
platformVersion=223.6160-EAP-CANDIDATE-SNAPSHOT
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package io.gitpod.jetbrains.remote

import com.intellij.codeWithMe.ClientId
import com.intellij.ide.BrowserUtil
import com.intellij.ide.CliResult
import com.intellij.ide.CommandLineProcessor
import com.intellij.openapi.client.ClientSession
import com.intellij.openapi.client.ClientSessionsManager
Expand All @@ -27,12 +28,14 @@ import io.netty.handler.codec.http.FullHttpRequest
import io.netty.handler.codec.http.QueryStringDecoder
import io.prometheus.client.exporter.common.TextFormat
import kotlinx.coroutines.*
import kotlinx.coroutines.future.asDeferred
import org.jetbrains.ide.RestService
import org.jetbrains.io.response
import java.io.OutputStreamWriter
import java.nio.file.InvalidPathException
import java.nio.file.Path
import java.util.*
import java.util.concurrent.CompletableFuture

@Suppress("UnstableApiUsage", "OPT_IN_USAGE")
class GitpodCLIService : RestService() {
Expand Down Expand Up @@ -67,7 +70,14 @@ class GitpodCLIService : RestService() {
val file = parseFilePath(fileStr) ?: return "invalid file"
val shouldWait = getBooleanParameter("wait", urlDecoder)
return withClient(request, context) {
CommandLineProcessor.doOpenFileOrProject(file, shouldWait).future.await()
val f = CommandLineProcessor.doOpenFileOrProject(file, shouldWait).future
val d = if (f is Deferred<*>)
f // latest
else if (f is CompletableFuture<*>)
f.asDeferred() // stable
else
throw IllegalStateException("unexpected")
d.await()
}
}
if (operation == "preview") {
Expand Down

0 comments on commit 9ad3021

Please sign in to comment.