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

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2014-11-04 12:02:51 -08:00
parent bf95b80b05
commit 8997a49ef1
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java
View file

@ -40,7 +40,8 @@ import org.eclipse.cdt.internal.ui.refactoring.CRefactoringContext;
*/ */
public class NamespaceHelper { public class NamespaceHelper {
/** /**
* Returns the qualified name of all namespaces that are defined at the specified translation unit and offset. * Returns the qualified name of all namespaces that are defined at the specified translation
* unit and offset.
* *
* @param translationUnit * @param translationUnit
* @param offset * @param offset
@ -55,11 +56,12 @@ public class NamespaceHelper {
astCache.getAST(translationUnit, null).accept(new CPPASTAllVisitor() { astCache.getAST(translationUnit, null).accept(new CPPASTAllVisitor() {
@Override @Override
public int visit(IASTDeclSpecifier declSpec) { public int visit(IASTDeclSpecifier declSpec) {
if (declSpec instanceof ICPPASTCompositeTypeSpecifier && checkFileNameAndLocation(translationUnit.getLocation(), offset, declSpec)) { if (declSpec instanceof ICPPASTCompositeTypeSpecifier &&
qualifiedName.addName(createNameWithTemplates(declSpec)); checkFileNameAndLocation(translationUnit.getLocation(), offset, declSpec)) {
} qualifiedName.addName(createNameWithTemplates(declSpec));
return super.visit(declSpec);
} }
return super.visit(declSpec);
}
@Override @Override
public int visit(ICPPASTNamespaceDefinition namespace) { public int visit(ICPPASTNamespaceDefinition namespace) {
@ -92,16 +94,14 @@ public class NamespaceHelper {
} }
private static IASTName createNameWithTemplates(IASTNode declarationParent) { private static IASTName createNameWithTemplates(IASTNode declarationParent) {
IASTName parentName; IASTName parentName = ((ICPPASTCompositeTypeSpecifier) declarationParent).getName().copy(
parentName = ((ICPPASTCompositeTypeSpecifier) declarationParent).getName().copy(
CopyStyle.withLocations); CopyStyle.withLocations);
if (classHasTemplates(declarationParent)) { if (classHasTemplates(declarationParent)) {
CPPASTTemplateId templateId = new CPPASTTemplateId(); CPPASTTemplateId templateId = new CPPASTTemplateId();
templateId.setTemplateName(parentName); templateId.setTemplateName(parentName);
for (ICPPASTTemplateParameter templateParameter : ((ICPPASTTemplateDeclaration) declarationParent.getParent().getParent() ).getTemplateParameters()) { for (ICPPASTTemplateParameter templateParameter : ((ICPPASTTemplateDeclaration) declarationParent.getParent().getParent()).getTemplateParameters()) {
if (templateParameter instanceof CPPASTSimpleTypeTemplateParameter) { if (templateParameter instanceof CPPASTSimpleTypeTemplateParameter) {
CPPASTSimpleTypeTemplateParameter simpleTypeTemplateParameter = (CPPASTSimpleTypeTemplateParameter) templateParameter; CPPASTSimpleTypeTemplateParameter simpleTypeTemplateParameter = (CPPASTSimpleTypeTemplateParameter) templateParameter;

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexUI.java
View file

@ -289,7 +289,7 @@ public class IndexUI {
if (binding != null) { if (binding != null) {
IIndexName[] defs= index.findNames(binding, IIndex.FIND_DEFINITIONS | IIndex.SEARCH_ACROSS_LANGUAGE_BOUNDARIES); IIndexName[] defs= index.findNames(binding, IIndex.FIND_DEFINITIONS | IIndex.SEARCH_ACROSS_LANGUAGE_BOUNDARIES);
ArrayList<ICElementHandle> result= new ArrayList<ICElementHandle>(); ArrayList<ICElementHandle> result= new ArrayList<>();
for (IIndexName in : defs) { for (IIndexName in : defs) {
ICElementHandle definition= getCElementForName((ICProject) null, index, in); ICElementHandle definition= getCElementForName((ICProject) null, index, in);
if (definition != null) { if (definition != null) {
@ -506,7 +506,7 @@ public class IndexUI {
for (ICPPTemplateInstance inst : instances) { for (ICPPTemplateInstance inst : instances) {
if (!ASTInternal.hasDeclaration(inst)) { if (!ASTInternal.hasDeclaration(inst)) {
if (result == null) if (result == null)
result= new ArrayList<IBinding>(instances.length); result= new ArrayList<>(instances.length);
result.add(inst); result.add(inst);
} }
} }
@ -524,7 +524,7 @@ public class IndexUI {
specializedMember= index.adaptBinding(specializedMember); specializedMember= index.adaptBinding(specializedMember);
if (specializedMember != null) { if (specializedMember != null) {
if (result == null) if (result == null)
result= new ArrayList<IBinding>(specializations.size()); result= new ArrayList<>(specializations.size());
result.add(specializedMember); result.add(specializedMember);
// Also add instances of the specialized member. // Also add instances of the specialized member.
if (specializedMember instanceof ICPPInstanceCache) { if (specializedMember instanceof ICPPInstanceCache) {