From bc8b98729f95447f30c6d79b061da0f21bfce39d Mon Sep 17 00:00:00 2001
From: Sergey Prigogin
Date: Mon, 31 Jan 2011 18:51:49 +0000
Subject: Code streamlining.

---
 .../internal/formatter/CodeFormatterVisitor.java   | 33 +++++++++++-----------
 1 file changed, 17 insertions(+), 16 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 58e3cd4e530..1ddfb8b1005 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
@@ -3441,17 +3441,18 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
 				try {
 					statement.accept(this);
 				} catch (RuntimeException e) {
-					if (i < statementsLength - 1) {
-						reportFormattingProblem(e);
-						exitAlignments();
-						skipToNode(statements.get(i + 1));
-						while (scribe.indentationLevel < indentLevel) {
-							scribe.indent();
-						}
-						while (scribe.indentationLevel > indentLevel) {
-							scribe.unIndent();
-						}
-					} else throw e;
+					if (i >= statementsLength - 1) {
+						throw e;
+					}
+					reportFormattingProblem(e);
+					exitAlignments();
+					skipToNode(statements.get(i + 1));
+					while (scribe.indentationLevel < indentLevel) {
+						scribe.indent();
+					}
+					while (scribe.indentationLevel > indentLevel) {
+						scribe.unIndent();
+					}
 				}
 				previousStatement= statement;
 			}
@@ -3474,9 +3475,9 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
 		localScanner.resetTo(start, end);
 		if (localScanner.getNextToken() ==  Token.tLBRACE) {
 			switch (localScanner.getNextToken()) {
-				case Token.tBLOCKCOMMENT :
-				case Token.tLINECOMMENT :
-					return true;
+			case Token.tBLOCKCOMMENT:
+			case Token.tLINECOMMENT:
+				return true;
 			}
 		}
 		return false;
@@ -3504,8 +3505,8 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
 		int token = localScanner.getNextToken();
 		loop: while (true) {
 			switch (token) {
-			case Token.tBLOCKCOMMENT :
-			case Token.tLINECOMMENT :
+			case Token.tBLOCKCOMMENT:
+			case Token.tLINECOMMENT:
 				token = localScanner.getNextToken();
 				continue loop;
 			default:
-- 
cgit v1.2.3