MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

RDO-3348: disable ides plugin installation for codecanvas

Browse Source 
Merge-request: IJ-MR-157773
Merged-by: Anton Kapeliushok <Anton.Kapeliushok@jetbrains.com>

(cherry picked from commit 0ee600a675822034c98bf5c054976cc2dd79bca0)

IJ-MR-158217

GitOrigin-RevId: e9f4113000ac097028851c5f6feafc6c7fd4b3ef
This commit is contained in:
Anton Kapeliushok
2025-03-17 15:34:10 +00:00
committed by intellij-monorepo-bot
parent a270ea2c02
commit 5d2b60433d
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeClientDownloader.kt
View File

@@ -747,13 +747,17 @@ object CodeWithMeClientDownloader {
fun runFrontendProcess(
lifetime: Lifetime,
url: String,
frontendInstallation: FrontendInstallation
frontendInstallation: FrontendInstallation,
enableBeforeRunHooks: Boolean = true,
): Lifetime {
if (enableBeforeRunHooks) {
try {
processBeforeRunHooks(frontendInstallation)
} catch (e: Throwable) {
}
catch (e: Throwable) {
LOG.error("Could not process hooks before launching client $frontendInstallation", e)
}
}
when (frontendInstallation) {
is EmbeddedFrontendInstallation -> {
return frontendInstallation.frontendLauncher.launch(url, lifetime, NotificationBasedEmbeddedClientErrorReporter(null))

29
platform/remoteDev-util/src/com/intellij/remoteDev/downloader/CodeWithMeGuestLauncher.kt
View File

@@ -38,17 +38,18 @@ object CodeWithMeGuestLauncher {
clientBuild: BuildNumber?,
url: String,
@NlsContexts.DialogTitle product: String,
onDone: (Lifetime) -> Unit = {}
enableBeforeRunHooks: Boolean,
onDone: (Lifetime) -> Unit = {},
) {
if (!application.isDispatchThread) {
// starting a task from background will call invokeLater, but with wrong modality, so do it ourselves
application.invokeLater({ downloadCompatibleClientAndLaunch(lifetime, project, clientBuild, url, product, onDone) }, ModalityState.any())
application.invokeLater({ downloadCompatibleClientAndLaunch(lifetime, project, clientBuild, url, product, enableBeforeRunHooks, onDone) }, ModalityState.any())
return
}
val uri = UrlUtil.parseOrShowError(url, product) ?: return
if (runAlreadyDownloadedClient(clientBuild, lifetime, project, url, onDone)) {
if (runAlreadyDownloadedClient(clientBuild, lifetime, project, url, enableBeforeRunHooks, onDone)) {
return
}
@@ -57,7 +58,7 @@ object CodeWithMeGuestLauncher {
return
}
ProgressManager.getInstance().run(DownloadAndLaunchClientTask(project, uri, lifetime, url, product, onDone))
ProgressManager.getInstance().run(DownloadAndLaunchClientTask(project, uri, lifetime, url, product, enableBeforeRunHooks, onDone))
}
private class DownloadAndLaunchClientTask(
@@ -66,7 +67,8 @@ object CodeWithMeGuestLauncher {
private val lifetime: Lifetime?,
private val url: String,
private val product: @NlsContexts.DialogTitle String,
private val onDone: (Lifetime) -> Unit
private val enableBeforeRunHooks: Boolean,
private val onDone: (Lifetime) -> Unit,
) : Backgroundable(project, RemoteDevUtilBundle.message("launcher.title"), true) {
private var clientLifetime : Lifetime = Lifetime.Terminated
@@ -99,7 +101,8 @@ object CodeWithMeGuestLauncher {
frontendInstallation = frontendInstallation,
urlForThinClient = url,
product = product,
progressIndicator = progressIndicator
progressIndicator = progressIndicator,
enableBeforeRunHooks = enableBeforeRunHooks,
)
}
catch (t: Throwable) {
@@ -120,7 +123,8 @@ object CodeWithMeGuestLauncher {
aLifetime: Lifetime?,
project: Project?,
url: String,
onDone: (Lifetime) -> Unit
enableBeforeRunHooks: Boolean,
onDone: (Lifetime) -> Unit,
): Boolean {
if (clientBuild == null) {
return false
@@ -141,7 +145,8 @@ object CodeWithMeGuestLauncher {
val clientLifetime = CodeWithMeClientDownloader.runFrontendProcess(
lifetime = lifetime,
url = url,
frontendInstallation = frontendInstallation
frontendInstallation = frontendInstallation,
enableBeforeRunHooks = enableBeforeRunHooks,
)
onDone(clientLifetime)
return true
@@ -166,13 +171,15 @@ object CodeWithMeGuestLauncher {
return StandaloneFrontendInstallation(guestData.targetPath, clientBuild, null)
}
fun runDownloadedFrontend(lifetime: Lifetime, frontendInstallation: FrontendInstallation, urlForThinClient: String,
@NlsContexts.DialogTitle product: String, progressIndicator: ProgressIndicator?): Lifetime {
fun runDownloadedFrontend(
lifetime: Lifetime, frontendInstallation: FrontendInstallation, urlForThinClient: String,
@NlsContexts.DialogTitle product: String, progressIndicator: ProgressIndicator?, enableBeforeRunHooks: Boolean,
): Lifetime {
// todo: offer to connect as-is?
try {
progressIndicator?.text = RemoteDevUtilBundle.message("launcher.launch.client")
progressIndicator?.text2 = frontendInstallation.installationHome.pathString
val thinClientLifetime = CodeWithMeClientDownloader.runFrontendProcess(lifetime, urlForThinClient, frontendInstallation)
val thinClientLifetime = CodeWithMeClientDownloader.runFrontendProcess(lifetime, urlForThinClient, frontendInstallation, enableBeforeRunHooks)
// Wait a bit until process will be launched and only after that finish task
Thread.sleep(3000)