1 files changed, 12 insertions, 11 deletions
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java
index 267c0ee67fc3..caeb02a2316f 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java
@@ -267,25 +267,26 @@ public class ToolsImpl implements Tools {
   public void removeScope(int scopeIdx) {
     if (myTools != null && scopeIdx >= 0 && myTools.size() > scopeIdx) {
       myTools.remove(scopeIdx);
-      if (myTools.isEmpty()) {
-        myTools = null;
-        setEnabled(myDefaultState.isEnabled());
-      }
+      checkToolsIsEmpty();
     }
   }
 
-  public void removeScope(final NamedScope scope) {
+  public void removeScope(final @NotNull String scopeName) {
     if (myTools != null) {
-      for (final ScopeToolState tool : myTools) {
-        if (Comparing.equal(tool.getScopeName(), scope.getName())) {
+      for (ScopeToolState tool : myTools) {
+        if (scopeName.equals(tool.getScopeName())) {
           myTools.remove(tool);
           break;
         }
       }
-      if (myTools.isEmpty()) {
-        myTools = null;
-        setEnabled(myDefaultState.isEnabled());
-      }
+      checkToolsIsEmpty();
+    }
+  }
+
+  private void checkToolsIsEmpty() {
+    if (myTools.isEmpty()) {
+      myTools = null;
+      setEnabled(myDefaultState.isEnabled());
     }
   }