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

Refactoring &Content Assist bug fixes

Browse source
This commit is contained in:
Hoda Amer 2004-04-15 20:33:16 +00:00
parent e20be2336b
commit df56f209bb
3 changed files with 52 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,7 @@
2004-04-15 Hoda Amer
Fix for bug#58566 : [Refactoring] renaming #define statements
Fix for bug#58335 : [Content Assist] Class forward declarations not reported
2004-05-15 David Inglis 2004-05-15 David Inglis
Work in Progress - start of new C Path Container Wizard Work in Progress - start of new C Path Container Wizard

23
core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java
View file

@ -20,6 +20,7 @@ import org.eclipse.cdt.core.model.IEnumeration;
import org.eclipse.cdt.core.model.IField; import org.eclipse.cdt.core.model.IField;
import org.eclipse.cdt.core.model.IFunction; import org.eclipse.cdt.core.model.IFunction;
import org.eclipse.cdt.core.model.IFunctionDeclaration; import org.eclipse.cdt.core.model.IFunctionDeclaration;
import org.eclipse.cdt.core.model.IMacro;
import org.eclipse.cdt.core.model.IMethod; import org.eclipse.cdt.core.model.IMethod;
import org.eclipse.cdt.core.model.IMethodDeclaration; import org.eclipse.cdt.core.model.IMethodDeclaration;
import org.eclipse.cdt.core.model.INamespace; import org.eclipse.cdt.core.model.INamespace;
@ -60,6 +61,7 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc
private SearchResultGroup[] fReferences; private SearchResultGroup[] fReferences;
private TextChangeManager fChangeManager; private TextChangeManager fChangeManager;
private final String QUALIFIER = "::"; //$NON-NLS-1$ private final String QUALIFIER = "::"; //$NON-NLS-1$
private final String TELTA = "~"; //$NON-NLS-1$
private boolean fUpdateReferences; private boolean fUpdateReferences;
@ -148,7 +150,7 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc
} }
public String getElementQualifiedName(ICElement element){ public String getElementQualifiedName(ICElement element){
if(element instanceof ITranslationUnit){ if(!eligibleForRefactoring(element)){
return ""; return "";
} else { } else {
StringBuffer name = new StringBuffer(); StringBuffer name = new StringBuffer();
@ -169,7 +171,7 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc
} }
} }
public RefactoringStatus checkNewElementName(String newName){ public RefactoringStatus checkNewElementName(String newName){
if ((fCElement == null) || (!(fCElement instanceof ISourceReference)) || (fCElement instanceof ITranslationUnit)) { if (!eligibleForRefactoring(fCElement)) {
return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element")); //$NON-NLS-1$ return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element")); //$NON-NLS-1$
} }
@ -247,7 +249,7 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc
*/ */
public RefactoringStatus checkActivation() throws CoreException { public RefactoringStatus checkActivation() throws CoreException {
RefactoringStatus result= null; RefactoringStatus result= null;
if ((fCElement == null) || (!(fCElement instanceof ISourceReference)) || (fCElement instanceof ITranslationUnit)) { if (!eligibleForRefactoring(fCElement)) {
return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element")); //$NON-NLS-1$ return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element")); //$NON-NLS-1$
} }
return Checks.checkIfTuBroken(fCElement); return Checks.checkIfTuBroken(fCElement);
@ -406,9 +408,9 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc
ICSearchConstants.TYPE, ICSearchConstants.REFERENCES, false )); ICSearchConstants.TYPE, ICSearchConstants.REFERENCES, false ));
IStructure structure = (IStructure) fCElement; IStructure structure = (IStructure) fCElement;
if(structure.getElementType() == ICElement.C_CLASS){ if(structure.getElementType() == ICElement.C_CLASS){
orPattern.addPattern(SearchEngine.createSearchPattern( searchPrefix + "::" + structure.getElementName(), //$NON-NLS-1$ orPattern.addPattern(SearchEngine.createSearchPattern( searchPrefix + QUALIFIER + structure.getElementName(),
ICSearchConstants.METHOD, ICSearchConstants.ALL_OCCURRENCES, false )); ICSearchConstants.METHOD, ICSearchConstants.ALL_OCCURRENCES, false ));
orPattern.addPattern(SearchEngine.createSearchPattern( searchPrefix + "::~" + structure.getElementName(), //$NON-NLS-1$ orPattern.addPattern(SearchEngine.createSearchPattern( searchPrefix + QUALIFIER + TELTA + structure.getElementName(),
ICSearchConstants.METHOD, ICSearchConstants.ALL_OCCURRENCES, false )); ICSearchConstants.METHOD, ICSearchConstants.ALL_OCCURRENCES, false ));
} }
} }
@ -534,4 +536,15 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc
return result; return result;
} }
private boolean eligibleForRefactoring(ICElement element){
if((element == null)
|| (!(element instanceof ISourceReference))
|| (element instanceof ITranslationUnit)
|| (element instanceof IMacro)){
return false;
} else {
return true;
}
}
} }

48
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
View file

@ -42,6 +42,7 @@ import org.eclipse.cdt.core.parser.ast.IASTClassSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTCodeScope; import org.eclipse.cdt.core.parser.ast.IASTCodeScope;
import org.eclipse.cdt.core.parser.ast.IASTCompilationUnit; import org.eclipse.cdt.core.parser.ast.IASTCompilationUnit;
import org.eclipse.cdt.core.parser.ast.IASTCompletionNode; import org.eclipse.cdt.core.parser.ast.IASTCompletionNode;
import org.eclipse.cdt.core.parser.ast.IASTElaboratedTypeSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTEnumerationSpecifier; import org.eclipse.cdt.core.parser.ast.IASTEnumerationSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTEnumerator; import org.eclipse.cdt.core.parser.ast.IASTEnumerator;
import org.eclipse.cdt.core.parser.ast.IASTField; import org.eclipse.cdt.core.parser.ast.IASTField;
@ -318,6 +319,34 @@ public class CompletionEngine implements RelevanceConstants {
requestor.acceptTypedef(typedef.getName(), completionStart, completionLength, relevance); requestor.acceptTypedef(typedef.getName(), completionStart, completionLength, relevance);
} }
else if(node instanceof IASTElaboratedTypeSpecifier){
IASTElaboratedTypeSpecifier elaboratedTypeSpecifier = (IASTElaboratedTypeSpecifier)node;
ASTClassKind classkind = elaboratedTypeSpecifier.getClassKind();
if(classkind == ASTClassKind.CLASS){
int relevance = computeRelevance(ICElement.C_CLASS, prefix, elaboratedTypeSpecifier.getName());
requestor.acceptClass(elaboratedTypeSpecifier.getName(),
completionStart, completionLength, relevance);
}
else if(classkind == ASTClassKind.STRUCT){
int relevance = computeRelevance(ICElement.C_STRUCT, prefix, elaboratedTypeSpecifier.getName());
requestor.acceptStruct(elaboratedTypeSpecifier.getName(),
completionStart, completionLength, relevance);
}
else if(classkind == ASTClassKind.UNION){
int relevance = computeRelevance(ICElement.C_UNION, prefix, elaboratedTypeSpecifier.getName());
requestor.acceptUnion(elaboratedTypeSpecifier.getName(),
completionStart, completionLength, relevance);
}
else if(classkind == ASTClassKind.ENUM){
int relevance = computeRelevance(ICElement.C_ENUMERATION, prefix, elaboratedTypeSpecifier.getName());
requestor.acceptEnumeration(elaboratedTypeSpecifier.getName(),
completionStart, completionLength, relevance);
}
}
} }
private void addKeywordToCompletions (String keyword){ private void addKeywordToCompletions (String keyword){
@ -514,8 +543,6 @@ public class CompletionEngine implements RelevanceConstants {
IASTNode.LookupKind[] kinds = new IASTNode.LookupKind[1]; IASTNode.LookupKind[] kinds = new IASTNode.LookupKind[1];
kinds[0] = IASTNode.LookupKind.ALL; kinds[0] = IASTNode.LookupKind.ALL;
String prefix = completionNode.getCompletionPrefix(); String prefix = completionNode.getCompletionPrefix();
// if(prefix.equals("(")) //$NON-NLS-1$
// prefix = ""; //$NON-NLS-1$
result = lookup(searchNode, prefix, kinds, completionNode.getCompletionContext()); result = lookup(searchNode, prefix, kinds, completionNode.getCompletionContext());
addToCompletions(result); addToCompletions(result);
@ -582,13 +609,6 @@ public class CompletionEngine implements RelevanceConstants {
IASTScope searchNode = completionNode.getCompletionScope(); IASTScope searchNode = completionNode.getCompletionScope();
// look for the specific type being newed and the scope // look for the specific type being newed and the scope
IASTNode context = completionNode.getCompletionContext(); IASTNode context = completionNode.getCompletionContext();
// if ((context != null) && (context instanceof IASTClassSpecifier)){
// IASTClassSpecifier classContext = (IASTClassSpecifier) context;
// IASTNode.LookupKind[] kinds = new IASTNode.LookupKind[1];
// kinds[0] = IASTNode.LookupKind.STRUCTURES;
// ILookupResult result = lookup(searchNode, completionNode.getCompletionPrefix(), kinds, completionNode.getCompletionContext());
// addToCompletions(result);
// }
// basic completion on all types // basic completion on all types
completionOnTypeReference(completionNode); completionOnTypeReference(completionNode);
} }
@ -655,10 +675,6 @@ public class CompletionEngine implements RelevanceConstants {
// completionOnMemberReference // completionOnMemberReference
completionOnMemberReference(completionNode); completionOnMemberReference(completionNode);
} }
// else if(kind == CompletionKind.SCOPED_REFERENCE){
// // completionOnMemberReference
// completionOnScopedReference(completionNode);
// }
else if(kind == CompletionKind.FIELD_TYPE){ else if(kind == CompletionKind.FIELD_TYPE){
// CompletionOnFieldType // CompletionOnFieldType
completionOnFieldType(completionNode); completionOnFieldType(completionNode);
@ -713,9 +729,7 @@ public class CompletionEngine implements RelevanceConstants {
} }
// add keywords in all cases except for member and scoped reference cases. // add keywords in all cases except for member and scoped reference cases.
if((kind != CompletionKind.MEMBER_REFERENCE) if(kind != CompletionKind.MEMBER_REFERENCE){
// &&(kind != CompletionKind.SCOPED_REFERENCE)
){
addKeywordsToCompletions( completionNode.getKeywords()); addKeywordsToCompletions( completionNode.getKeywords());
} }
@ -730,8 +744,6 @@ public class CompletionEngine implements RelevanceConstants {
String kindStr = ""; //$NON-NLS-1$ String kindStr = ""; //$NON-NLS-1$
if(kind == IASTCompletionNode.CompletionKind.MEMBER_REFERENCE) if(kind == IASTCompletionNode.CompletionKind.MEMBER_REFERENCE)
kindStr = "MEMBER_REFERENCE"; //$NON-NLS-1$ kindStr = "MEMBER_REFERENCE"; //$NON-NLS-1$
// else if(kind == IASTCompletionNode.CompletionKind.SCOPED_REFERENCE)
// kindStr = "SCOPED_REFERENCE";
else if(kind == IASTCompletionNode.CompletionKind.FIELD_TYPE) else if(kind == IASTCompletionNode.CompletionKind.FIELD_TYPE)
kindStr = "FIELD_TYPE Class Scope"; //$NON-NLS-1$ kindStr = "FIELD_TYPE Class Scope"; //$NON-NLS-1$
else if(kind == IASTCompletionNode.CompletionKind.VARIABLE_TYPE) else if(kind == IASTCompletionNode.CompletionKind.VARIABLE_TYPE)