From 22bdba12343d955ef11b00e0576681fa427116ec Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Tue, 23 Sep 2014 19:11:23 +0400
Subject: [PATCH] diff: LST - clarify lock assertions

---
 .../openapi/vcs/ex/LineStatusTracker.java         | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTracker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTracker.java
index 98d228eab3d5..88df6c426c7f 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTracker.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTracker.java
@@ -94,7 +94,7 @@ public class LineStatusTracker {
   }
 
   public void initialize(@NotNull final String vcsContent, @NotNull RevisionPack baseRevisionNumber) {
-    ApplicationManager.getApplication().assertIsDispatchThread();
+    myApplication.assertIsDispatchThread();
 
     synchronized (myLock) {
       try {
@@ -120,7 +120,7 @@ public class LineStatusTracker {
   }
 
   private void reinstallRanges() {
-    myApplication.assertReadAccessAllowed();
+    myApplication.assertIsDispatchThread();
 
     synchronized (myLock) {
       removeAnathema();
@@ -129,7 +129,6 @@ public class LineStatusTracker {
         myRanges = new RangesBuilder(myDocument, myVcsDocument).getRanges();
       }
       catch (FilesTooBigForDiffException e) {
-        myRanges.clear();
         installAnathema();
         return;
       }
@@ -167,6 +166,8 @@ public class LineStatusTracker {
 
   @NotNull
   private RangeHighlighter createHighlighter(@NotNull Range range) {
+    myApplication.assertIsDispatchThread();
+
     LOG.assertTrue(!myReleased, "Already released");
 
     int first =
@@ -239,8 +240,6 @@ public class LineStatusTracker {
 
   @NotNull
   public List<Range> getRanges() {
-    myApplication.assertReadAccessAllowed();
-
     synchronized (myLock) {
       return myRanges;
     }
@@ -306,7 +305,7 @@ public class LineStatusTracker {
 
     @Override
     public void beforeDocumentChange(DocumentEvent e) {
-      myApplication.assertWriteAccessAllowed();
+      myApplication.assertIsDispatchThread();
 
       synchronized (myLock) {
         if (myReleased) return;
@@ -333,7 +332,7 @@ public class LineStatusTracker {
 
     @Override
     public void documentChanged(final DocumentEvent e) {
-      myApplication.assertWriteAccessAllowed();
+      myApplication.assertIsDispatchThread();
 
       synchronized (myLock) {
         if (myReleased) return;
@@ -834,6 +833,8 @@ public class LineStatusTracker {
 
   @NotNull
   TextRange getCurrentTextRange(@NotNull Range range) {
+    myApplication.assertReadAccessAllowed();
+
     synchronized (myLock) {
       if (!range.isValid()) {
         LOG.warn("Current TextRange of invalid range");