diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java index 2906c76ca56..2ff06626bbc 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java @@ -411,7 +411,7 @@ public class JetShortNamesCache extends PsiShortNamesCache { @NotNull GlobalSearchScope scope, @NotNull Processor processor ) { - return false; + return ContainerUtil.process(getMethodsByName(name, scope), processor); } @NotNull diff --git a/idea/testData/navigation/gotoSymbol/javaMethods.kt b/idea/testData/navigation/gotoSymbol/javaMethods.kt new file mode 100644 index 00000000000..f1280cbf2cc --- /dev/null +++ b/idea/testData/navigation/gotoSymbol/javaMethods.kt @@ -0,0 +1,9 @@ +fun test() { + return 0 +} + +// SEARCH_TEXT: flushBuffer +// CHECK_BOX +// REF: (in java.io.BufferedOutputStream).flushBuffer() +// REF: (in java.io.BufferedWriter).flushBuffer() +// REF: (in java.io.OutputStreamWriter).flushBuffer() diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSymbolTest.java b/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSymbolTest.java index f754eb0ea05..e8ba2a7d332 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSymbolTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoSymbolTest.java @@ -30,6 +30,10 @@ public class JetGotoSymbolTest extends JetLightCodeInsightFixtureTestCase { doTest(); } + public void testJavaMethods() { + doTest(); + } + @Override protected String getTestDataPath() { return new File(PluginTestCaseBase.getTestDataPathBase(), "/navigation/gotoSymbol").getPath() + File.separator; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java b/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java index 8517a1073f0..6fb28f9c29e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java +++ b/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java @@ -77,16 +77,17 @@ public final class NavigationTestUtils { searchTextList.isEmpty()); List expectedReferences = InTextDirectivesUtils.findListWithPrefixes(editor.getDocument().getText(), "// REF:"); + boolean enableCheckbox = InTextDirectivesUtils.isDirectiveDefined(editor.getDocument().getText(), "// CHECK_BOX"); String searchText = searchTextList.get(0); List elementsByName = new ArrayList(); GotoSymbolModel2 model = new GotoSymbolModel2(project); - String[] names = model.getNames(false); + String[] names = model.getNames(enableCheckbox); for (String name : names) { if (name != null && name.startsWith(searchText)) { - elementsByName.addAll(Arrays.asList(model.getElementsByName(name, false, name + "*"))); + elementsByName.addAll(Arrays.asList(model.getElementsByName(name, enableCheckbox, name + "*"))); } }