From b034ae9a4b4f6bf5023f4d9fe92ef1d5f9301392 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 10 Nov 2016 14:41:08 +0300
Subject: [PATCH] moved to ProgressManager

---
 .../intellij/openapi/progress/ProgressManager.java | 13 +++++++++++++
 .../progress/util/ProgressIndicatorUtils.java      | 14 --------------
 .../openapi/project/impl/ProjectManagerImpl.java   |  3 +--
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java
index f9dfac0d9376..7087774fc791 100644
--- a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java
+++ b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java
@@ -240,4 +240,17 @@ public abstract class ProgressManager extends ProgressIndicatorProvider {
    */
   public abstract boolean runInReadActionWithWriteActionPriority(@NotNull final Runnable action);
 
+  public static boolean isInNonCancelableSection() {
+    ProgressIndicator indicator = getGlobalProgressIndicator();
+    while (indicator != null) {
+      if (indicator instanceof NonCancelableSection) return true;
+      if (indicator instanceof WrappedProgressIndicator) {
+        indicator = ((WrappedProgressIndicator)indicator).getOriginalProgressIndicator();
+      }
+      else {
+        break;
+      }
+    }
+    return false;
+  }
 }
\ No newline at end of file
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java
index 15c96efc1f83..6a8ff719fd87 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java
@@ -233,18 +233,4 @@ public class ProgressIndicatorUtils {
   public static void yieldToPendingWriteActions() {
     ApplicationManager.getApplication().invokeAndWait(EmptyRunnable.INSTANCE, ModalityState.any());
   }
-
-  public static boolean isInNonCancelableSection() {
-    ProgressIndicator indicator = ProgressIndicatorProvider.getGlobalProgressIndicator();
-    while (indicator != null) {
-      if (indicator instanceof NonCancelableSection) return true;
-      if (indicator instanceof WrappedProgressIndicator) {
-        indicator = ((WrappedProgressIndicator)indicator).getOriginalProgressIndicator();
-      }
-      else {
-        break;
-      }
-    }
-    return false;
-  }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
index ef924b969e05..4321547e08fe 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
@@ -32,7 +32,6 @@ import com.intellij.openapi.components.impl.stores.StorageUtil;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.progress.*;
-import com.intellij.openapi.progress.util.ProgressIndicatorUtils;
 import com.intellij.openapi.project.*;
 import com.intellij.openapi.project.ex.ProjectManagerEx;
 import com.intellij.openapi.startup.StartupManager;
@@ -387,7 +386,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements Disposable {
   }
 
   private static boolean canCancelProjectLoading() {
-    return !ProgressIndicatorUtils.isInNonCancelableSection();
+    return !ProgressManager.isInNonCancelableSection();
   }
 
   @Override