Skip to content

Commit 4879fe0

Browse files
committed
migrate to modern api
1 parent c4d2d30 commit 4879fe0

6 files changed

Lines changed: 318 additions & 281 deletions

File tree

‎java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/actions/AdjustArrayRangeAction.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import consulo.ui.annotation.RequiredUIAccess;
2626
import consulo.util.concurrent.AsyncResult;
2727

28+
import java.util.concurrent.CompletableFuture;
29+
2830
@ActionImpl(id = "Debugger.AdjustArrayRange")
2931
public class AdjustArrayRangeAction extends ArrayAction {
3032
public AdjustArrayRangeAction() {
@@ -33,19 +35,24 @@ public AdjustArrayRangeAction() {
3335

3436
@Override
3537
@RequiredUIAccess
36-
protected AsyncResult<ArrayRenderer> createNewRenderer(
38+
protected CompletableFuture<ArrayRenderer> createNewRenderer(
3739
XValueNode node,
3840
ArrayRenderer original,
3941
DebuggerContextImpl debuggerContext,
4042
LocalizeValue title
4143
) {
4244
ArrayRenderer clonedRenderer = original.clone();
4345
clonedRenderer.setForced(true);
44-
AsyncResult<ArrayRenderer> result = AsyncResult.undefined();
45-
AsyncResult<Void> showResult = ShowSettingsUtil.getInstance()
46+
CompletableFuture<ArrayRenderer> result = new CompletableFuture<>();
47+
CompletableFuture<Void> showResult = ShowSettingsUtil.getInstance()
4648
.editConfigurable(debuggerContext.getProject(), new NamedArrayConfigurable(title, clonedRenderer));
47-
showResult.doWhenDone(() -> result.setDone(clonedRenderer));
48-
showResult.doWhenRejected((Runnable)result::setRejected);
49+
showResult.whenComplete((r, e) -> {
50+
if (e != null) {
51+
result.completeExceptionally(e);
52+
} else {
53+
result.complete(clonedRenderer);
54+
}
55+
});
4956
return result;
5057
}
5158
}

‎java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/actions/ArrayAction.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.jspecify.annotations.Nullable;
3939

4040
import java.util.List;
41+
import java.util.concurrent.CompletableFuture;
4142

4243
public abstract class ArrayAction extends DebuggerAction implements AnActionWithSyncUpdate {
4344
protected ArrayAction(LocalizeValue text) {
@@ -75,14 +76,20 @@ public void actionPerformed(AnActionEvent e) {
7576
//if (index > 0) {
7677
// title = title + " " + label.substring(index);
7778
//}
78-
createNewRenderer(node, renderer, debuggerContext, node.getName()).doWhenDone(newRenderer -> setArrayRenderer(
79-
newRenderer,
80-
node,
81-
debuggerContext
82-
));
79+
createNewRenderer(node, renderer, debuggerContext, node.getName()).whenComplete((arrayRenderer, er) -> {
80+
if (er != null) {
81+
return;
82+
}
83+
84+
setArrayRenderer(
85+
arrayRenderer,
86+
node,
87+
debuggerContext
88+
);
89+
});
8390
}
8491

85-
protected abstract AsyncResult<ArrayRenderer> createNewRenderer(
92+
protected abstract CompletableFuture<ArrayRenderer> createNewRenderer(
8693
XValueNode node,
8794
ArrayRenderer original,
8895
DebuggerContextImpl debuggerContext,

‎java-intellilang/src/main/java/consulo/java/impl/intelliLang/JavaLanguageInjectionSupport.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,11 @@ private static void doEditInjection(final Project project, final MethodParameter
376376
methodParameterInjection = createFrom(project, originalCopy, contextMethod, false);
377377
}
378378

379-
ShowSettingsUtil.getInstance().editConfigurable(project, new MethodParameterInjectionConfigurable(methodParameterInjection, EmptyRunnable.getInstance(), project)).doWhenDone(() -> {
379+
ShowSettingsUtil.getInstance().editConfigurable(project, new MethodParameterInjectionConfigurable(methodParameterInjection, EmptyRunnable.getInstance(), project)).whenComplete((_, t) -> {
380+
if (t != null) {
381+
return;
382+
}
383+
380384
final BaseInjection newInjection = new BaseInjection(methodParameterInjection.getSupportId()).copyFrom(methodParameterInjection);
381385
if (originalInjection != null) {
382386
newInjection.mergeOriginalPlacesFrom(originalInjection, true);

0 commit comments

Comments
 (0)