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

#KT-978 Fixed

Browse Source
This commit is contained in:
Maxim Shafirov
2012-03-16 15:28:21 +04:00
parent 46b5b1b177
commit ea8a416051
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/plugin/compiler/WholeProjectAnalyzerFacade.java
+17 -10
View File
@@ -17,11 +17,13 @@
package org.jetbrains.jet.plugin.compiler; package org.jetbrains.jet.plugin.compiler;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.intellij.openapi.compiler.ex.CompilerPathsEx;
import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.roots.ContentIterator;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager; import com.intellij.psi.PsiManager;
@@ -34,9 +36,8 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetFileType;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.HashSet;
import java.util.Set; import java.util.Set;
/** /**
@@ -56,25 +57,31 @@ public final class WholeProjectAnalyzerFacade {
public Collection<JetFile> fun(final JetFile rootFile) { public Collection<JetFile> fun(final JetFile rootFile) {
final Project project = rootFile.getProject(); final Project project = rootFile.getProject();
final Set<JetFile> files = Sets.newLinkedHashSet(); final Set<JetFile> files = Sets.newLinkedHashSet();
final ProjectRootManager rootManager = ProjectRootManager.getInstance(project);
if (rootManager != null /* && !ApplicationManager.getApplication().isUnitTestMode() */) { Module rootModule = ModuleUtil.findModuleForPsiElement(rootFile);
List<VirtualFile> contentRoots = Arrays.asList(rootManager.getContentRoots()); if (rootModule != null) {
Set<Module> allModules = new HashSet<Module>();
ModuleUtil.getDependencies(rootModule, allModules);
CompilerPathsEx.visitFiles(contentRoots, new CompilerPathsEx.FileVisitor() { for (Module module : allModules) {
ModuleRootManager.getInstance(module).getFileIndex().iterateContent(new ContentIterator() {
@Override @Override
protected void acceptFile(VirtualFile file, String fileRoot, String filePath) { public boolean processFile(VirtualFile file) {
if (file.isDirectory()) return true;
final FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(file); final FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(file);
if (fileType != JetFileType.INSTANCE) return; if (fileType != JetFileType.INSTANCE) return true;
PsiFile psiFile = PsiManager.getInstance(project).findFile(file); PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
if (psiFile instanceof JetFile) { if (psiFile instanceof JetFile) {
if (rootFile.getOriginalFile() != psiFile) { if (rootFile.getOriginalFile() != psiFile) {
files.add((JetFile) psiFile); files.add((JetFile) psiFile);
} }
} }
return true;
} }
}); });
} }
}
files.add(rootFile); files.add(rootFile);
return files; return files;