MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

Mark blocking runProcess method as RequiresBackgroundThread.

Browse Source 
GitOrigin-RevId: 6f6af40da83dc0183e45bf0bcfaf33ac796042f9
This commit is contained in:
Ilya.Kazakevich
2024-10-04 03:57:30 +02:00
committed by intellij-monorepo-bot
parent a5f20200bb
commit a253b08348
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/platform-impl/src/com/intellij/execution/wsl/WSLDistribution.java
View File

@@ -185,7 +185,7 @@ public class WSLDistribution implements AbstractWslDistribution {
* @param timeout timeout in ms
* @param processHandlerConsumer consumes process handler just before execution, may be used for cancellation
*/
@RequiresBackgroundThread(generateAssertion = false)
@RequiresBackgroundThread(generateAssertion = true)
public @NotNull ProcessOutput executeOnWsl(@NotNull List<String> command,
@NotNull WSLCommandLineOptions options,
int timeout,
@@ -204,7 +204,7 @@ public class WSLDistribution implements AbstractWslDistribution {
return output;
}
@RequiresBackgroundThread(generateAssertion = false)
@RequiresBackgroundThread
public @NotNull ProcessOutput executeOnWsl(int timeout, @NonNls String @NotNull ... command) throws ExecutionException {
return executeOnWsl(Arrays.asList(command), new WSLCommandLineOptions(), timeout, null);
}

4
platform/platform-util-io/src/com/intellij/execution/process/CapturingProcessHandler.java
View File

@@ -43,7 +43,7 @@ public class CapturingProcessHandler extends OSProcessHandler {
* Blocks until process finished, returns its output
*/
@NotNull
@RequiresBackgroundThread(generateAssertion = false)
@RequiresBackgroundThread
public final ProcessOutput runProcess() {
return myProcessRunner.runProcess();
}
@@ -53,7 +53,7 @@ public class CapturingProcessHandler extends OSProcessHandler {
*
* @param timeoutInMilliseconds non-positive means infinity
*/
@RequiresBackgroundThread(generateAssertion = false)
@RequiresBackgroundThread
public ProcessOutput runProcess(int timeoutInMilliseconds) {
return myProcessRunner.runProcess(timeoutInMilliseconds);
}

10
platform/platform-util-io/src/com/intellij/execution/util/ExecUtil.kt
View File

@@ -86,20 +86,20 @@ object ExecUtil {
@JvmStatic
@Throws(ExecutionException::class)
@RequiresBackgroundThread(generateAssertion = false)
@RequiresBackgroundThread(generateAssertion = true)
fun execAndGetOutput(commandLine: GeneralCommandLine): ProcessOutput {
return CapturingProcessHandler(commandLine).runProcess()
}
@JvmStatic
@Throws(ExecutionException::class)
@RequiresBackgroundThread(generateAssertion = false)
@RequiresBackgroundThread(generateAssertion = true)
fun execAndGetOutput(commandLine: GeneralCommandLine, timeoutInMilliseconds: Int): ProcessOutput {
return CapturingProcessHandler(commandLine).runProcess(timeoutInMilliseconds)
}
@JvmStatic
@RequiresBackgroundThread(generateAssertion = false)
@RequiresBackgroundThread(generateAssertion = true)
fun execAndGetOutput(commandLine: GeneralCommandLine, stdin: String): String {
return CapturingProcessHandler(commandLine).also { processHandler ->
processHandler.addProcessListener(object : ProcessAdapter() {
@@ -113,7 +113,7 @@ object ExecUtil {
}
@JvmStatic
@RequiresBackgroundThread(generateAssertion = false)
@RequiresBackgroundThread(generateAssertion = true)
fun execAndReadLine(commandLine: GeneralCommandLine): String? {
return try {
readFirstLine(commandLine.createProcess().inputStream, commandLine.charset)
@@ -125,7 +125,7 @@ object ExecUtil {
}
@ApiStatus.Internal
@RequiresBackgroundThread(generateAssertion = false)
@RequiresBackgroundThread(generateAssertion = true)
@JvmStatic
fun readFirstLine(stream: InputStream, cs: Charset?): String? {
return try {