From 6ad9967cdc3137c015ae0b4eabef0a6a5f9e97e6 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Sat, 23 Mar 2024 15:35:26 +0100 Subject: [PATCH] [vcs-log] cleanup: simplify if statement GitOrigin-RevId: 358b92198278a240d4f2142f058fe51eb0d8ebf7 --- .../intellij/vcs/log/impl/VcsLogNavigationUtil.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogNavigationUtil.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogNavigationUtil.kt index cdedc4702c32..f0a25686937e 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogNavigationUtil.kt +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogNavigationUtil.kt @@ -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.vcs.log.impl import com.google.common.util.concurrent.Futures @@ -63,13 +63,11 @@ object VcsLogNavigationUtil { private suspend fun jumpToRevision(project: Project, root: VirtualFile, hash: Hash, filePath: FilePath): Boolean { val logUi = showCommitInLogTab(project, hash, root, false) { logUi -> - if (logUi.properties.exists(MainVcsLogUiProperties.SHOW_ONLY_AFFECTED_CHANGES) && - logUi.properties[MainVcsLogUiProperties.SHOW_ONLY_AFFECTED_CHANGES] && - !logUi.properties.getFilterValues(VcsLogFilterCollection.STRUCTURE_FILTER.name).isNullOrEmpty()) { - // Structure filter might prevent us from navigating to FilePath - return@showCommitInLogTab false - } - return@showCommitInLogTab true + // Structure filter might prevent us from navigating to FilePath + val hasFilteredChanges = logUi.properties.exists(MainVcsLogUiProperties.SHOW_ONLY_AFFECTED_CHANGES) && + logUi.properties[MainVcsLogUiProperties.SHOW_ONLY_AFFECTED_CHANGES] && + !logUi.properties.getFilterValues(VcsLogFilterCollection.STRUCTURE_FILTER.name).isNullOrEmpty() + return@showCommitInLogTab !hasFilteredChanges } ?: return false logUi.selectFilePath(filePath, true)