mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 02:06:01 +02:00
Code Issues Wiki Activity

Bug 518271 - NPE when using Toggle function on a function containing a lambda expression

Browse source 
Change-Id: I441a627b0759655e865724bf5110fdb7dd8d5a50
Signed-off-by: Marc-Andre Laperle <malaperle@gmail.com>
This commit is contained in:
Marc-Andre Laperle 2018-09-21 23:04:30 -04:00 • committed by Marc-André Laperle
parent 467dd174c3
commit 0b73bea05a
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/togglefunction/ToggleRefactoringTest.java
View file

@ -3627,4 +3627,25 @@ public class ToggleRefactoringTest extends RefactoringTestBase {
public void testToggleWithVirtSpecifiersImplementationToClass_518273() throws Exception { public void testToggleWithVirtSpecifiersImplementationToClass_518273() throws Exception {
assertRefactoringSuccess(); assertRefactoringSuccess();
} }
//Test.h
//class Foo {
// void /*$*/foo/*$$*/() {
// []() {
//
// };
// }
//};
//====================
//class Foo {
// void foo();
//};
//
//inline void Foo::foo() {
// []() {
// };
//}
public void testToggleWithLambdaExpression_518271() throws Exception {
assertRefactoringSuccess();
}
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/togglefunction/InsertionPointFinder.java
View file

@ -48,6 +48,10 @@ public class InsertionPointFinder {
if (allafterdeclarations == null || alldefinitionsoutside == null) if (allafterdeclarations == null || alldefinitionsoutside == null)
return; return;
for(ICPPASTFunctionDeclarator decl: allafterdeclarations) { for(ICPPASTFunctionDeclarator decl: allafterdeclarations) {
if (decl.getName() == null) {
// Could be a lambda expression
continue;
}
String decl_name = decl.getName().toString(); String decl_name = decl.getName().toString();
for(ICPPASTFunctionDefinition def: alldefinitionsoutside) { for(ICPPASTFunctionDefinition def: alldefinitionsoutside) {
String def_name = null; String def_name = null;