From c50504ef493d2ffd55cb38a01084c8c960a9bb71 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 27 Apr 2017 15:41:26 +0300 Subject: [PATCH] diff: lambdify --- .../diff/chains/SimpleDiffRequestChain.java | 8 +------- .../tools/simple/ThreesideTextDiffViewerEx.java | 15 ++------------- .../diff/tools/util/base/TextDiffViewerUtil.java | 8 +------- .../openapi/vcs/ex/LineStatusMarkerPopup.java | 15 ++++----------- 4 files changed, 8 insertions(+), 38 deletions(-) diff --git a/platform/diff-api/src/com/intellij/diff/chains/SimpleDiffRequestChain.java b/platform/diff-api/src/com/intellij/diff/chains/SimpleDiffRequestChain.java index 2a9d5f21b062..4eb5a0a8d235 100644 --- a/platform/diff-api/src/com/intellij/diff/chains/SimpleDiffRequestChain.java +++ b/platform/diff-api/src/com/intellij/diff/chains/SimpleDiffRequestChain.java @@ -21,7 +21,6 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.util.UserDataHolder; import com.intellij.openapi.util.UserDataHolderBase; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -37,12 +36,7 @@ public class SimpleDiffRequestChain extends UserDataHolderBase implements DiffRe } public SimpleDiffRequestChain(@NotNull List requests) { - myRequests = ContainerUtil.map(requests, new Function() { - @Override - public DiffRequestProducerWrapper fun(DiffRequest request) { - return new DiffRequestProducerWrapper(request); - } - }); + myRequests = ContainerUtil.map(requests, request -> new DiffRequestProducerWrapper(request)); } @Override diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java index 5cff44075928..264204dcefd3 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java @@ -31,7 +31,6 @@ import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.project.DumbAwareAction; -import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.UserDataHolder; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; @@ -289,12 +288,7 @@ public abstract class ThreesideTextDiffViewerEx extends ThreesideTextDiffViewer @Override protected List getChanges() { List changes = ThreesideTextDiffViewerEx.this.getChanges(); - return ContainerUtil.filter(changes, new Condition() { - @Override - public boolean value(ThreesideDiffChangeBase change) { - return change.isConflict(); - } - }); + return ContainerUtil.filter(changes, change -> change.isConflict()); } } @@ -305,12 +299,7 @@ public abstract class ThreesideTextDiffViewerEx extends ThreesideTextDiffViewer List changes = ThreesideTextDiffViewerEx.this.getChanges(); final ThreeSide currentSide = getCurrentSide(); if (currentSide == ThreeSide.BASE) return changes; - return ContainerUtil.filter(changes, new Condition() { - @Override - public boolean value(ThreesideDiffChangeBase change) { - return change.isChange(currentSide); - } - }); + return ContainerUtil.filter(changes, change -> change.isChange(currentSide)); } @NotNull diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java index afbb66c661fd..de853d8f59ea 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java @@ -37,7 +37,6 @@ import com.intellij.openapi.editor.event.DocumentListener; import com.intellij.openapi.editor.event.EditorMouseEvent; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.Condition; import com.intellij.ui.ToggleActionButton; import com.intellij.util.ArrayUtil; import com.intellij.util.EditorPopupHandler; @@ -459,12 +458,7 @@ public class TextDiffViewerUtil { @NotNull public static List getEditableEditors(@NotNull List editors) { - return ContainerUtil.filter(editors, new Condition() { - @Override - public boolean value(EditorEx editor) { - return !editor.isViewer(); - } - }); + return ContainerUtil.filter(editors, editor -> !editor.isViewer()); } public static class EditorFontSizeSynchronizer implements PropertyChangeListener { diff --git a/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopup.java b/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopup.java index 831ad01cfb94..601368a8514f 100644 --- a/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopup.java +++ b/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusMarkerPopup.java @@ -36,7 +36,6 @@ import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.PlainTextFileType; -import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.util.BackgroundTaskUtil; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.util.Disposer; @@ -45,7 +44,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.HintHint; import com.intellij.ui.HintListener; import com.intellij.ui.LightweightHint; -import com.intellij.util.Function; import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -98,10 +96,8 @@ public abstract class LineStatusMarkerPopup { } public void showAfterScroll() { - myEditor.getScrollingModel().runActionOnScrollingFinished(new Runnable() { - public void run() { - showHintAt(null); - } + myEditor.getScrollingModel().runActionOnScrollingFinished(() -> { + showHintAt(null); }); } @@ -163,11 +159,8 @@ public abstract class LineStatusMarkerPopup { final CharSequence vcsContent = myTracker.getVcsContent(myRange); final CharSequence currentContent = myTracker.getCurrentContent(myRange); - return BackgroundTaskUtil.tryComputeFast(new Function>() { - @Override - public List fun(ProgressIndicator indicator) { - return ByWord.compare(vcsContent, currentContent, ComparisonPolicy.DEFAULT, indicator); - } + return BackgroundTaskUtil.tryComputeFast(indicator -> { + return ByWord.compare(vcsContent, currentContent, ComparisonPolicy.DEFAULT, indicator); }, 200); }