From 0f560bfd7d09d608ff149fc329fe60e66cef3fcd Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 3 Apr 2012 13:51:48 +0400 Subject: [PATCH 1/2] assertReadAccess instead of dispatch thread --- .../src/com/intellij/openapi/editor/impl/EditorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index 45f26eba8e8d..7a385da03791 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/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); From 0fc864459fc62ca3417c453ef0bcd18607e9569e Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 3 Apr 2012 14:07:33 +0400 Subject: [PATCH 2/2] mock tests --- .../core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java index 67115b4ffdfb..d473589db14b 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java +++ b/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); }