JavaElementFinder now correctly finds namespace$src$ classes

No new tests added

 #KT-2839 Fixed

compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java

@@ -296,8 +296,10 @@ public class NamespaceCodegen extends MemberCodegen {
             substringTo = name.length();
         }
 
+        int pathHashCode = FileUtil.toSystemDependentName(file.getVirtualFile().getCanonicalPath()).hashCode();
+
         // dollar sign in the end is to prevent synthetic class from having "Test" or other parseable suffix
         // path hashCode to prevent same name / different path collision
-        return namespaceInternalName + "$src$" + name.substring(substringFrom, substringTo) + "$" + file.getVirtualFile().getCanonicalPath().hashCode();
+        return namespaceInternalName + "$src$" + name.substring(substringFrom, substringTo) + "$" + pathHashCode;
     }
 }

compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java

@@ -109,6 +109,11 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
 
         FqName qualifiedName = new FqName(qualifiedNameString);
 
+        // qualifiedNameString's format can be "pkg.subpkg.Class$Inner$Inner" (e.g. from com.intellij.execution.filters.ExceptionWorker),
+        // which is neither a fully qualified name, nor an internal name. If we can, we should construct an internal name from it to handle
+        // 'namespace$src$...' queries more accurately. It's not a real internal name though, so it's not supposed to be used anywhere else
+        String internalNameUnsafe = qualifiedNameString.replace('.', '/');
+
         // Backend searches for java.lang.String. Will fail with SOE if continue
         if (qualifiedName.getFqName().startsWith("java.")) return PsiClass.EMPTY_ARRAY;
 
@@ -117,8 +122,10 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
         for (JetFile file : filesInScope) {
             final FqName packageName = JetPsiUtil.getFQName(file);
             if (packageName != null && qualifiedName.getFqName().startsWith(packageName.getFqName())) {
-                if (qualifiedName.equals(QualifiedNamesUtil.combine(packageName, Name.identifier(JvmAbi.PACKAGE_CLASS))) &&
-                        NamespaceCodegen.shouldGenerateNSClass(Arrays.asList(file))) {
+                String packageInternalName = NamespaceCodegen.getJVMClassNameForKotlinNs(packageName).getInternalName();
+                String multiFileNamespaceInternalName = NamespaceCodegen.getMultiFileNamespaceInternalName(packageInternalName, file);
+                if (multiFileNamespaceInternalName.equals(internalNameUnsafe) ||
+                        (packageInternalName.equals(internalNameUnsafe) && NamespaceCodegen.shouldGenerateNSClass(Arrays.asList(file)))) {
                     JetLightClass lightClass = JetLightClass.create(psiManager, file, qualifiedName);
                     if (lightClass != null) {
                         answer.add(lightClass);