From 9ae0dd4d336147cf0482c024d2c58c07323a66e0 Mon Sep 17 00:00:00 2001
From: Ivan Semenov <ivan.semenov@jetbrains.com>
Date: Wed, 22 Aug 2018 17:29:42 +0300
Subject: [PATCH] [github] Fix pull request loader

Initial indicator was reusable, so loader could load more than needed
---
 .../pullrequest/data/GithubPullRequestsLoader.kt | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsLoader.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsLoader.kt
index 4c115857b769..ae6202942279 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsLoader.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsLoader.kt
@@ -27,7 +27,7 @@ class GithubPullRequestsLoader(private val progressManager: ProgressManager,
   private val LOG = logger<GithubPullRequestsLoader>()
 
   private val executor = AppExecutorUtil.createBoundedApplicationPoolExecutor("GitHub PR loading breaker", 1)
-  private var progressIndicator = EmptyProgressIndicator()
+  private var progressIndicator = createNonReusableIndicator()
   private var query: String = buildQuery(null)
   private var nextPageRequest: GithubApiRequest<GithubResponsePage<GithubSearchedIssue>>? = createInitialRequest()
   private var isDisposed = false
@@ -111,12 +111,7 @@ class GithubPullRequestsLoader(private val progressManager: ProgressManager,
   fun reset() {
     if (isDisposed) return
     progressIndicator.cancel()
-    progressIndicator = object : EmptyProgressIndicator() {
-      override fun start() {
-        checkCanceled()
-        super.start()
-      }
-    }
+    progressIndicator = createNonReusableIndicator()
     executor.execute {
       nextPageRequest = createInitialRequest()
       stateEventDispatcher.multicaster.loaderReset()
@@ -124,6 +119,13 @@ class GithubPullRequestsLoader(private val progressManager: ProgressManager,
     }
   }
 
+  private fun createNonReusableIndicator(): ProgressIndicator = object : EmptyProgressIndicator() {
+    override fun start() {
+      checkCanceled()
+      super.start()
+    }
+  }
+
   fun addStateListener(listener: StateListener, disposable: Disposable) = stateEventDispatcher.addListener(listener, disposable)
 
   override fun dispose() {