mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Cosmetics.
This commit is contained in:
Sergey Prigogin
parent
e07fbf49f5
commit
e5c42af4c9
2 changed files with 79 additions and 80 deletions
|
|
@ -36,7 +36,6 @@ import org.eclipse.core.runtime.IStatus;
|
|||
import org.eclipse.text.edits.TextEdit;
|
||||
|
||||
public class CCodeFormatter extends CodeFormatter {
|
||||
|
||||
private DefaultCodeFormatterOptions preferences;
|
||||
private Map<String, ?> options;
|
||||
|
||||
|
|
@ -78,8 +77,7 @@ public class CCodeFormatter extends CodeFormatter {
|
|||
|
||||
case DefaultCodeFormatterOptions.MIXED:
|
||||
int tabSize= preferences.tab_size;
|
||||
int spaceEquivalents= indentationLevel
|
||||
* preferences.indentation_size;
|
||||
int spaceEquivalents= indentationLevel * preferences.indentation_size;
|
||||
tabs= spaceEquivalents / tabSize;
|
||||
spaces= spaceEquivalents % tabSize;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -336,31 +336,31 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
int indentLevel= scribe.indentationLevel;
|
||||
try {
|
||||
if (node instanceof IASTFunctionDefinition) {
|
||||
return visit((IASTFunctionDefinition)node);
|
||||
return visit((IASTFunctionDefinition) node);
|
||||
} else if (node instanceof IASTSimpleDeclaration) {
|
||||
return visit((IASTSimpleDeclaration)node);
|
||||
return visit((IASTSimpleDeclaration) node);
|
||||
} else if (node instanceof IASTASMDeclaration) {
|
||||
return visit((IASTASMDeclaration)node);
|
||||
return visit((IASTASMDeclaration) node);
|
||||
} else if (node instanceof ICPPASTVisibilityLabel) {
|
||||
return visit((ICPPASTVisibilityLabel)node);
|
||||
return visit((ICPPASTVisibilityLabel) node);
|
||||
} else if (node instanceof ICPPASTNamespaceDefinition) {
|
||||
return visit((ICPPASTNamespaceDefinition)node);
|
||||
return visit((ICPPASTNamespaceDefinition) node);
|
||||
} else if (node instanceof ICPPASTNamespaceAlias) {
|
||||
return visit((ICPPASTNamespaceAlias)node);
|
||||
return visit((ICPPASTNamespaceAlias) node);
|
||||
} else if (node instanceof ICPPASTUsingDeclaration) {
|
||||
return visit((ICPPASTUsingDeclaration)node);
|
||||
return visit((ICPPASTUsingDeclaration) node);
|
||||
} else if (node instanceof ICPPASTUsingDirective) {
|
||||
return visit((ICPPASTUsingDirective)node);
|
||||
return visit((ICPPASTUsingDirective) node);
|
||||
} else if (node instanceof ICPPASTLinkageSpecification) {
|
||||
return visit((ICPPASTLinkageSpecification)node);
|
||||
return visit((ICPPASTLinkageSpecification) node);
|
||||
} else if (node instanceof ICPPASTTemplateDeclaration) {
|
||||
return visit((ICPPASTTemplateDeclaration)node);
|
||||
return visit((ICPPASTTemplateDeclaration) node);
|
||||
} else if (node instanceof ICPPASTTemplateSpecialization) {
|
||||
return visit((ICPPASTTemplateSpecialization)node);
|
||||
return visit((ICPPASTTemplateSpecialization) node);
|
||||
} else if (node instanceof ICPPASTExplicitTemplateInstantiation) {
|
||||
return visit((ICPPASTExplicitTemplateInstantiation)node);
|
||||
return visit((ICPPASTExplicitTemplateInstantiation) node);
|
||||
} else if (node instanceof IASTProblemDeclaration) {
|
||||
return visit((IASTProblemDeclaration)node);
|
||||
return visit((IASTProblemDeclaration) node);
|
||||
} else {
|
||||
formatRaw(node);
|
||||
}
|
||||
|
|
@ -385,9 +385,9 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
if (!startNode(node)) { return PROCESS_SKIP; }
|
||||
try {
|
||||
if (node instanceof ICPPASTQualifiedName) {
|
||||
visit((ICPPASTQualifiedName)node);
|
||||
visit((ICPPASTQualifiedName) node);
|
||||
} else if (node instanceof ICPPASTTemplateId) {
|
||||
visit((ICPPASTTemplateId)node);
|
||||
visit((ICPPASTTemplateId) node);
|
||||
} else {
|
||||
formatRaw(node);
|
||||
}
|
||||
|
|
@ -403,7 +403,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
@Override
|
||||
public int visit(IASTInitializer node) {
|
||||
if (node instanceof ICPPASTConstructorInitializer) {
|
||||
return visit((ICPPASTConstructorInitializer)node);
|
||||
return visit((ICPPASTConstructorInitializer) node);
|
||||
}
|
||||
|
||||
if (peekNextToken() == Token.tASSIGN) {
|
||||
|
|
@ -496,15 +496,15 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
}
|
||||
|
||||
if (node instanceof ICPPASTFunctionDeclarator) {
|
||||
return visit((ICPPASTFunctionDeclarator)node);
|
||||
return visit((ICPPASTFunctionDeclarator) node);
|
||||
} else if (node instanceof IASTStandardFunctionDeclarator) {
|
||||
visit((IASTStandardFunctionDeclarator)node);
|
||||
visit((IASTStandardFunctionDeclarator) node);
|
||||
} else if (node instanceof ICASTKnRFunctionDeclarator) {
|
||||
visit((ICASTKnRFunctionDeclarator)node);
|
||||
visit((ICASTKnRFunctionDeclarator) node);
|
||||
} else if (node instanceof IASTFieldDeclarator) {
|
||||
visit((IASTFieldDeclarator)node);
|
||||
visit((IASTFieldDeclarator) node);
|
||||
} else if (node instanceof IASTArrayDeclarator) {
|
||||
visit((IASTArrayDeclarator)node);
|
||||
visit((IASTArrayDeclarator) node);
|
||||
}
|
||||
|
||||
IASTInitializer initializer= node.getInitializer();
|
||||
|
|
@ -540,17 +540,17 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
if (!startNode(node)) { return PROCESS_SKIP; }
|
||||
try {
|
||||
if (node instanceof ICPPASTCompositeTypeSpecifier) {
|
||||
visit((ICPPASTCompositeTypeSpecifier)node);
|
||||
visit((ICPPASTCompositeTypeSpecifier) node);
|
||||
} else if (node instanceof ICASTCompositeTypeSpecifier) {
|
||||
visit((ICASTCompositeTypeSpecifier)node);
|
||||
visit((ICASTCompositeTypeSpecifier) node);
|
||||
} else if (node instanceof IASTElaboratedTypeSpecifier) {
|
||||
visit((IASTElaboratedTypeSpecifier)node);
|
||||
visit((IASTElaboratedTypeSpecifier) node);
|
||||
} else if (node instanceof IASTEnumerationSpecifier) {
|
||||
visit((IASTEnumerationSpecifier)node);
|
||||
visit((IASTEnumerationSpecifier) node);
|
||||
} else if (node instanceof IASTSimpleDeclSpecifier) {
|
||||
visit((IASTSimpleDeclSpecifier)node);
|
||||
visit((IASTSimpleDeclSpecifier) node);
|
||||
} else if (node instanceof IASTNamedTypeSpecifier) {
|
||||
visit((IASTNamedTypeSpecifier)node);
|
||||
visit((IASTNamedTypeSpecifier) node);
|
||||
} else {
|
||||
formatRaw(node);
|
||||
}
|
||||
|
|
@ -568,37 +568,37 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
if (!startNode(node)) { return PROCESS_SKIP; }
|
||||
try {
|
||||
if (node instanceof IASTArraySubscriptExpression) {
|
||||
visit((IASTArraySubscriptExpression)node);
|
||||
visit((IASTArraySubscriptExpression) node);
|
||||
} else if (node instanceof IASTConditionalExpression) {
|
||||
visit((IASTConditionalExpression)node);
|
||||
visit((IASTConditionalExpression) node);
|
||||
} else if (node instanceof IASTFunctionCallExpression) {
|
||||
visit((IASTFunctionCallExpression)node);
|
||||
visit((IASTFunctionCallExpression) node);
|
||||
} else if (node instanceof IASTExpressionList) {
|
||||
visit((IASTExpressionList)node);
|
||||
visit((IASTExpressionList) node);
|
||||
} else if (node instanceof IASTTypeIdExpression) {
|
||||
visit((IASTTypeIdExpression)node);
|
||||
visit((IASTTypeIdExpression) node);
|
||||
} else if (node instanceof IASTBinaryExpression) {
|
||||
visit((IASTBinaryExpression)node);
|
||||
visit((IASTBinaryExpression) node);
|
||||
} else if (node instanceof IASTLiteralExpression) {
|
||||
visit((IASTLiteralExpression)node);
|
||||
visit((IASTLiteralExpression) node);
|
||||
} else if (node instanceof IASTIdExpression) {
|
||||
visit((IASTIdExpression)node);
|
||||
visit((IASTIdExpression) node);
|
||||
} else if (node instanceof IASTCastExpression) {
|
||||
visit((IASTCastExpression)node);
|
||||
visit((IASTCastExpression) node);
|
||||
} else if (node instanceof IASTUnaryExpression) {
|
||||
visit((IASTUnaryExpression)node);
|
||||
visit((IASTUnaryExpression) node);
|
||||
} else if (node instanceof IASTFieldReference) {
|
||||
visit((IASTFieldReference)node);
|
||||
visit((IASTFieldReference) node);
|
||||
} else if (node instanceof ICASTTypeIdInitializerExpression) {
|
||||
visit((ICASTTypeIdInitializerExpression)node);
|
||||
visit((ICASTTypeIdInitializerExpression) node);
|
||||
} else if (node instanceof ICPPASTNewExpression) {
|
||||
visit((ICPPASTNewExpression)node);
|
||||
visit((ICPPASTNewExpression) node);
|
||||
} else if (node instanceof ICPPASTDeleteExpression) {
|
||||
visit((ICPPASTDeleteExpression)node);
|
||||
visit((ICPPASTDeleteExpression) node);
|
||||
} else if (node instanceof ICPPASTSimpleTypeConstructorExpression) {
|
||||
visit((ICPPASTSimpleTypeConstructorExpression)node);
|
||||
visit((ICPPASTSimpleTypeConstructorExpression) node);
|
||||
} else if (node instanceof IASTProblemExpression) {
|
||||
visit((IASTProblemExpression)node);
|
||||
visit((IASTProblemExpression) node);
|
||||
} else {
|
||||
formatRaw(node);
|
||||
}
|
||||
|
|
@ -617,43 +617,43 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
int indentLevel= scribe.indentationLevel;
|
||||
try {
|
||||
if (node instanceof IASTCompoundStatement) {
|
||||
visit((IASTCompoundStatement)node);
|
||||
visit((IASTCompoundStatement) node);
|
||||
} else if (node instanceof IASTNullStatement) {
|
||||
visit((IASTNullStatement)node);
|
||||
visit((IASTNullStatement) node);
|
||||
} else if (node instanceof IASTDeclarationStatement) {
|
||||
visit((IASTDeclarationStatement)node);
|
||||
visit((IASTDeclarationStatement) node);
|
||||
} else if (node instanceof IASTForStatement) {
|
||||
visit((IASTForStatement)node);
|
||||
visit((IASTForStatement) node);
|
||||
} else if (node instanceof ICPPASTRangeBasedForStatement) {
|
||||
visit((ICPPASTRangeBasedForStatement) node);
|
||||
} else if (node instanceof IASTIfStatement) {
|
||||
visit((IASTIfStatement)node);
|
||||
visit((IASTIfStatement) node);
|
||||
} else if (node instanceof ICPPASTCatchHandler) {
|
||||
visit((ICPPASTCatchHandler)node);
|
||||
visit((ICPPASTCatchHandler) node);
|
||||
} else if (node instanceof ICPPASTTryBlockStatement) {
|
||||
visit((ICPPASTTryBlockStatement)node);
|
||||
visit((ICPPASTTryBlockStatement) node);
|
||||
} else if (node instanceof IASTWhileStatement) {
|
||||
visit((IASTWhileStatement)node);
|
||||
visit((IASTWhileStatement) node);
|
||||
} else if (node instanceof IASTDoStatement) {
|
||||
visit((IASTDoStatement)node);
|
||||
visit((IASTDoStatement) node);
|
||||
} else if (node instanceof IASTSwitchStatement) {
|
||||
visit((IASTSwitchStatement)node);
|
||||
visit((IASTSwitchStatement) node);
|
||||
} else if (node instanceof IASTExpressionStatement) {
|
||||
visit((IASTExpressionStatement)node);
|
||||
visit((IASTExpressionStatement) node);
|
||||
} else if (node instanceof IASTContinueStatement) {
|
||||
visit((IASTContinueStatement)node);
|
||||
visit((IASTContinueStatement) node);
|
||||
} else if (node instanceof IASTReturnStatement) {
|
||||
visit((IASTReturnStatement)node);
|
||||
visit((IASTReturnStatement) node);
|
||||
} else if (node instanceof IASTBreakStatement) {
|
||||
visit((IASTBreakStatement)node);
|
||||
visit((IASTBreakStatement) node);
|
||||
} else if (node instanceof IASTCaseStatement) {
|
||||
visit((IASTCaseStatement)node);
|
||||
visit((IASTCaseStatement) node);
|
||||
} else if (node instanceof IASTDefaultStatement) {
|
||||
visit((IASTDefaultStatement)node);
|
||||
visit((IASTDefaultStatement) node);
|
||||
} else if (node instanceof IASTLabelStatement) {
|
||||
visit((IASTLabelStatement)node);
|
||||
visit((IASTLabelStatement) node);
|
||||
} else if (node instanceof IASTProblemStatement) {
|
||||
visit((IASTProblemStatement)node);
|
||||
visit((IASTProblemStatement) node);
|
||||
} else {
|
||||
formatRaw(node);
|
||||
}
|
||||
|
|
@ -680,7 +680,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
if (!startNode(node)) { return PROCESS_SKIP; }
|
||||
try {
|
||||
if (node instanceof IASTProblemHolder) {
|
||||
throw new ASTProblemException(((IASTProblemHolder)node).getProblem());
|
||||
throw new ASTProblemException(((IASTProblemHolder) node).getProblem());
|
||||
}
|
||||
// decl-specifier
|
||||
final IASTDeclSpecifier declSpec= node.getDeclSpecifier();
|
||||
|
|
@ -888,11 +888,11 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
if (!startNode(node)) { return PROCESS_SKIP; }
|
||||
try {
|
||||
if (node instanceof ICPPASTSimpleTypeTemplateParameter) {
|
||||
visit((ICPPASTSimpleTypeTemplateParameter)node);
|
||||
visit((ICPPASTSimpleTypeTemplateParameter) node);
|
||||
} else if (node instanceof ICPPASTTemplatedTypeTemplateParameter) {
|
||||
visit((ICPPASTTemplatedTypeTemplateParameter)node);
|
||||
visit((ICPPASTTemplatedTypeTemplateParameter) node);
|
||||
} else {
|
||||
visit((IASTParameterDeclaration)node);
|
||||
visit((IASTParameterDeclaration) node);
|
||||
}
|
||||
} catch (ASTProblemException e) {
|
||||
skipNode(node);
|
||||
|
|
@ -1045,7 +1045,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
scribe.startNewLine();
|
||||
|
||||
if (node instanceof ICPPASTFunctionWithTryBlock) {
|
||||
ICPPASTCatchHandler[] catchHandlers= ((ICPPASTFunctionWithTryBlock)node).getCatchHandlers();
|
||||
ICPPASTCatchHandler[] catchHandlers= ((ICPPASTFunctionWithTryBlock) node).getCatchHandlers();
|
||||
for (ICPPASTCatchHandler catchHandler : catchHandlers) {
|
||||
catchHandler.accept(this);
|
||||
scribe.printTrailingComment();
|
||||
|
|
@ -1062,7 +1062,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
}
|
||||
|
||||
private int visit(ICPPASTFunctionDeclarator node) {
|
||||
visit((IASTStandardFunctionDeclarator)node);
|
||||
visit((IASTStandardFunctionDeclarator) node);
|
||||
|
||||
boolean needSpace = skipConstVolatileRestrict();
|
||||
|
||||
|
|
@ -1375,7 +1375,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
scribe.space();
|
||||
}
|
||||
if (node instanceof ICPPASTNamedTypeSpecifier) {
|
||||
if (((ICPPASTNamedTypeSpecifier)node).isTypename()) {
|
||||
if (((ICPPASTNamedTypeSpecifier) node).isTypename()) {
|
||||
scribe.printNextToken(Token.t_typename);
|
||||
scribe.space();
|
||||
}
|
||||
|
|
@ -1714,7 +1714,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
final IASTNode node= elements.get(i);
|
||||
if (node instanceof ICPPASTConstructorChainInitializer) {
|
||||
// this is a special case
|
||||
visit((ICPPASTConstructorChainInitializer)node);
|
||||
visit((ICPPASTConstructorChainInitializer) node);
|
||||
} else {
|
||||
node.accept(this);
|
||||
}
|
||||
|
|
@ -2318,7 +2318,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
scribe.space();
|
||||
}
|
||||
if (node instanceof ICPPASTFieldReference) {
|
||||
if (((ICPPASTFieldReference)node).isTemplate()) {
|
||||
if (((ICPPASTFieldReference) node).isTemplate()) {
|
||||
scribe.printNextToken(Token.t_template);
|
||||
scribe.space();
|
||||
}
|
||||
|
|
@ -2533,7 +2533,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
}
|
||||
condition.accept(this);
|
||||
} else if (node instanceof ICPPASTForStatement) {
|
||||
final IASTDeclaration conditionDecl = ((ICPPASTForStatement)node).getConditionDeclaration();
|
||||
final IASTDeclaration conditionDecl = ((ICPPASTForStatement) node).getConditionDeclaration();
|
||||
if (conditionDecl != null) {
|
||||
if (preferences.insert_space_after_semicolon_in_for) {
|
||||
scribe.space();
|
||||
|
|
@ -2893,7 +2893,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
}
|
||||
statement.accept(this);
|
||||
if (preferences.indent_breaks_compare_to_cases) {
|
||||
if(!preferences.indent_switchstatements_compare_to_cases) {
|
||||
if (!preferences.indent_switchstatements_compare_to_cases) {
|
||||
scribe.unIndent();
|
||||
}
|
||||
} else if (preferences.indent_switchstatements_compare_to_cases) {
|
||||
|
|
@ -2992,7 +2992,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
if (condition != null) {
|
||||
condition.accept(this);
|
||||
} else if (node instanceof ICPPASTWhileStatement) {
|
||||
final IASTDeclaration conditionDecl= ((ICPPASTWhileStatement)node).getConditionDeclaration();
|
||||
final IASTDeclaration conditionDecl= ((ICPPASTWhileStatement) node).getConditionDeclaration();
|
||||
if (conditionDecl != null) {
|
||||
conditionDecl.accept(this);
|
||||
}
|
||||
|
|
@ -3397,7 +3397,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
private boolean commentStartsBlock(int start, int end) {
|
||||
localScanner.resetTo(start, end);
|
||||
if (localScanner.getNextToken() == Token.tLBRACE) {
|
||||
switch(localScanner.getNextToken()) {
|
||||
switch (localScanner.getNextToken()) {
|
||||
case Token.tBLOCKCOMMENT :
|
||||
case Token.tLINECOMMENT :
|
||||
return true;
|
||||
|
|
@ -3419,14 +3419,15 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
private int peekNextToken() {
|
||||
return peekNextToken(false);
|
||||
}
|
||||
|
||||
private int peekNextToken(boolean ignoreSkip) {
|
||||
if (!ignoreSkip && scribe.shouldSkip(scribe.scanner.getCurrentPosition())) {
|
||||
return Token.tBADCHAR;
|
||||
}
|
||||
localScanner.resetTo(scribe.scanner.getCurrentPosition(), scribe.scannerEndPosition - 1);
|
||||
int token = localScanner.getNextToken();
|
||||
loop: while(true) {
|
||||
switch(token) {
|
||||
loop: while (true) {
|
||||
switch (token) {
|
||||
case Token.tBLOCKCOMMENT :
|
||||
case Token.tLINECOMMENT :
|
||||
token = localScanner.getNextToken();
|
||||
|
|
@ -3448,7 +3449,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
|
|||
if (commentStartsBlock(blockStartPosition, blockLength)) return false;
|
||||
final int statementsLength = statements.size();
|
||||
if (statementsLength != 1) return false;
|
||||
if(statements.get(0) instanceof IASTReturnStatement) {
|
||||
if (statements.get(0) instanceof IASTReturnStatement) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue