From 4c800b1b5af28ad6011187ea6f9c7abf6be986ae Mon Sep 17 00:00:00 2001 From: Przemyslaw Gorszkowski Date: Fri, 1 Feb 2013 21:43:38 +0100 Subject: C++: fix code completion for typedef of pointer Fix code completion and highlighting member of typedefed pointers. It works when typedef is inside or outside of the function. Task-number: QTCREATORBUG-8671 Task-number: QTCREATORBUG-8672 Change-Id: I9cc87080bf443f7ffa6a90ef5ba582b87700f2db Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/cppcompletion_test.cpp | 87 +++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) (limited to 'src/plugins/cpptools/cppcompletion_test.cpp') diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index 20b02c435c..19267fa6e8 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -1483,3 +1483,90 @@ void CppToolsPlugin::test_completion_typedef_of_pointer_of_type_and_replace_acce QVERIFY(completions.contains(QLatin1String("m"))); QVERIFY(replaceAccessOperator); } + +void CppToolsPlugin::test_completion_typedef_of_pointer() +{ + TestData data; + data.srcText = "\n" + "struct Foo { int bar; };\n" + "typedef Foo *FooPtr;\n" + "void main()\n" + "{\n" + " FooPtr ptr;\n" + " @\n" + " // padding so we get the scope right\n" + "}"; + setup(&data); + + Utils::ChangeSet change; + QString txt = QLatin1String("ptr->"); + change.insert(data.pos, txt); + QTextCursor cursor(data.doc); + change.apply(&cursor); + data.pos += txt.length(); + + QStringList completions = getCompletions(data); + + QCOMPARE(completions.size(), 2); + QVERIFY(completions.contains(QLatin1String("Foo"))); + QVERIFY(completions.contains(QLatin1String("bar"))); +} + +void CppToolsPlugin::test_completion_typedef_of_pointer_inside_function() +{ + TestData data; + data.srcText = "\n" + "struct Foo { int bar; };\n" + "void f()\n" + "{\n" + " typedef Foo *FooPtr;\n" + " FooPtr ptr;\n" + " @\n" + " // padding so we get the scope right\n" + "}"; + setup(&data); + + Utils::ChangeSet change; + QString txt = QLatin1String("ptr->"); + change.insert(data.pos, txt); + QTextCursor cursor(data.doc); + change.apply(&cursor); + data.pos += txt.length(); + + QStringList completions = getCompletions(data); + + QCOMPARE(completions.size(), 2); + QVERIFY(completions.contains(QLatin1String("Foo"))); + QVERIFY(completions.contains(QLatin1String("bar"))); +} + +void CppToolsPlugin::test_completion_typedef_is_inside_function_before_declaration_block() +{ + TestData data; + data.srcText = "\n" + "struct Foo { int bar; };\n" + "void f()\n" + "{\n" + " typedef Foo *FooPtr;\n" + " if (true) {\n" + " FooPtr ptr;\n" + " @\n" + " // padding so we get the scope right\n" + " }" + "}" + ; + setup(&data); + + Utils::ChangeSet change; + QString txt = QLatin1String("ptr->"); + change.insert(data.pos, txt); + QTextCursor cursor(data.doc); + change.apply(&cursor); + data.pos += txt.length(); + + QStringList completions = getCompletions(data); + + QCOMPARE(completions.size(), 2); + QVERIFY(completions.contains(QLatin1String("Foo"))); + QVERIFY(completions.contains(QLatin1String("bar"))); +} -- cgit v1.2.1