CppEditor: Fix "Switch Method Decl/Def" for cursor on return type

If the cursor is on the return type, Document::lastVisibleSymbol()
returns the function defined before the current function definition,
which is unfavorable for "Switch Method Decl/Def".

Fixed by using ASTPath instead of Document::lastVisibleSymbol().

Task-Number: QTCREATORBUG-9206

Change-Id: I94aba2fdbb437c6007f328f31deee7ae363364e2
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

1 files changed, 32 insertions, 0 deletions

diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index c2b3af4b1e..428b6e2079 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -420,6 +420,38 @@ void CppEditorPlugin::test_SwitchMethodDeclarationDefinition_fromFunctionBody()
     test.run();
 }
 
+void CppEditorPlugin::test_SwitchMethodDeclarationDefinition_fromReturnType()
+{
+    QList<TestDocumentPtr> testFiles;
+
+    const QByteArray headerContents =
+        "class C\n"
+        "{\n"
+        "public:\n"
+        "    C();\n"
+        "    int $function();\n"
+        "};\n"
+        ;
+    testFiles << TestDocument::create(headerContents, QLatin1String("file.h"));
+
+    const QByteArray sourceContents =
+        "#include \"file.h\"\n"
+        "\n"
+        "C::C()\n"
+        "{\n"
+        "}\n"                   // Line 5
+        "\n"
+        "@int C::function()\n"
+        "{\n"
+        "    return 1 + 1;\n"
+        "}\n"                   // Line 10
+        ;
+    testFiles << TestDocument::create(sourceContents, QLatin1String("file.cpp"));
+
+    TestCase test(TestCase::SwitchBetweenMethodDeclarationDefinition, testFiles);
+    test.run();
+}
+
 /// Check ...
 void CppEditorPlugin::test_FollowSymbolUnderCursor_globalVarFromFunction()
 {