diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/cppeditor/cppeditorplugin.h | 1 | ||||
| -rw-r--r-- | src/plugins/cppeditor/cppquickfix_test.cpp | 17 | ||||
| -rw-r--r-- | src/plugins/cppeditor/cppquickfixes.cpp | 16 |
3 files changed, 30 insertions, 4 deletions
diff --git a/src/plugins/cppeditor/cppeditorplugin.h b/src/plugins/cppeditor/cppeditorplugin.h index 40c8b1ac48..0d52cde553 100644 --- a/src/plugins/cppeditor/cppeditorplugin.h +++ b/src/plugins/cppeditor/cppeditorplugin.h @@ -199,6 +199,7 @@ private slots: void test_quickfix_AssignToLocalVariable_noFunctionInExpression(); void test_quickfix_AssignToLocalVariable_noReturnClass(); void test_quickfix_AssignToLocalVariable_noReturnFunc(); + void test_quickfix_AssignToLocalVariable_noSignatureMatch(); void test_quickfix_InsertVirtualMethods_onlyDecl(); void test_quickfix_InsertVirtualMethods_onlyDeclWithoutVirtual(); diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp index 25059217b5..34b3613886 100644 --- a/src/plugins/cppeditor/cppquickfix_test.cpp +++ b/src/plugins/cppeditor/cppquickfix_test.cpp @@ -2026,6 +2026,23 @@ void CppEditorPlugin::test_quickfix_AssignToLocalVariable_noReturnFunc() data.run(&factory); } +/// Check: No trigger for functions which does not match in signature. +void CppEditorPlugin::test_quickfix_AssignToLocalVariable_noSignatureMatch() +{ + const QByteArray original = + "int someFunc(int);\n" + "\n" + "void f()\n" + "{\n" + " some@Func();\n" + "}"; + const QByteArray expected = original + "\n"; + + AssignToLocalVariable factory; + TestCase data(original, expected); + data.run(&factory); +} + /// Test dialog for insert virtual functions class InsertVirtualMethodsDialogTest : public InsertVirtualMethodsDialog { diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 75c387ece4..5057d843a9 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -4279,13 +4279,21 @@ void AssignToLocalVariable::match(const CppQuickFixInterface &interface, QuickFi TypeOfExpression typeOfExpression; typeOfExpression.init(interface->semanticInfo().doc, interface->snapshot(), interface->context().bindings()); + + // If items are empty, AssignToLocalVariableOperation will fail. + items = typeOfExpression(file->textOf(outerAST).toUtf8(), + file->scopeAt(outerAST->firstToken()), + TypeOfExpression::Preprocess); + if (items.isEmpty()) + return; + if (CallAST *callAST = outerAST->asCall()) { - Scope *scope = file->scopeAt(callAST->base_expression->firstToken()); - items = typeOfExpression(file->textOf(callAST->base_expression).toUtf8(), scope, + items = typeOfExpression(file->textOf(callAST->base_expression).toUtf8(), + file->scopeAt(callAST->base_expression->firstToken()), TypeOfExpression::Preprocess); } else { - Scope *scope = file->scopeAt(nameAST->firstToken()); - items = typeOfExpression(file->textOf(nameAST).toUtf8(), scope, + items = typeOfExpression(file->textOf(nameAST).toUtf8(), + file->scopeAt(nameAST->firstToken()), TypeOfExpression::Preprocess); } |