From 942e33f28adfd725c576e2eadc6cec91259560ef Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 19 Sep 2017 10:36:13 +0200 Subject: [PATCH] IDEA-179184 Go to file regression -- no longer matches on forward slashes in Windows --- .../com/intellij/java/navigation/ChooseByNameTest.groovy | 4 ++-- .../src/com/intellij/ide/actions/GotoFileItemProvider.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameTest.groovy b/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameTest.groovy index 7f963b7a2143..087d982d7d99 100644 --- a/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameTest.groovy +++ b/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameTest.groovy @@ -402,8 +402,8 @@ class Intf { } void "test prefer exact case match"() { - def upper = myFixture.addClass("class SOMECLASS {}") - def camel = myFixture.addClass("class SomeClass {}") + def upper = myFixture.addClass("package foo; class SOMECLASS {}") + def camel = myFixture.addClass("package bar; class SomeClass {}") assert getPopupElements(new GotoClassModel2(project), 'SomeClass') == [camel, upper] assert getPopupElements(new GotoFileModel(project), 'SomeClass.java') == [camel.containingFile, upper.containingFile] } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java index cda4e8b24762..e3d7f4bc7121 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java @@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -116,6 +117,7 @@ public class GotoFileItemProvider extends DefaultChooseByNameItemProvider { for (Object o : myModel.getElementsByName(fileName, everywhere, pattern)) { String fullName = myModel.getFullName(o); if (o instanceof PsiFileSystemItem && fullName != null) { + fullName = FileUtilRt.toSystemIndependentName(fullName); FList fragments = fullMatcher.matchingFragments(fullName); if (fragments != null && !fragments.isEmpty()) { group.add((PsiFileSystemItem)o);