MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

PyInterpreterVersionUtil: use progress indicator provided by run callee

Browse Source 
GitOrigin-RevId: 914d694f3973e77581a0b952db356709f7e0a518
This commit is contained in:
Vladimir Lagunov
2021-10-11 21:38:57 +07:00
committed by intellij-monorepo-bot
parent 02520a7251
commit bb7215086a
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/src/com/jetbrains/python/target/PyInterpreterVersionUtil.kt
View File

@@ -5,11 +5,9 @@ package com.jetbrains.python.target
import com.intellij.execution.process.CapturingProcessHandler
import com.intellij.execution.target.TargetProgressIndicator
import com.intellij.execution.target.TargetProgressIndicatorAdapter
import com.intellij.execution.target.TargetedCommandLineBuilder
import com.intellij.openapi.progress.EmptyProgressIndicator
import com.intellij.openapi.progress.ProgressIndicator
import com.intellij.openapi.progress.ProgressManager
import com.intellij.openapi.progress.Task
import com.intellij.openapi.progress.*
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Ref
import com.intellij.remote.RemoteSdkException
@@ -36,11 +34,9 @@ fun PyTargetAwareAdditionalData.getInterpreterVersion(project: Project?,
val targetedCommandLineBuilder = TargetedCommandLineBuilder(targetEnvironmentRequest)
targetedCommandLineBuilder.setExePath(interpreterPath)
targetedCommandLineBuilder.addParameter(flavor.versionOption)
// TODO [targets] Use meaningful `TargetProgressIndicator` instead of `EMPTY`
val targetEnvironment = targetEnvironmentRequest.prepareEnvironment(TargetProgressIndicator.EMPTY)
val progressIndicator = ProgressManager.getInstance().progressIndicator ?: EmptyProgressIndicator()
val targetEnvironment = targetEnvironmentRequest.prepareEnvironment(TargetProgressIndicatorAdapter(indicator))
val targetedCommandLine = targetedCommandLineBuilder.build()
val process = targetEnvironment.createProcess(targetedCommandLine, progressIndicator)
val process = targetEnvironment.createProcess(targetedCommandLine, indicator)
val commandLineString = targetedCommandLine.collectCommandsSynchronously().joinToString(separator = " ")
val capturingProcessHandler = CapturingProcessHandler(process, Charsets.UTF_8, commandLineString)
val processOutput = capturingProcessHandler.runProcess()