IDEA-181135 Go to File: with "Include non-project files" = No out-of-project...

IDEA-181135 Go to File: with "Include non-project files" = No out-of-project files are still suggested

(cherry picked from commit 20d76b15), IDEA-CR-26011

java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameTest.groovy

@@ -419,6 +419,11 @@ class Intf {
     assert gotoFile('langcsequence', false) == [charSeq.containingFile, seq]
   }
 
+  void "test show no matches from jdk when there are in project"() {
+    def file = addEmptyFile("String.txt")
+    assert gotoFile('Str', false) == [file]
+  }
+
   void "test fix keyboard layout"() {
     assert (gotoClass('Ыекштп')[0] as PsiClass).name == 'String'
     assert (gotoSymbol('Ыекштп')[0] as PsiClass).name == 'String'

platform/lang-impl/src/com/intellij/ide/actions/DirectoryPathMatcher.java

@@ -98,7 +98,7 @@ class DirectoryPathMatcher {
     if (myFiles == null) return fileSearchScope;
 
     VirtualFile[] array = ContainerUtil.map2Array(myFiles, VirtualFile.class, p -> p.first);
-    return fileSearchScope.intersectWith(GlobalSearchScopesCore.directoriesScope(myModel.getProject(), true, array));
+    return GlobalSearchScopesCore.directoriesScope(myModel.getProject(), true, array).intersectWith(fileSearchScope);
 
   }