fix navigation is Kotlin/Java with Kotlin/Javascript modules

This commit is contained in:
Michael Nedzelsky
2015-03-20 21:00:27 +03:00
parent 0eabb6c8d4
commit d01cc8ac55
@@ -48,15 +48,12 @@ public final class DecompiledNavigationUtils {
) { ) {
VirtualFile virtualFile; VirtualFile virtualFile;
if (JsProjectDetector.isJsProject(project)) { if (JsProjectDetector.isJsProject(project) &&
if (NavigationPackage.getKotlinJavascriptLibraryWithMetadata(referencedDescriptor, project) != null) { NavigationPackage.getKotlinJavascriptLibraryWithMetadata(referencedDescriptor, project) != null)
JsMetaFileVirtualFileHolder system = JsMetaFileVirtualFileHolder.getInstance(project); {
virtualFile = system.getFile(referencedDescriptor); JsMetaFileVirtualFileHolder system = JsMetaFileVirtualFileHolder.getInstance(project);
if (virtualFile == null) return null; virtualFile = system.getFile(referencedDescriptor);
} if (virtualFile == null) return null;
else {
return null;
}
} }
else { else {
virtualFile = findVirtualFileContainingDescriptor(project, referencedDescriptor); virtualFile = findVirtualFileContainingDescriptor(project, referencedDescriptor);