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

Improved code reduction refactorings.

Browse source 
Change-Id: I2bee9e578810dd9ee1b23341a29713fc594d81f4
This commit is contained in:
Sergey Prigogin 2016-09-21 18:40:43 -07:00
parent c19640498d
commit 149e41fd46
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/ProblemFinder.java
View file

@ -4,6 +4,7 @@ import org.eclipse.cdt.core.dom.ast.ASTVisitor;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IProblemBinding; import org.eclipse.cdt.core.dom.ast.IProblemBinding;
import org.eclipse.cdt.core.parser.util.CharArrayUtils;
class ProblemFinder extends ASTVisitor { class ProblemFinder extends ASTVisitor {
boolean foundProblem; boolean foundProblem;
@ -21,7 +22,8 @@ class ProblemFinder extends ASTVisitor {
@Override @Override
public int visit(IASTName name) { public int visit(IASTName name) {
if (name.resolveBinding() instanceof IProblemBinding) { if (!CharArrayUtils.startsWith(name.getSimpleID(), "__builtin_")
&& name.resolveBinding() instanceof IProblemBinding) {
foundProblem = true; foundProblem = true;
return PROCESS_ABORT; return PROCESS_ABORT;
} }

8
core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveFunctionBodiesRefactoring.java
View file

@ -17,6 +17,8 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.RefactoringChangeDescriptor; import org.eclipse.ltk.core.refactoring.RefactoringChangeDescriptor;
@ -56,6 +58,7 @@ import org.eclipse.cdt.internal.core.dom.rewrite.util.ASTNodes;
import org.eclipse.cdt.internal.ui.refactoring.CRefactoring; import org.eclipse.cdt.internal.ui.refactoring.CRefactoring;
import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector; import org.eclipse.cdt.internal.ui.refactoring.ModificationCollector;
import org.eclipse.cdt.internal.ui.refactoring.changes.CCompositeChange; import org.eclipse.cdt.internal.ui.refactoring.changes.CCompositeChange;
import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper;
public class RemoveFunctionBodiesRefactoring extends CRefactoring { public class RemoveFunctionBodiesRefactoring extends CRefactoring {
private INodeFactory nodeFactory; private INodeFactory nodeFactory;
@ -63,6 +66,7 @@ public class RemoveFunctionBodiesRefactoring extends CRefactoring {
private IIndex index; private IIndex index;
private IASTTranslationUnit ast; private IASTTranslationUnit ast;
private IRegion region;
public RemoveFunctionBodiesRefactoring(ICElement element, ISelection selection, ICProject project) { public RemoveFunctionBodiesRefactoring(ICElement element, ISelection selection, ICProject project) {
super(element, selection, project); super(element, selection, project);
@ -83,6 +87,8 @@ public class RemoveFunctionBodiesRefactoring extends CRefactoring {
ast = getAST(tu, progress.newChild(1)); ast = getAST(tu, progress.newChild(1));
index = getIndex(); index = getIndex();
nodeFactory = ast.getASTNodeFactory(); nodeFactory = ast.getASTNodeFactory();
region = selectedRegion.getLength() == 0 ?
new Region(0, ast.getFileLocation().getNodeLength()) : selectedRegion;
if (isProgressMonitorCanceled(progress, initStatus)) if (isProgressMonitorCanceled(progress, initStatus))
return initStatus; return initStatus;
@ -118,6 +124,8 @@ public class RemoveFunctionBodiesRefactoring extends CRefactoring {
CTextFileChange fileChange = new CTextFileChange(tu.getElementName(), tu); CTextFileChange fileChange = new CTextFileChange(tu.getElementName(), tu);
fileChange.setEdit(new MultiTextEdit()); fileChange.setEdit(new MultiTextEdit());
for (IASTFunctionDefinition definition : finder.functionDefinitions) { for (IASTFunctionDefinition definition : finder.functionDefinitions) {
if (!SelectionHelper.isNodeInsideRegion(definition, region))
continue;
IASTStatement body = definition.getBody(); IASTStatement body = definition.getBody();
IASTName name = definition.getDeclarator().getName(); IASTName name = definition.getDeclarator().getName();
IBinding binding = name.resolveBinding(); IBinding binding = name.resolveBinding();

5
core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java
View file

@ -69,6 +69,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLambdaExpression;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLinkageSpecification; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLinkageSpecification;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceAlias; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceAlias;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTOperatorName;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName; 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.ICPPASTTemplateDeclaration;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateId; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateId;
@ -354,8 +355,8 @@ public class RemoveUnusedDeclarationsRefactoring extends CRefactoring {
for (IASTDeclarator declarator : declarators) { for (IASTDeclarator declarator : declarators) {
declarator = findInnermostDeclarator(declarator); declarator = findInnermostDeclarator(declarator);
IASTName name = declarator.getName(); IASTName name = declarator.getName();
if (name instanceof ICPPASTConversionName) if (name instanceof ICPPASTConversionName || name instanceof ICPPASTOperatorName)
return null; // Do not remove conversion operators. return null; // Do not remove operators.
names.add(name); names.add(name);
} }
IASTDeclSpecifier declSpecifier = ((IASTSimpleDeclaration) declaration).getDeclSpecifier(); IASTDeclSpecifier declSpecifier = ((IASTSimpleDeclaration) declaration).getDeclSpecifier();