From d01cc8ac55aa3644b8933e81ff3d3aea2b85d058 Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Fri, 20 Mar 2015 21:00:27 +0300
Subject: [PATCH] fix navigation is Kotlin/Java with Kotlin/Javascript modules

---
 .../navigation/DecompiledNavigationUtils.java     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java
index fcb99d2a9d2..5e922d69196 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java
@@ -48,15 +48,12 @@ public final class DecompiledNavigationUtils {
     ) {
         VirtualFile virtualFile;
 
-        if (JsProjectDetector.isJsProject(project)) {
-            if (NavigationPackage.getKotlinJavascriptLibraryWithMetadata(referencedDescriptor, project) != null) {
-                JsMetaFileVirtualFileHolder system = JsMetaFileVirtualFileHolder.getInstance(project);
-                virtualFile = system.getFile(referencedDescriptor);
-                if (virtualFile == null) return null;
-            }
-            else {
-                return null;
-            }
+        if (JsProjectDetector.isJsProject(project) &&
+            NavigationPackage.getKotlinJavascriptLibraryWithMetadata(referencedDescriptor, project) != null)
+        {
+            JsMetaFileVirtualFileHolder system = JsMetaFileVirtualFileHolder.getInstance(project);
+            virtualFile = system.getFile(referencedDescriptor);
+            if (virtualFile == null) return null;
         }
         else {
             virtualFile = findVirtualFileContainingDescriptor(project, referencedDescriptor);