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

change p.s.i. for light file on the fly

Browse Source
This commit is contained in:
Gregory.Shrago
2012-09-03 17:04:37 +04:00
parent 4c0302da91
commit 7c5a29b18b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
+6 -1
View File
@@ -41,6 +41,7 @@ import com.intellij.psi.impl.PsiManagerEx;
import com.intellij.psi.impl.PsiManagerImpl;
import com.intellij.psi.impl.file.PsiBinaryFileImpl;
import com.intellij.psi.impl.file.PsiLargeFileImpl;
import com.intellij.psi.impl.file.impl.FileManager;
import com.intellij.psi.impl.source.PsiFileImpl;
import com.intellij.psi.impl.source.PsiPlainTextFileImpl;
import com.intellij.psi.impl.source.tree.FileElement;
@@ -134,7 +135,11 @@ public class SingleRootFileViewProvider extends UserDataHolderBase implements Fi
@Nullable
public final PsiFile getPsi(@NotNull Language target) {
if (!isPhysical()) {
((PsiManagerEx)myManager).getFileManager().setViewProvider(getVirtualFile(), this);
FileManager fileManager = ((PsiManagerEx)myManager).getFileManager();
VirtualFile virtualFile = getVirtualFile();
if (fileManager.findCachedViewProvider(virtualFile) == null) {
fileManager.setViewProvider(virtualFile, this);
}
}
return getPsiInner(target);
}
platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
+2 -2
View File
@@ -174,7 +174,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
FileViewProvider provider = getViewProvider();
final VirtualFile vFile = provider.getVirtualFile();
if (!vFile.isValid()) return false;
if (!provider.isPhysical()) return true; // "dummy" file
if (!provider.isEventSystemEnabled()) return true; // "dummy" file
if (myManager.getProject().isDisposed()) return false;
return isPsiUpToDate(vFile);
}
@@ -182,7 +182,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
protected boolean isPsiUpToDate(@NotNull VirtualFile vFile) {
final FileViewProvider provider = myManager.findViewProvider(vFile);
Language language = getLanguage();
if (provider.getPsi(language) == this) {
if (provider == null || provider.getPsi(language) == this) { // provider == null in tests
return true;
}
Language baseLanguage = provider.getBaseLanguage();