From 70f2ff945a16a1fa3cc5c711897fd9da6ae8071d Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Mon, 17 Sep 2018 23:02:19 +0300 Subject: [PATCH] [file-history] shorten wait time for synchronous diff loading in preview This allows to walk through the history graph faster. --- .../com/intellij/diff/impl/CacheDiffRequestProcessor.java | 6 +++++- .../com/intellij/vcs/log/history/FileHistoryDiffPreview.kt | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java index 537d101343b5..fcda2452c5ef 100644 --- a/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java @@ -117,10 +117,14 @@ public abstract class CacheDiffRequestProcessor extends DiffRequestProcessor () -> { applyRequest(new LoadingDiffRequest(getRequestName(requestProvider)), force, scrollToChangePolicy); }, - ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS + getFastLoadingTimeMillis() ); } + protected int getFastLoadingTimeMillis() { + return ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS; + } + @Nullable protected DiffRequest loadRequestFast(@NotNull T provider) { return myRequestCache.get(provider); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryDiffPreview.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryDiffPreview.kt index 22f819f216f1..d29835749e2a 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryDiffPreview.kt +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryDiffPreview.kt @@ -38,6 +38,10 @@ internal class FileHistoryDiffPreview(project: Project, private val changeGetter } } + override fun getFastLoadingTimeMillis(): Int { + return 10 + } + private inner class MyChangeWrapper internal constructor(private val change: Change) : ChangeViewDiffRequestProcessor.Wrapper() { override fun getUserObject(): Any {