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

navigation from externally-made groovy stubs to the source code

Browse Source
This commit is contained in:
peter
2012-10-10 19:23:33 +02:00
parent 851e9d9b6a
commit 85e6003f82
6 changed files with 74 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompileContextImpl.java
+21 -8
View File
@@ -43,6 +43,7 @@ import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.UserDataHolderBase;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.pom.Navigatable;
@@ -225,22 +226,21 @@ public class CompileContextImpl extends UserDataHolderBase implements CompileCon
}
@Nullable
private VirtualFile findPresentableFileForMessage(final String url) {
if (url == null) {
private VirtualFile findPresentableFileForMessage(@Nullable final String url) {
final VirtualFile file = findFileByUrl(url);
if (file == null) {
return null;
}
final VirtualFileManager fileManager = VirtualFileManager.getInstance();
return ApplicationManager.getApplication().runReadAction(new Computable<VirtualFile>() {
@Override
public VirtualFile compute() {
final VirtualFile file = fileManager.findFileByUrl(url);
if (file != null) {
if (file.isValid()) {
for (final Map.Entry<VirtualFile, Pair<SourceGeneratingCompiler, Module>> entry : myOutputRootToSourceGeneratorMap.entrySet()) {
final VirtualFile root = entry.getKey();
if (VfsUtil.isAncestor(root, file, false)) {
if (VfsUtilCore.isAncestor(root, file, false)) {
final Pair<SourceGeneratingCompiler, Module> pair = entry.getValue();
final VirtualFile presentableFile = pair.getFirst().getPresentableFile(CompileContextImpl.this, pair.getSecond(), root, file);
return presentableFile != null? presentableFile : file;
return presentableFile != null ? presentableFile : file;
}
}
}
@@ -248,7 +248,20 @@ public class CompileContextImpl extends UserDataHolderBase implements CompileCon
}
});
}
@Nullable
private static VirtualFile findFileByUrl(@Nullable String url) {
if (url == null) {
return null;
}
VirtualFile file = VirtualFileManager.getInstance().findFileByUrl(url);
if (file == null) {
// groovy stubs may be placed in completely random directories which aren't refreshed automatically
return VirtualFileManager.getInstance().refreshAndFindFileByUrl(url);
}
return file;
}
public void addMessage(CompilerMessage msg) {
Collection<CompilerMessage> messages = myMessages.get(msg.getCategory());
if (messages == null) {