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 separate modificationCount for PSI and Document (fixes psifile-dependent CachedValues) [take 2]

Browse Source
This commit is contained in:
Gregory.Shrago
2012-05-18 18:44:59 +04:00
parent 299d359566
commit 0879f13eda
9 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
+5 -2
View File
@@ -73,6 +73,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
private IElementType myElementType;
protected IElementType myContentElementType;
private long myModificationStamp;
protected PsiFile myOriginalFile = null;
private final FileViewProvider myViewProvider;
@@ -354,7 +355,9 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
myStub = null;
}
public void clearCaches() {}
public void clearCaches() {
myModificationStamp ++;
}
@Override
public String getText() {
@@ -386,7 +389,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
@Override
public long getModificationStamp() {
return getViewProvider().getModificationStamp();
return myModificationStamp;
}
@Override
platform/core-impl/src/com/intellij/psi/impl/source/text/BlockSupportImpl.java
+1 -1
View File
@@ -180,7 +180,7 @@ public class BlockSupportImpl extends BlockSupport {
viewProvider.getLanguages();
FileType fileType = viewProvider.getVirtualFile().getFileType();
final LightVirtualFile lightFile = new LightVirtualFile(fileImpl.getName(), fileType, newFileText, viewProvider.getVirtualFile().getCharset(),
fileImpl.getModificationStamp());
fileImpl.getViewProvider().getModificationStamp());
lightFile.setOriginalFile(viewProvider.getVirtualFile());
FileViewProvider copy = viewProvider.createCopy(lightFile);
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+1 -1
View File
@@ -785,7 +785,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
final Pair<PsiFile, Document> pair = reference.get();
if (pair != null && pair.first.isValid() && pair.first.getClass().equals(file.getClass())) {
final PsiFile copy = pair.first;
if (copy.getModificationStamp() > file.getModificationStamp()) {
if (copy.getViewProvider().getModificationStamp() > file.getViewProvider().getModificationStamp()) {
((PsiModificationTrackerImpl) file.getManager().getModificationTracker()).incCounter();
}
final Document document = pair.second;
platform/lang-impl/src/com/intellij/codeInsight/completion/OffsetTranslator.java
+2 -2
View File
@@ -59,10 +59,10 @@ public class OffsetTranslator implements Disposable {
});
originalFile.getProject().getMessageBus().connect(this).subscribe(PsiModificationTracker.TOPIC, new PsiModificationTracker.Listener() {
long lastModCount = originalFile.getModificationStamp();
long lastModCount = originalFile.getViewProvider().getModificationStamp();
@Override
public void modificationCountChanged() {
if (isUpToDate() && lastModCount != originalFile.getModificationStamp()) {
if (isUpToDate() && lastModCount != originalFile.getViewProvider().getModificationStamp()) {
myTranslation.addAll(sinceCommit);
sinceCommit.clear();
}
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
+2 -2
View File
@@ -473,7 +473,7 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzer implements JDOMEx
if (myDisposed) return false;
Document document = PsiDocumentManager.getInstance(myProject).getCachedDocument(file);
return document != null &&
document.getModificationStamp() == file.getModificationStamp() &&
document.getModificationStamp() == file.getViewProvider().getModificationStamp() &&
myFileStatusMap.allDirtyScopesAreNull(document);
}
@@ -481,7 +481,7 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzer implements JDOMEx
if (myDisposed) return false;
Document document = PsiDocumentManager.getInstance(myProject).getCachedDocument(file);
return document != null &&
document.getModificationStamp() == file.getModificationStamp() &&
document.getModificationStamp() == file.getViewProvider().getModificationStamp() &&
myFileStatusMap.getFileDirtyScope(document, Pass.UPDATE_ALL) == null;
}
platform/lang-impl/src/com/intellij/psi/impl/PsiToDocumentSynchronizer.java
+1 -1
View File
@@ -96,7 +96,7 @@ public class PsiToDocumentSynchronizer extends PsiTreeChangeAdapter {
final boolean insideTransaction = myTransactionsMap.containsKey(document);
if (!insideTransaction) {
document.setModificationStamp(psiFile.getModificationStamp());
document.setModificationStamp(psiFile.getViewProvider().getModificationStamp());
if (LOG.isDebugEnabled()) {
PsiDocumentManagerImpl.checkConsistency(psiFile, document);
}
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
+3 -3
View File
@@ -1384,7 +1384,7 @@ public class FileBasedIndexImpl extends FileBasedIndex {
@Override
public String getText() {
if (myFile.getModificationStamp() != myDocument.getModificationStamp()) {
if (myFile.getViewProvider().getModificationStamp() != myDocument.getModificationStamp()) {
final ASTNode node = myFile.getNode();
assert node != null;
return node.getText();
@@ -1394,7 +1394,7 @@ public class FileBasedIndexImpl extends FileBasedIndex {
@Override
public long getModificationStamp() {
return myFile.getModificationStamp();
return myFile.getViewProvider().getModificationStamp();
}
}
@@ -1418,7 +1418,7 @@ public class FileBasedIndexImpl extends FileBasedIndex {
final PsiFile dominantContentFile = findDominantPsiForDocument(document, project);
final DocumentContent content;
if (dominantContentFile != null && dominantContentFile.getModificationStamp() != document.getModificationStamp()) {
if (dominantContentFile != null && dominantContentFile.getViewProvider().getModificationStamp() != document.getModificationStamp()) {
content = new PsiContent(document, dominantContentFile);
}
else {
platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java
+1 -1
View File
@@ -407,7 +407,7 @@ public class UsageInfo2UsageAdapter implements UsageInModule,
private long myModificationStamp;
private long getCurrentModificationStamp() {
final PsiFile containingFile = getPsiFile();
return containingFile == null ? -1L : containingFile.getModificationStamp();
return containingFile == null ? -1L : containingFile.getViewProvider().getModificationStamp();
}
@Override
xml/impl/src/com/intellij/xml/actions/ValidateXmlActionHandler.java
+1 -1
View File
@@ -548,7 +548,7 @@ public class ValidateXmlActionHandler {
final PsiFile psifile = PsiManager.getInstance(myProject).findFile(file);
if (psifile != null && psifile.isValid()) {
timestamp += psifile.getModificationStamp();
timestamp += psifile.getViewProvider().getModificationStamp();
} else {
break;
}