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

fixed file reference resolve for maven (IDEA-80267)

Browse Source
This commit is contained in:
Serega Vasiliev
2012-12-21 11:33:49 +01:00
parent 40434bcd54
commit ac878c610b
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java
+11 -14
View File
@@ -138,20 +138,17 @@ public class FilePathReferenceProvider extends PsiReferenceProvider {
}
}
for (Module module : modules) {
moduleRootManager = ModuleRootManager.getInstance(module);
VirtualFile[] sourceRoots = moduleRootManager.getSourceRoots();
for (VirtualFile root : sourceRoots) {
final PsiDirectory directory = psiManager.findDirectory(root);
if (directory != null) {
final PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage(directory);
if (aPackage != null && aPackage.getName() != null) {
// package prefix
result.add(PackagePrefixFileSystemItem.create(directory));
}
else {
result.add(directory);
}
VirtualFile[] sourceRoots = moduleRootManager.orderEntries().recursively().withoutSdk().withoutLibraries().getSourceRoots();
for (VirtualFile root : sourceRoots) {
final PsiDirectory directory = psiManager.findDirectory(root);
if (directory != null) {
final PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage(directory);
if (aPackage != null && aPackage.getName() != null) {
// package prefix
result.add(PackagePrefixFileSystemItem.create(directory));
}
else {
result.add(directory);
}
}
}