feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Improve "definition from declaration" for templates

Browse Source 
- Make sure the template parameters are included in the definition.
- Find the correct insertion location when using an already-defined
  template member function as an anchor.

Fixes: QTCREATORBUG-24848
Change-Id: I1272ba36403904e7aed81bcef48745793c5e2217
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-12 12:12:13 +01:00
parent ccf1d17bfe
commit 3cd2e2c445
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/cppeditor/cppquickfix_test.cpp
View File

@@ -3740,20 +3740,25 @@ void CppEditorPlugin::test_quickfix_InsertDefFromDecl_templateClass()
"template<class T>\n"
"class Foo\n"
"{\n"
" void fun@c();\n"
"};\n";
" void fun@c1();\n"
" void func2();\n"
"};\n\n"
"template<class T>\n"
"void Foo<T>::func2() {}\n";
QByteArray expected =
"template<class T>\n"
"class Foo\n"
"{\n"
" void fun@c();\n"
"};\n"
"\n"
" void func1();\n"
" void func2();\n"
"};\n\n"
"template<class T>\n"
"void Foo::func()\n" // Should really be Foo<T>::func()
"void Foo<T>::func1()\n"
"{\n"
"\n"
"}\n";
"}\n\n"
"template<class T>\n"
"void Foo<T>::func2() {}\n";
InsertDefFromDecl factory;
QuickFixOperationTest(singleDocument(original, expected), &factory);
@@ -3775,7 +3780,7 @@ void CppEditorPlugin::test_quickfix_InsertDefFromDecl_templateFunction()
"};\n"
"\n"
"template<class T>\n"
"void Foo::func()\n"
"void Foo::func<T>()\n"
"{\n"
"\n"
"}\n";