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

IDEA-343642 cleanup

Browse Source 
GitOrigin-RevId: 88ef523c4df5b709cd86c96a52b8b342603444a6
This commit is contained in:
Vladimir Krivosheev
2024-01-23 17:56:51 +01:00
committed by intellij-monorepo-bot
parent a920a363f7
commit d1ac1cd489
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationUtil.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.application.ex;
import com.intellij.openapi.application.Application;
@@ -31,21 +31,23 @@ public final class ApplicationUtil {
}
/**
* Allows to interrupt a process which does not performs checkCancelled() calls by itself.
* Allows interrupting a process which does not perform checkCancelled() calls by itself.
* Note that the process may continue to run in background indefinitely - so <b>avoid using this method unless absolutely needed</b>.
*/
public static <T> T runWithCheckCanceled(final @NotNull Callable<? extends T> callable, final @NotNull ProgressIndicator indicator) throws Exception {
final Ref<T> result = Ref.create();
final Ref<Throwable> error = Ref.create();
final Ref<T> result = new Ref<>();
final Ref<Throwable> error = new Ref<>();
Future<?> future = ApplicationManager.getApplication().executeOnPooledThread(() -> ProgressManager.getInstance().executeProcessUnderProgress(() -> {
try {
result.set(callable.call());
}
catch (Throwable t) {
error.set(t);
}
}, indicator));
Future<?> future = ApplicationManager.getApplication().executeOnPooledThread(() -> {
ProgressManager.getInstance().executeProcessUnderProgress(() -> {
try {
result.set(callable.call());
}
catch (Throwable t) {
error.set(t);
}
}, indicator);
});
try {
runWithCheckCanceled(future, indicator);

4
plugins/grazie/src/main/kotlin/com/intellij/grazie/grammar/LanguageToolChecker.kt
View File

@@ -64,7 +64,9 @@ open class LanguageToolChecker : TextChecker() {
val indicator = ProgressManager.getGlobalProgressIndicator()
checkNotNull(indicator) { "Indicator was not set for current job" }
return@coroutineToIndicator ApplicationUtil.runWithCheckCanceled(
{ collectLanguageToolProblems(extracted, text, language) },
{
collectLanguageToolProblems(extracted = extracted, text = text, lang = language)
},
indicator
)
}