From 1befd2e3405e8deeaf4a206461591d33bcb0186e Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 13 Sep 2017 16:00:18 +0300 Subject: [PATCH] vcs: do not create two streams instead of one in AnAction.update() --- .../openapi/vcs/actions/TabbedShowHistoryAction.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/TabbedShowHistoryAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/TabbedShowHistoryAction.java index 6d8d0f752f88..5af43e459339 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/TabbedShowHistoryAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/TabbedShowHistoryAction.java @@ -33,9 +33,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.File; +import java.util.List; +import java.util.stream.Collectors; import static com.intellij.util.ObjectUtils.assertNotNull; -import static com.intellij.util.containers.UtilKt.getIfSingle; public class TabbedShowHistoryAction extends AbstractVcsAction { @@ -86,9 +87,11 @@ public class TabbedShowHistoryAction extends AbstractVcsAction { @NotNull private static Pair getPathAndParentFile(@NotNull VcsContext context) { - if (context.getSelectedFilesStream().findAny().isPresent()) { - VirtualFile file = getIfSingle(context.getSelectedFilesStream()); - return file != null ? Pair.create(VcsUtil.getFilePath(file), file) : Pair.empty(); + List selectedFiles = context.getSelectedFilesStream().limit(2).collect(Collectors.toList()); + if (selectedFiles.size() > 0) { + if (selectedFiles.size() != 1) return Pair.empty(); + VirtualFile file = selectedFiles.get(0); + return Pair.create(VcsUtil.getFilePath(file), file); } File[] ioFiles = context.getSelectedIOFiles();