OC-11478 Navigate to super and overriding methods in Swift (after review 3)

diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
index 0e2cdb791edb9cd46c75dcea039c8d128088a727..e2d6aaca639ecc627c0e32a820004a32c5cf76f9 100644 (file)
--- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
+++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
@@ -283,7 +283,7 @@ goto.test.findUsages.subject.title=Test Subjects for {0}
 goto.test.notFound=No test subjects found
 
 incremental.search.tooltip.prefix=Search for:
-goto.super.field.chooser.title=Choose super field
+goto.super.property.chooser.title=Choose super property
 goto.super.method.chooser.title=Choose super method
 goto.super.method.of.chooser.title=Choose Super Method of {0}
 goto.super.method.findUsages.title=Super methods of {0}

diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
index ddb10ac6bef12b627ea4eba89adadbc5916797e7..7c48c2aabbdc39ed1a0920c60104f3c15cef51e8 100644 (file)
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
@@ -440,7 +440,7 @@ public interface CodeInsightTestFixture extends IdeaProjectTestFixture {
   GutterMark findGutter(@NotNull @TestDataFile @NonNls String filePath);
 
   @NotNull
-  Collection<GutterMark> findCaretGutters();
+  Collection<GutterMark> findGuttersAtCaret();
 
   @NotNull
   PsiManager getPsiManager();

diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
index 549ece1658518183c45c7ee5e07bcfb8340a5f0d..2e6567b281331aa9590813a91d06a5c987ad638a 100644 (file)
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
@@ -930,7 +930,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
 
   @NotNull
   @Override
-  public Collection<GutterMark> findCaretGutters() {
+  public Collection<GutterMark> findGuttersAtCaret() {
     CommonProcessors.CollectProcessor<GutterMark> processor = new CommonProcessors.CollectProcessor<GutterMark>();
     findGutters(processor);
     return processor.getResults();