From 64ba6e6ad29c900a97275bd9fc04bc55daef9670 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 5 May 2010 16:43:01 +0400 Subject: [PATCH] cleanup --- .../psi/impl/PsiDocumentManagerImpl.java | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java index a4c463c9b29d..b2151518a7b1 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java @@ -520,29 +520,28 @@ public class PsiDocumentManagerImpl extends PsiDocumentManager implements Projec public void documentChanged(DocumentEvent event) { final Document document = event.getDocument(); final FileViewProvider viewProvider = getCachedViewProvider(document); - if (viewProvider != null) { - if (viewProvider.getVirtualFile().getFileType().isBinary()) return; + if (viewProvider == null) return; + if (viewProvider.getVirtualFile().getFileType().isBinary()) return; - final List files = viewProvider.getAllFiles(); - boolean commitNecessary = false; - for (PsiFile file : files) { - if (file == null || file instanceof PsiFileImpl && ((PsiFileImpl)file).getTreeElement() == null) continue; - final TextBlock textBlock = getTextBlock(document, file); - if (textBlock.isLocked()) continue; + final List files = viewProvider.getAllFiles(); + boolean commitNecessary = false; + for (PsiFile file : files) { + if (file == null || file instanceof PsiFileImpl && ((PsiFileImpl)file).getTreeElement() == null) continue; + final TextBlock textBlock = getTextBlock(document, file); + if (textBlock.isLocked()) continue; - if (mySmartPointerManager != null) { // mock tests - SmartPointerManagerImpl.unfastenBelts(file); - } - - textBlock.documentChanged(event); - assert file instanceof PsiFileImpl : event + "; file="+file+"; allFiles="+files+"; viewProvider="+viewProvider; - myUncommittedDocuments.add(document); - commitNecessary = true; + if (mySmartPointerManager != null) { // mock tests + SmartPointerManagerImpl.unfastenBelts(file); } - if (commitNecessary && ApplicationManager.getApplication().getCurrentWriteAction(ExternalChangeAction.class) != null){ - commitDocument(document); - } + textBlock.documentChanged(event); + assert file instanceof PsiFileImpl : event + "; file="+file+"; allFiles="+files+"; viewProvider="+viewProvider; + myUncommittedDocuments.add(document); + commitNecessary = true; + } + + if (commitNecessary && ApplicationManager.getApplication().getCurrentWriteAction(ExternalChangeAction.class) != null){ + commitDocument(document); } }