mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 23:15:24 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2016-02-23 20:04:31 -08:00
parent 8c0ea6af0b
commit a913d61e4f
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
View file

@ -198,7 +198,7 @@ public class IncludeOrganizer {
NodeCommentMap commentedNodeMap = ASTCommenter.getCommentedNodeMap(ast); NodeCommentMap commentedNodeMap = ASTCommenter.getCommentedNodeMap(ast);
// Use a map instead of a set to be able to retrieve existing elements using equal elements. // Use a map instead of a set to be able to retrieve existing elements using equal elements.
// Maps each element to itself. // Maps each element to itself.
Map<IncludePrototype, IncludePrototype> includePrototypes = new HashMap<>(); Map<IncludePrototype, IncludePrototype> includePrototypes = new HashMap<>();
// Put the new includes into includePrototypes. // Put the new includes into includePrototypes.
for (IPath header : fContext.getHeadersToInclude()) { for (IPath header : fContext.getHeadersToInclude()) {
@ -225,7 +225,7 @@ public class IncludeOrganizer {
IRegion includeReplacementRegion = IRegion includeReplacementRegion =
IncludeUtil.getSafeIncludeReplacementRegion(fContext.getSourceContents(), ast, commentedNodeMap); IncludeUtil.getSafeIncludeReplacementRegion(fContext.getSourceContents(), ast, commentedNodeMap);
IncludePreferences preferences = fContext.getPreferences(); IncludePreferences preferences = fContext.getPreferences();
boolean allowReordering = preferences.allowReordering || existingIncludes.length == 0; boolean allowReordering = preferences.allowReordering || existingIncludes.length == 0;
@ -238,7 +238,7 @@ public class IncludeOrganizer {
if (prototype.getExistingInclude() == null if (prototype.getExistingInclude() == null
|| (allowReordering && isContainedInRegion(prototype.getExistingInclude(), includeReplacementRegion))) { || (allowReordering && isContainedInRegion(prototype.getExistingInclude(), includeReplacementRegion))) {
IncludeGroupStyle groupingStyle = prototype.getStyle().getGroupingStyle(preferences.includeStyles); IncludeGroupStyle groupingStyle = prototype.getStyle().getGroupingStyle(preferences.includeStyles);
// If reordering is not allowed, group everything together. // If reordering is not allowed, group everything together.
int position = allowReordering ? groupingStyle.getOrder() : 0; int position = allowReordering ? groupingStyle.getOrder() : 0;
List<IncludePrototype> prototypes = groupedPrototypes[position]; List<IncludePrototype> prototypes = groupedPrototypes[position];
if (prototypes == null) { if (prototypes == null) {
@ -312,7 +312,7 @@ public class IncludeOrganizer {
if (offset != 0 && !TextUtil.isPreviousLineBlank(fContext.getSourceContents(), offset)) if (offset != 0 && !TextUtil.isPreviousLineBlank(fContext.getSourceContents(), offset))
buf.insert(0, fContext.getLineDelimiter()); // Blank line before. buf.insert(0, fContext.getLineDelimiter()); // Blank line before.
} }
String text = buf.toString(); String text = buf.toString();
// TODO(sprigogin): Add a diff algorithm and produce narrower replacements. // TODO(sprigogin): Add a diff algorithm and produce narrower replacements.
if (text.length() != length || if (text.length() != length ||
@ -333,7 +333,7 @@ public class IncludeOrganizer {
/** /**
* Creates forward declarations by examining the list of bindings which have to be declared. * Creates forward declarations by examining the list of bindings which have to be declared.
* @param pendingBlankLine * @param pendingBlankLine
*/ */
private void createForwardDeclarations(IASTTranslationUnit ast, BindingClassifier classifier, private void createForwardDeclarations(IASTTranslationUnit ast, BindingClassifier classifier,
int offset, boolean pendingBlankLine, MultiTextEdit rootEdit) throws CoreException { int offset, boolean pendingBlankLine, MultiTextEdit rootEdit) throws CoreException {
@ -413,7 +413,7 @@ public class IncludeOrganizer {
// Append return type and function name. // Append return type and function name.
IFunctionType functionType = function.getType(); IFunctionType functionType = function.getType();
// TODO(sprigogin): Switch to ASTWriter since ASTTypeUtil doesn't properly handle namespaces. // TODO(sprigogin): Switch to ASTWriter since ASTTypeUtil doesn't properly handle namespaces.
declarationText.append(ASTTypeUtil.getType(functionType.getReturnType(), false)); declarationText.append(ASTTypeUtil.getType(functionType.getReturnType(), false));
declarationText.append(' '); declarationText.append(' ');
declarationText.append(function.getName()); declarationText.append(function.getName());
@ -474,7 +474,7 @@ public class IncludeOrganizer {
ForwardDeclarationNode node = new ForwardDeclarationNode(ns); ForwardDeclarationNode node = new ForwardDeclarationNode(ns);
parentNode = parentNode.findOrAddChild(node); parentNode = parentNode.findOrAddChild(node);
} }
ForwardDeclarationNode node = ForwardDeclarationNode node =
new ForwardDeclarationNode(binding.getName(), declarationText.toString(), declarationType); new ForwardDeclarationNode(binding.getName(), declarationText.toString(), declarationType);
parentNode.findOrAddChild(node); parentNode.findOrAddChild(node);
@ -634,8 +634,8 @@ public class IncludeOrganizer {
for (InclusionRequest request : requests) { for (InclusionRequest request : requests) {
if (!request.isResolved() && !isExportedBinding(request, headerSubstitutor)) { if (!request.isResolved() && !isExportedBinding(request, headerSubstitutor)) {
List<IPath> candidatePaths = request.getCandidatePaths(); List<IPath> candidatePaths = request.getCandidatePaths();
Set<IPath> representativeHeaders = new HashSet<IPath>(); Set<IPath> representativeHeaders = new HashSet<>();
Set<IPath> representedHeaders = new HashSet<IPath>(); Set<IPath> representedHeaders = new HashSet<>();
boolean allRepresented = true; boolean allRepresented = true;
for (IPath path : candidatePaths) { for (IPath path : candidatePaths) {
if (fContext.isIncluded(path)) { if (fContext.isIncluded(path)) {
@ -719,7 +719,7 @@ public class IncludeOrganizer {
IPath header = fHeaderChooser.chooseHeader(request.getBinding().getName(), candidatePaths); IPath header = fHeaderChooser.chooseHeader(request.getBinding().getName(), candidatePaths);
if (header == null) if (header == null)
throw new OperationCanceledException(); throw new OperationCanceledException();
request.resolve(header); request.resolve(header);
if (DEBUG_HEADER_SUBSTITUTION) { if (DEBUG_HEADER_SUBSTITUTION) {
System.out.println(request.toString() + " (user's choice)"); //$NON-NLS-1$ System.out.println(request.toString() + " (user's choice)"); //$NON-NLS-1$
@ -783,7 +783,7 @@ public class IncludeOrganizer {
IPath header = fHeaderChooser.chooseHeader(request.getBinding().getName(), candidatePaths); IPath header = fHeaderChooser.chooseHeader(request.getBinding().getName(), candidatePaths);
if (header == null) if (header == null)
throw new OperationCanceledException(); throw new OperationCanceledException();
request.resolve(header); request.resolve(header);
if (DEBUG_HEADER_SUBSTITUTION) { if (DEBUG_HEADER_SUBSTITUTION) {
System.out.println(request.toString() + System.out.println(request.toString() +
@ -813,7 +813,7 @@ public class IncludeOrganizer {
private List<InclusionRequest> createInclusionRequests(IASTTranslationUnit ast, private List<InclusionRequest> createInclusionRequests(IASTTranslationUnit ast,
Set<IBinding> bindingsToInclude, boolean allowDeclarations, Set<IBinding> bindingsToInclude, boolean allowDeclarations,
IIndexFileSet reachableHeaders) throws CoreException { IIndexFileSet reachableHeaders) throws CoreException {
List<InclusionRequest> requests = new ArrayList<InclusionRequest>(bindingsToInclude.size()); List<InclusionRequest> requests = new ArrayList<>(bindingsToInclude.size());
IIndex index = fContext.getIndex(); IIndex index = fContext.getIndex();
binding_loop: for (IBinding binding : bindingsToInclude) { binding_loop: for (IBinding binding : bindingsToInclude) {
@ -946,7 +946,7 @@ public class IncludeOrganizer {
} }
return false; return false;
} }
private String getTrimmedCommentText(IASTComment comment) { private String getTrimmedCommentText(IASTComment comment) {
char[] text = comment.getComment(); char[] text = comment.getComment();
int end = text.length - (comment.isBlockComment() ? 2 : 0); int end = text.length - (comment.isBlockComment() ? 2 : 0);