mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-03-28 14:56:28 +01:00
Code Issues Wiki Activity

Bug 452809 - Implement method fully qualified decl specifier

Browse source 
If an enum, a struct or a class is defined inside a class, the
implementation must qualify the declaration specifier.

Change-Id: I1e9450c7b165a25c4a745c50fe2e0c06e28775d0
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
This commit is contained in:
Marco Stornelli 2020-01-20 18:39:05 +01:00
parent 73a7ac3642
commit 86f2ad3301
2 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/implementmethod/ImplementMethodRefactoringTest.java
View file

@ -877,4 +877,24 @@ public class ImplementMethodRefactoringTest extends RefactoringTestBase {
public void testFreeFunctionWithVarArgs_Bug384793() throws Exception {
assertRefactoringSuccess();
}
//A.h
//
//class TestClass {
//public:
// enum Inner {
// ENUM_1,
// ENUM_2
// };
// /*$*/Inner foo();/*$$*/
//};
//
//A.cpp
//====================
//TestClass::Inner TestClass::foo() {
//}
public void testWithInnerEnum_Bug452809() throws Exception {
assertRefactoringSuccess();
}
}

33
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoring.java
View file

@ -29,6 +29,7 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNamedTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IASTNode.CopyStyle;
import org.eclipse.cdt.core.dom.ast.IASTPointerOperator;
@ -38,6 +39,7 @@ import org.eclipse.cdt.core.dom.ast.IASTTypeId;
import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamedTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter;
@ -306,6 +308,17 @@ public class ImplementMethodRefactoring extends CRefactoring {
.getDeclarators()[0];
IASTNode declarationParent = methodDeclaration.getParent();
/**
* In C++ it's possible that we used something declared inside a class for example,
* so we are going to implement this method just cloning the decl specifier of declaration
* we could miss the fully qualified name.
*/
if (declSpecifier instanceof ICPPASTNamedTypeSpecifier) {
ICPPASTQualifiedName qName = createQualifiedNameFor((IASTNamedTypeSpecifier) declSpecifier,
functionDeclarator, declarationParent, insertLocation, functionOffset);
((IASTNamedTypeSpecifier) declSpecifier).setName(qName);
}
if (declSpecifier instanceof ICPPASTDeclSpecifier) {
((ICPPASTDeclSpecifier) declSpecifier).setVirtual(false);
((ICPPASTDeclSpecifier) declSpecifier).setExplicit(false);
@ -375,6 +388,26 @@ public class ImplementMethodRefactoring extends CRefactoring {
insertLocation.getTranslationUnit(), insertOffset, refactoringContext);
}
/**
* Create the fully qualified name for the declaration specifier
* @param declSpec The declaration specifier
* @param functionDeclarator The function declaration
* @param declarationParent Parent of declaration
* @param insertLocation Insert position
* @param functionOffset A function offset to determine fully qualified names. A negative number
* can be used to use the node offset of method as returned by getFileLocation().getNodeOffset()
* @return The fully qualified name
* @throws CoreException
*/
private ICPPASTQualifiedName createQualifiedNameFor(IASTNamedTypeSpecifier declSpec,
IASTFunctionDeclarator functionDeclarator, IASTNode declarationParent, InsertLocation insertLocation,
int functionOffset) throws CoreException {
int insertOffset = insertLocation.getInsertPosition();
return NameHelper.createQualifiedNameFor(declSpec.getName(), tu,
functionOffset >= 0 ? functionOffset : functionDeclarator.getFileLocation().getNodeOffset(),
insertLocation.getTranslationUnit(), insertOffset, refactoringContext);
}
public ImplementMethodData getRefactoringData() {
return data;
}