From 839984e9dd2f562ff0758c26cfc1efee05a6252b Mon Sep 17 00:00:00 2001 From: Roland Illig Date: Fri, 9 Dec 2022 21:04:27 +0100 Subject: [PATCH] Cleanup: reduce nesting of 'if' in HotSwapUIImpl GitOrigin-RevId: f74dbf11ae7e1f6a791e74d4fb981b5dcf7b1bd7 --- .../intellij/debugger/ui/HotSwapUIImpl.java | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapUIImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapUIImpl.java index 89c5cdab0d35..2ab737da3584 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapUIImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapUIImpl.java @@ -313,25 +313,23 @@ public final class HotSwapUIImpl extends HotSwapUI { if (!hasCompilationResults(result)) return; ProjectTaskContext context = result.getContext(); - if (!result.hasErrors() && !result.isAborted() && !SKIP_HOT_SWAP_KEY.getRequired(context)) { - HotSwapUIImpl instance = (HotSwapUIImpl)getInstance(myProject); - for (HotSwapVetoableListener listener : instance.myListeners) { - if (!listener.shouldHotSwap(context)) { - return; - } - } + if (result.hasErrors() || result.isAborted()) return; + if (SKIP_HOT_SWAP_KEY.getRequired(context)) return; - List sessions = getHotSwappableDebugSessions(myProject); - if (!sessions.isEmpty()) { - Map> generatedPaths = collectGeneratedPaths(context); - - HotSwapStatusListener callback = context.getUserData(HOT_SWAP_CALLBACK_KEY); - NotNullLazyValue> outputRoots = context.getDirtyOutputPaths() - .map(stream -> NotNullLazyValue.createValue(() -> (List)stream.collect(Collectors.toCollection(SmartList::new)))) - .orElse(null); - instance.hotSwapSessions(sessions, generatedPaths, outputRoots, callback); - } + HotSwapUIImpl instance = (HotSwapUIImpl)getInstance(myProject); + for (HotSwapVetoableListener listener : instance.myListeners) { + if (!listener.shouldHotSwap(context)) return; } + + List sessions = getHotSwappableDebugSessions(myProject); + if (sessions.isEmpty()) return; + + Map> generatedPaths = collectGeneratedPaths(context); + HotSwapStatusListener callback = context.getUserData(HOT_SWAP_CALLBACK_KEY); + NotNullLazyValue> outputRoots = context.getDirtyOutputPaths() + .map(stream -> NotNullLazyValue.createValue(() -> (List)stream.collect(Collectors.toCollection(SmartList::new)))) + .orElse(null); + instance.hotSwapSessions(sessions, generatedPaths, outputRoots, callback); } @NotNull