MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use isFileModified instead of isDocumentUnsaved

Browse Source
This commit is contained in:
peter
2011-03-03 17:27:34 +01:00
parent 08ed93554c
commit e2453f6e68
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java
+1 -2
View File
@@ -169,8 +169,7 @@ public class IdeaGateway {
Pair<StoredContent, Long> contentAndStamps;
if (forDeletion) {
FileDocumentManager m = FileDocumentManager.getInstance();
Document d = m.getCachedDocument(file); // should not try to load document
if (d != null && !m.isDocumentUnsaved(d)) d = null;
Document d = m.isFileModified(file) ? m.getCachedDocument(file) : null; // should not try to load document
contentAndStamps = acquireAndClearCurrentContent(file, d);
}
else {
plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java
+1 -3
View File
@@ -20,7 +20,6 @@ import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.lang.annotation.Annotation;
import com.intellij.lang.annotation.AnnotationHolder;
import com.intellij.lang.annotation.Annotator;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.project.Project;
@@ -39,9 +38,8 @@ public class GroovyDslAnnotator implements Annotator {
public void annotate(@NotNull PsiElement psiElement, @NotNull AnnotationHolder holder) {
if (psiElement instanceof GroovyFile) {
final VirtualFile vfile = ((GroovyFile)psiElement).getVirtualFile();
Document document = ((GroovyFile)psiElement).getViewProvider().getDocument();
if (vfile != null && "gdsl".equals(vfile.getExtension()) &&
(!GroovyDslFileIndex.isActivated(vfile) || document != null && FileDocumentManager.getInstance().isDocumentUnsaved(document))) {
(!GroovyDslFileIndex.isActivated(vfile) || FileDocumentManager.getInstance().isFileModified(vfile))) {
final Annotation annotation = holder.createWarningAnnotation(psiElement, "DSL descriptor file has been changed and isn't currently executed. Click to activate it back.");
annotation.setFileLevelAnnotation(true);
annotation.registerFix(new IntentionAction() {