diff options
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/fileEditor/impl')
4 files changed, 12 insertions, 11 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java index 091ff1171157..cce6de27545d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java @@ -621,6 +621,7 @@ public class FileDocumentManagerImpl extends FileDocumentManager implements Virt DocumentEx documentEx = (DocumentEx)document; documentEx.setReadOnly(false); LoadTextUtil.setCharsetWasDetectedFromBytes(file, null); + file.setBOM(null); // reset BOM in case we had one and the external change stripped it away documentEx.replaceText(LoadTextUtil.loadText(file), file.getModificationStamp()); documentEx.setReadOnly(!wasWritable); } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java index c7fa51f770d1..bab6d2b2fa4f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java @@ -1636,7 +1636,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec */ private final class MyVirtualFileListener extends VirtualFileAdapter { @Override - public void beforeFileDeletion(VirtualFileEvent e) { + public void beforeFileDeletion(@NotNull VirtualFileEvent e) { assertDispatchThread(); boolean moveFocus = moveFocusOnDelete(); @@ -1651,7 +1651,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec } @Override - public void propertyChanged(VirtualFilePropertyEvent e) { + public void propertyChanged(@NotNull VirtualFilePropertyEvent e) { if (VirtualFile.PROP_NAME.equals(e.getPropertyName())) { assertDispatchThread(); final VirtualFile file = e.getFile(); @@ -1681,7 +1681,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec } @Override - public void fileMoved(VirtualFileMoveEvent e) { + public void fileMoved(@NotNull VirtualFileMoveEvent e) { final VirtualFile file = e.getFile(); final VirtualFile[] openFiles = getOpenFiles(); for (final VirtualFile openFile : openFiles) { diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/HistoryEntry.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/HistoryEntry.java index 5f3dd9adad22..51d044866717 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/HistoryEntry.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/HistoryEntry.java @@ -24,18 +24,19 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.util.containers.HashMap; import org.jdom.Element; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.Map; final class HistoryEntry{ - static final String TAG = "entry"; + @NonNls static final String TAG = "entry"; private static final String FILE_ATTR = "file"; - private static final String PROVIDER_ELEMENT = "provider"; - private static final String EDITOR_TYPE_ID_ATTR = "editor-type-id"; - private static final String SELECTED_ATTR_VALUE = "selected"; - private static final String STATE_ELEMENT = "state"; + @NonNls private static final String PROVIDER_ELEMENT = "provider"; + @NonNls private static final String EDITOR_TYPE_ID_ATTR = "editor-type-id"; + @NonNls private static final String SELECTED_ATTR_VALUE = "selected"; + @NonNls private static final String STATE_ELEMENT = "state"; public final VirtualFile myFile; /** @@ -53,7 +54,7 @@ final class HistoryEntry{ } } - public HistoryEntry(Project project, Element e) throws InvalidDataException { + public HistoryEntry(@NotNull Project project, @NotNull Element e) throws InvalidDataException { myFile = getVirtualFile(e); myProvider2State = new HashMap<FileEditorProvider, FileEditorState>(); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java index 288227eb51bd..de11bd5b9a12 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java @@ -36,7 +36,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.impl.EditorHistoryManager; -import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl; import com.intellij.openapi.fileTypes.FileTypeEvent; import com.intellij.openapi.fileTypes.FileTypeListener; import com.intellij.openapi.fileTypes.FileTypeManager; @@ -278,7 +277,7 @@ class TextEditorComponent extends JBLoadingPanel implements DataProvider { if (e == null) return null; if (!myProject.isDisposed()) { - final Object o = ((FileEditorManagerImpl)FileEditorManager.getInstance(myProject)).getData(dataId, e, myFile); + final Object o = FileEditorManager.getInstance(myProject).getData(dataId, e, e.getCaretModel().getCurrentCaret()); if (o != null) return o; } |