azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EA-40126 - assert: StandardLibraryReferenceResolver.ensureInitialized

Browse Source 
Working around the VFS refresh problem
This commit is contained in:
Andrey Breslav
2012-11-07 18:43:10 +04:00
parent 5f5d375a36
commit 45df349f16
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
+7 -2
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.startup.StartupManager; import com.intellij.openapi.startup.StartupManager;
import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
@@ -101,7 +102,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
getJetFiles("jet", jetFilesIndependentOfUnit)); getJetFiles("jet", jetFilesIndependentOfUnit));
ClassDescriptor tuple0 = context.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, TUPLE0_FQ_NAME); ClassDescriptor tuple0 = context.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, TUPLE0_FQ_NAME);
assert tuple0 != null; assert tuple0 != null : "Can't find the declaration for Tuple0";
scope = new WritableScopeImpl(scope, jetNamespace, RedeclarationHandler.THROW_EXCEPTION, scope = new WritableScopeImpl(scope, jetNamespace, RedeclarationHandler.THROW_EXCEPTION,
"Builtin classes scope: needed to analyze builtins which depend on Unit type alias"); "Builtin classes scope: needed to analyze builtins which depend on Unit type alias");
scope.changeLockLevel(WritableScope.LockLevel.BOTH); scope.changeLockLevel(WritableScope.LockLevel.BOTH);
@@ -120,9 +121,13 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
private List<JetFile> getJetFiles(String dir, final Predicate<JetFile> filter) { private List<JetFile> getJetFiles(String dir, final Predicate<JetFile> filter) {
URL url = StandardLibraryReferenceResolver.class.getResource("/" + dir + "/"); URL url = StandardLibraryReferenceResolver.class.getResource("/" + dir + "/");
VirtualFile vf = VfsUtil.findFileByURL(url); VirtualFile vf = VfsUtil.findFileByURL(url);
assert vf != null; assert vf != null : "Virtual file not found by URL: " + url;
// Refreshing VFS: in case the plugin jar was updated, the caches may hold the old value // Refreshing VFS: in case the plugin jar was updated, the caches may hold the old value
if (vf instanceof NewVirtualFile) {
NewVirtualFile newVirtualFile = (NewVirtualFile) vf;
newVirtualFile.markDirtyRecursively(); // This doesn't happen in a JARFS entry, unless we do it manually here
}
vf.getChildren(); vf.getChildren();
vf.refresh(false, true); vf.refresh(false, true);