Merge remote-tracking branch 'origin/master'

platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java

@@ -107,7 +107,10 @@ public class PsiManagerImpl extends PsiManagerEx {
 
   @Override
   public void dropResolveCaches() {
-    ((FileManagerImpl)myFileManager).processQueue();
+    FileManager fileManager = myFileManager;
+    if (fileManager instanceof FileManagerImpl) { // mock tests
+      ((FileManagerImpl)fileManager).processQueue();
+    }
     beforeChange(true);
     beforeChange(false);
   }

platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java

@@ -3317,7 +3317,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
 
   @Override
   public int logicalPositionToOffset(@NotNull LogicalPosition pos) {
-    assertIsDispatchThread();
+    assertReadAccess();
     if (myDocument.getLineCount() == 0) return 0;
 
     if (pos.line < 0) throw new IndexOutOfBoundsException("Wrong line: " + pos.line);