From 253c5f1f0379f71105ec11afe8ed8fd81dad925f Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 31 Jan 2011 18:12:38 +0000 Subject: [PATCH] Code streamlining. --- .../cdt/internal/formatter/CodeFormatterVisitor.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java index e2391874d5b..58e3cd4e530 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java @@ -3428,7 +3428,6 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor, } catch (ASTProblemException e) { skipToNode(statements.get(1)); } - final boolean previousStatementIsNullStmt= previousStatement instanceof IASTNullStatement; final int indentLevel= scribe.indentationLevel; for (int i = 1; i < statementsLength - 1; i++) { final IASTStatement statement= statements.get(i); @@ -3436,8 +3435,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor, continue; } final boolean statementIsNullStmt= statement instanceof IASTNullStatement; - if ((previousStatementIsNullStmt && !statementIsNullStmt) - || (!previousStatementIsNullStmt && !statementIsNullStmt)) { + if (!statementIsNullStmt) { scribe.startNewLine(); } try { @@ -3459,8 +3457,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor, } final IASTStatement statement= statements.get(statementsLength - 1); final boolean statementIsNullStmt= statement instanceof IASTNullStatement; - if ((previousStatementIsNullStmt && !statementIsNullStmt) - || (!previousStatementIsNullStmt && !statementIsNullStmt)) { + if (!statementIsNullStmt) { scribe.startNewLine(); } statement.accept(this);