X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java index e4ec3cf..7caa523 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java @@ -9,6 +9,7 @@ * IBM Corporation - initial API and implementation ******************************************************************************/ package net.sourceforge.phpdt.internal.formatter; + import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; @@ -31,85 +32,107 @@ import net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.formatter.IContentFormatterExtension; import org.eclipse.jface.text.formatter.IFormattingContext; + /** *
CodeFormatter
- * void format(aString)
on this instance to
- * format aString
. It will return the formatted string.
+ * void format(aString)
on this instance to format aString
. It will return the
+ * formatted string.
* constructions
stack.
*/
public static final int BLOCK = ITerminalSymbols.TokenNameLBRACE;
+
/**
- * Represents a block following a control statement in the constructions
- * stack.
+ * Represents a block following a control statement in the constructions
stack.
*/
public static final int NONINDENT_BLOCK = -100;
+
/**
* Contains the formatted output.
*/
StringBuffer formattedSource;
+
/**
* Contains the current line. constructions
array.
*/
private int constructionsCount;
+
/**
- * Level of indentation of the current token (number of tab char put in front
- * of it).
+ * Level of indentation of the current token (number of tab char put in front of it).
*/
private int indentationLevel;
+
/**
* Regular level of indentation of all the lines
*/
private int initialIndentationLevel;
+
/**
* Used to split a line.
*/
Scanner splitScanner;
+
/**
- * To remember the offset between the beginning of the line and the beginning
- * of the comment.
+ * To remember the offset between the beginning of the line and the beginning of the comment.
*/
int currentCommentOffset;
+
int currentLineIndentationLevel;
+
int maxLineSize = 30;
+
private boolean containsOpenCloseBraces;
+
private int indentationLevelForOpenCloseBraces;
+
/**
* Collections of positions to map
*/
private int[] positionsToMap;
+
/**
* Collections of mapped positions
*/
private int[] mappedPositions;
+
private int indexToMap;
+
private int indexInMap;
+
private int globalDelta;
+
private int lineDelta;
+
private int splitDelta;
+
private int beginningOfLineIndex;
+
private int multipleLineCommentCounter;
+
/**
* Creates a new instance of Code Formatter using the given settings.
*
@@ -118,15 +141,16 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
public CodeFormatter(ConfigurableOption[] settings) {
this(convertConfigurableOptions(settings));
}
+
/**
- * Creates a new instance of Code Formatter using the FormattingOptions
- * object given as argument
+ * Creates a new instance of Code Formatter using the FormattingOptions object given as argument
*
* @deprecated Use CodeFormatter(ConfigurableOption[]) instead
*/
public CodeFormatter() {
this((Map) null);
}
+
/**
* Creates a new instance of Code Formatter using the given settings.
*/
@@ -144,6 +168,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
, true, /* tokenizeStrings */
null, null); // regular scanner for forming lines
scanner.recordLineSeparator = true;
+ scanner.ignorePHPOneLiner = true;
// to remind of the position of the beginning of the line.
splitScanner = new Scanner(true /* comment */
, true /* whitespace */
@@ -151,25 +176,27 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
, false /* assert */
, true, /* tokenizeStrings */
null, null);
+ splitScanner.ignorePHPOneLiner = true;
// secondary scanner to split long lines formed by primary scanning
// initialize current line buffer
currentLineBuffer = new StringBuffer();
this.options = new FormatterOptions(settings);
}
+
/**
- * Returns true if a lineSeparator has to be inserted before operator
- * false otherwise.
+ * Returns true if a lineSeparator has to be inserted before operator
false otherwise.
*/
private static boolean breakLineBeforeOperator(int operator) {
switch (operator) {
- case TokenNameCOMMA :
- case TokenNameSEMICOLON :
- case TokenNameEQUAL :
- return false;
- default :
- return true;
+ case TokenNameCOMMA:
+ case TokenNameSEMICOLON:
+ case TokenNameEQUAL:
+ return false;
+ default:
+ return true;
}
}
+
/**
* @deprecated backport 1.0 internal functionality
*/
@@ -180,40 +207,30 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
String optionName = settings[i].getOptionName();
int valueIndex = settings[i].getCurrentValueIndex();
if (optionName.equals("newline.openingBrace")) { //$NON-NLS-1$
- options.put(
- "net.sourceforge.phpdt.core.formatter.newline.openingBrace",
- valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ options.put("net.sourceforge.phpdt.core.formatter.newline.openingBrace", valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else if (optionName.equals("newline.controlStatement")) { //$NON-NLS-1$
- options.put(
- "net.sourceforge.phpdt.core.formatter.newline.controlStatement",
- valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ options
+ .put("net.sourceforge.phpdt.core.formatter.newline.controlStatement", valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else if (optionName.equals("newline.clearAll")) { //$NON-NLS-1$
- options.put("net.sourceforge.phpdt.core.formatter.newline.clearAll",
- valueIndex == 0 ? "clear all" : "preserve one"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ options.put("net.sourceforge.phpdt.core.formatter.newline.clearAll", valueIndex == 0 ? "clear all" : "preserve one"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else if (optionName.equals("newline.elseIf")) { //$NON-NLS-1$
- options.put("net.sourceforge.phpdt.core.formatter.newline.elseIf",
- valueIndex == 0 ? "do not insert" : "insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ options.put("net.sourceforge.phpdt.core.formatter.newline.elseIf", valueIndex == 0 ? "do not insert" : "insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else if (optionName.equals("newline.emptyBlock")) { //$NON-NLS-1$
- options.put(
- "net.sourceforge.phpdt.core.formatter.newline.emptyBlock",
- valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ options.put("net.sourceforge.phpdt.core.formatter.newline.emptyBlock", valueIndex == 0 ? "insert" : "do not insert"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else if (optionName.equals("lineSplit")) { //$NON-NLS-1$
- options.put("net.sourceforge.phpdt.core.formatter.lineSplit", String
- .valueOf(valueIndex)); //$NON-NLS-1$ //$NON-NLS-2$
+ options.put("net.sourceforge.phpdt.core.formatter.lineSplit", String.valueOf(valueIndex)); //$NON-NLS-1$ //$NON-NLS-2$
} else if (optionName.equals("style.assignment")) { //$NON-NLS-1$
- options.put("net.sourceforge.phpdt.core.formatter.style.assignment",
- valueIndex == 0 ? "compact" : "normal"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ options.put("net.sourceforge.phpdt.core.formatter.style.assignment", valueIndex == 0 ? "compact" : "normal"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else if (optionName.equals("tabulation.char")) { //$NON-NLS-1$
- options.put("net.sourceforge.phpdt.core.formatter.tabulation.char",
- valueIndex == 0 ? "tab" : "space"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ options.put("net.sourceforge.phpdt.core.formatter.tabulation.char", valueIndex == 0 ? "tab" : "space"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else if (optionName.equals("tabulation.size")) { //$NON-NLS-1$
- options.put("net.sourceforge.phpdt.core.formatter.tabulation.size",
- String.valueOf(valueIndex)); //$NON-NLS-1$ //$NON-NLS-2$
+ options.put("net.sourceforge.phpdt.core.formatter.tabulation.size", String.valueOf(valueIndex)); //$NON-NLS-1$ //$NON-NLS-2$
}
}
}
return options;
}
+
/**
* Returns the end of the source code.
*/
@@ -227,9 +244,9 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
return (bufr.toString());
}
+
/**
- * Inserts tabCount
tab character or their equivalent number
- * of spaces.
+ * Inserts tabCount
tab character or their equivalent number of spaces.
*/
private void dumpTab(int tabCount) {
if (options.indentWithTab) {
@@ -244,6 +261,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
}
}
+
/**
* Dumps currentLineBuffer
into the formatted string.
*/
@@ -253,17 +271,14 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
beginningOfLineIndex = formattedSource.length();
if (containsOpenCloseBraces) {
containsOpenCloseBraces = false;
- outputLine(currentString, false, indentationLevelForOpenCloseBraces, 0,
- -1, null, 0);
+ outputLine(currentString, false, indentationLevelForOpenCloseBraces, 0, -1, null, 0);
indentationLevelForOpenCloseBraces = currentLineIndentationLevel;
} else {
- outputLine(currentString, false, currentLineIndentationLevel, 0, -1,
- null, 0);
+ outputLine(currentString, false, currentLineIndentationLevel, 0, -1, null, 0);
}
int scannerSourceLength = scanner.source.length;
if (scannerSourceLength > 2) {
- if (scanner.source[scannerSourceLength - 1] == '\n'
- && scanner.source[scannerSourceLength - 2] == '\r') {
+ if (scanner.source[scannerSourceLength - 1] == '\n' && scanner.source[scannerSourceLength - 2] == '\r') {
formattedSource.append(options.lineSeparatorSequence);
increaseGlobalDelta(options.lineSeparatorSequence.length - 2);
} else if (scanner.source[scannerSourceLength - 1] == '\n') {
@@ -276,6 +291,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
updateMappedPositions(scanner.startPosition);
}
+
/**
* Formats the input string.
*/
@@ -332,22 +348,21 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
if (Scanner.DEBUG) {
int currentEndPosition = scanner.getCurrentTokenEndPosition();
int currentStartPosition = scanner.getCurrentTokenStartPosition();
- System.out.print(currentStartPosition + "," + currentEndPosition
- + ": ");
+ System.out.print(currentStartPosition + "," + currentEndPosition + ": ");
System.out.println(scanner.toStringAction(token));
}
// Patch for line comment
// See PR http://dev.eclipse.org/bugs/show_bug.cgi?id=23096
if (token == ITerminalSymbols.TokenNameCOMMENT_LINE) {
int length = scanner.currentPosition;
- loop : for (int index = length - 1; index >= 0; index--) {
+ loop: for (int index = length - 1; index >= 0; index--) {
switch (scanner.source[index]) {
- case '\r' :
- case '\n' :
- scanner.currentPosition--;
- break;
- default :
- break loop;
+ case '\r':
+ case '\n':
+ scanner.currentPosition--;
+ break;
+ default:
+ break loop;
}
}
}
@@ -357,11 +372,27 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
token = 0;
}
- if (token == Scanner.TokenNameEOF)
+ if (token == Scanner.TokenNameEOF) {
break;
+ } else if (token == Scanner.TokenNameHEREDOC) {
+ // no indentation for heredocs and HTML !
+ outputCurrentTokenWithoutIndent(Scanner.TokenNameHEREDOC, 0);
+ continue;
+ } else if (token == Scanner.TokenNameINLINE_HTML) {
+ // no indentation for heredocs and HTML !
+ int newLineCount = 1;
+ if (scanner.startPosition==0) {
+ newLineCount = 0;
+ }
+ outputCurrentTokenWithoutIndent(Scanner.TokenNameINLINE_HTML, newLineCount);
+ int srcLen = scanner.source.length;
+ if (scanner.currentPosition < srcLen-1) {
+ newLine(1);
+ }
+ continue;
+ }
/*
- * ## MODIFYING the indentation level before generating new lines and
- * indentation in the output string
+ * ## MODIFYING the indentation level before generating new lines and indentation in the output string
*/
// Removes all the indentations made by statements not followed by a
// block
@@ -369,27 +400,26 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
// switch/case
if (clearNonBlockIndents && (token != Scanner.TokenNameWHITESPACE)) {
switch (token) {
- case TokenNameelse :
- if (constructionsCount > 0
- && constructions[constructionsCount - 1] == TokenNameelse) {
- pendingNewLines = 1;
- specialElse = true;
- }
- indentationLevel += popInclusiveUntil(TokenNameif);
+ case TokenNameelse:
+ if (constructionsCount > 0 && constructions[constructionsCount - 1] == TokenNameelse) {
+ pendingNewLines = 1;
+ specialElse = true;
+ }
+ indentationLevel += popInclusiveUntil(TokenNameif);
+ break;
+ // case TokenNamecatch :
+ // indentationLevel += popInclusiveUntil(TokenNamecatch);
+ // break;
+ // case TokenNamefinally :
+ // indentationLevel += popInclusiveUntil(TokenNamecatch);
+ // break;
+ case TokenNamewhile:
+ if (nlicsToken == TokenNamedo) {
+ indentationLevel += pop(TokenNamedo);
break;
- // case TokenNamecatch :
- // indentationLevel += popInclusiveUntil(TokenNamecatch);
- // break;
- // case TokenNamefinally :
- // indentationLevel += popInclusiveUntil(TokenNamecatch);
- // break;
- case TokenNamewhile :
- if (nlicsToken == TokenNamedo) {
- indentationLevel += pop(TokenNamedo);
- break;
- }
- default :
- indentationLevel += popExclusiveUntilBlockOrCase();
+ }
+ default:
+ indentationLevel += popExclusiveUntilBlockOrCase();
// clear until a CASE, DEFAULT or BLOCK is encountered.
// Thus, the indentationLevel is correctly cleared either
// in a switch/case statement or in any other situation.
@@ -404,8 +434,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
// if (token == Scanner.TokenNamethrows) {
// inThrowsClause = true;
// }
- if ((token == Scanner.TokenNameclass || token == Scanner.TokenNameinterface)
- && previousToken != Scanner.TokenNameDOT) {
+ if ((token == Scanner.TokenNameclass || token == Scanner.TokenNameinterface) && previousToken != Scanner.TokenNameDOT) {
inClassOrInterfaceHeader = true;
}
/*
@@ -438,21 +467,17 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
// previous token is a close paren.
// add a new line if a parenthesis belonging to a for() statement
// has been closed and the current token is not an opening brace
- if (token != TokenNameLBRACE
- && !isComment(token)
- // to avoid adding new line between else and a comment
- && token != TokenNameDOT
- && !(previousCompilableToken == TokenNameRPAREN && token == TokenNameSEMICOLON)) {
+ if (token != TokenNameLBRACE && !isComment(token)
+ // to avoid adding new line between else and a comment
+ && token != TokenNameDOT && !(previousCompilableToken == TokenNameRPAREN && token == TokenNameSEMICOLON)) {
newLine(1);
currentLineIndentationLevel = indentationLevel;
pendingNewLines = 0;
pendingSpace = false;
} else {
- if (token == TokenNameLBRACE
- && options.newLineBeforeOpeningBraceMode) {
+ if (token == TokenNameLBRACE && options.newLineBeforeOpeningBraceMode) {
newLine(1);
- if (constructionsCount > 0
- && constructions[constructionsCount - 1] != BLOCK
+ if (constructionsCount > 0 && constructions[constructionsCount - 1] != BLOCK
&& constructions[constructionsCount - 1] != NONINDENT_BLOCK) {
currentLineIndentationLevel = indentationLevel - 1;
} else {
@@ -463,8 +488,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
}
}
- if (token == TokenNameLBRACE && options.newLineBeforeOpeningBraceMode
- && constructionsCount > 0
+ if (token == TokenNameLBRACE && options.newLineBeforeOpeningBraceMode && constructionsCount > 0
&& constructions[constructionsCount - 1] == TokenNamedo) {
newLine(1);
currentLineIndentationLevel = indentationLevel - 1;
@@ -502,53 +526,42 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
&& token != Scanner.TokenNameWHITESPACE) {
// Do not add newline & indent between an adjoining close brace and
// close paren. Anonymous inner classes may use this form.
- boolean closeBraceAndCloseParen = previousToken == TokenNameRBRACE
- && token == TokenNameRPAREN;
+ boolean closeBraceAndCloseParen = previousToken == TokenNameRBRACE && token == TokenNameRPAREN;
// OPTION (NewLineInCompoundStatement): do not add newline & indent
// between close brace and else, (do) while, catch, and finally if
// newlineInCompoundStatement is true.
boolean nlicsOption = previousToken == TokenNameRBRACE
&& !options.newlineInControlStatementMode
- && (token == TokenNameelse
- || (token == TokenNamewhile && nlicsToken == TokenNamedo)
- || token == TokenNamecatch || token == TokenNamefinally);
+ && (token == TokenNameelse || (token == TokenNamewhile && nlicsToken == TokenNamedo) || token == TokenNamecatch || token == TokenNamefinally);
// Do not add a newline & indent between a close brace and
// semi-colon.
- boolean semiColonAndCloseBrace = previousToken == TokenNameRBRACE
- && token == TokenNameSEMICOLON;
+ boolean semiColonAndCloseBrace = previousToken == TokenNameRBRACE && token == TokenNameSEMICOLON;
// Do not add a new line & indent between a multiline comment and a
// opening brace
- boolean commentAndOpenBrace = previousToken == Scanner.TokenNameCOMMENT_BLOCK
- && token == TokenNameLBRACE;
+ boolean commentAndOpenBrace = previousToken == Scanner.TokenNameCOMMENT_BLOCK && token == TokenNameLBRACE;
// Do not add a newline & indent between a close brace and a colon
// (in array assignments, for example).
- boolean commaAndCloseBrace = previousToken == TokenNameRBRACE
- && token == TokenNameCOMMA;
+ boolean commaAndCloseBrace = previousToken == TokenNameRBRACE && token == TokenNameCOMMA;
// Add a newline and indent, if appropriate.
if (specialElse
- || (!commentAndOpenBrace && !closeBraceAndCloseParen
- && !nlicsOption && !semiColonAndCloseBrace && !commaAndCloseBrace)) {
+ || (!commentAndOpenBrace && !closeBraceAndCloseParen && !nlicsOption && !semiColonAndCloseBrace && !commaAndCloseBrace)) {
// if clearAllBlankLinesMode=false, leaves the blank lines
// inserted by the user
// if clearAllBlankLinesMode=true, removes all of then
// and insert only blank lines required by the formatting.
if (!options.clearAllBlankLinesMode) {
// (isComment(token))
- pendingNewLines = (pendingNewLines < newLinesInWhitespace)
- ? newLinesInWhitespace
- : pendingNewLines;
+ pendingNewLines = (pendingNewLines < newLinesInWhitespace) ? newLinesInWhitespace : pendingNewLines;
pendingNewLines = (pendingNewLines > 2) ? 2 : pendingNewLines;
}
- if (previousCompilableToken == TokenNameLBRACE
- && token == TokenNameRBRACE) {
+ if (previousCompilableToken == TokenNameLBRACE && token == TokenNameRBRACE) {
containsOpenCloseBraces = true;
indentationLevelForOpenCloseBraces = currentLineIndentationLevel;
if (isComment(previousToken)) {
newLine(pendingNewLines);
} else {
/*
- * if (!(constructionsCount > 1 &&
- * constructions[constructionsCount-1] == NONINDENT_BLOCK &&
+ * if (!(constructionsCount > 1 && constructions[constructionsCount-1] == NONINDENT_BLOCK &&
* (constructions[constructionsCount-2] == TokenNamefor
*/
if (options.newLineInEmptyBlockMode) {
@@ -567,8 +580,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
newLine(pendingNewLines);
}
}
- if (((previousCompilableToken == TokenNameSEMICOLON)
- || (previousCompilableToken == TokenNameLBRACE)
+ if (((previousCompilableToken == TokenNameSEMICOLON) || (previousCompilableToken == TokenNameLBRACE)
|| (previousCompilableToken == TokenNameRBRACE) || (isComment(previousToken)))
&& (token == TokenNameRBRACE)) {
indentationOffset = -1;
@@ -578,8 +590,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
// PR 1FI5IPO
currentLineIndentationLevel++;
} else {
- currentLineIndentationLevel = indentationLevel
- + indentationOffset;
+ currentLineIndentationLevel = indentationLevel + indentationOffset;
}
pendingSpace = false;
indentationOffset = 0;
@@ -591,120 +602,109 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
nlicsToken = 0;
}
}
- boolean phpTagAndWhitespace =
- previousToken == TokenNameINLINE_HTML && token == TokenNameWHITESPACE;
+ boolean phpTagAndWhitespace = previousToken == TokenNameINLINE_HTML && token == TokenNameWHITESPACE;
switch (token) {
- // case TokenNameDOLLAR :
- // dollarBraceCount++;
- // break;
- case TokenNameelse :
- // case TokenNamefinally :
- expectingOpenBrace = true;
- pendingNewlineAfterParen = true;
- indentationLevel += pushControlStatement(token);
- break;
- case TokenNamecase :
- case TokenNamedefault :
- if (tokenBeforeColonCount == tokenBeforeColon.length) {
- System.arraycopy(tokenBeforeColon, 0,
- (tokenBeforeColon = new int[tokenBeforeColonCount * 2]), 0,
- tokenBeforeColonCount);
- }
- tokenBeforeColon[tokenBeforeColonCount++] = TokenNamecase;
- indentationLevel += pushControlStatement(TokenNamecase);
- break;
- case TokenNameQUESTION :
- if (tokenBeforeColonCount == tokenBeforeColon.length) {
- System.arraycopy(tokenBeforeColon, 0,
- (tokenBeforeColon = new int[tokenBeforeColonCount * 2]), 0,
- tokenBeforeColonCount);
- }
- tokenBeforeColon[tokenBeforeColonCount++] = token;
- break;
- case TokenNameswitch :
- case TokenNamefor :
- case TokenNameif :
- case TokenNamewhile :
- if (openParenthesisCount == openParenthesis.length) {
- System.arraycopy(openParenthesis, 0,
- (openParenthesis = new int[openParenthesisCount * 2]), 0,
- openParenthesisCount);
- }
- openParenthesis[openParenthesisCount++] = 0;
- expectingOpenBrace = true;
- indentationLevel += pushControlStatement(token);
- break;
- case TokenNametry :
- pendingNewlineAfterParen = true;
- case TokenNamecatch :
- // several CATCH statements can be contiguous.
- // a CATCH is encountered pop until first CATCH (if a CATCH
- // follows a TRY it works the same way,
- // as CATCH and TRY are the same token in the stack).
- expectingOpenBrace = true;
- indentationLevel += pushControlStatement(TokenNamecatch);
- break;
- case TokenNamedo :
- expectingOpenBrace = true;
- indentationLevel += pushControlStatement(token);
- nlicsToken = token;
- break;
- case TokenNamenew :
- break;
- case TokenNameLPAREN :
- // if (previousToken == TokenNamesynchronized) {
- // indentationLevel += pushControlStatement(previousToken);
- // } else {
- // Put a space between the previous and current token if the
- // previous token was not a keyword, open paren, logical
- // compliment (eg: !), semi-colon, open brace, close brace,
- // super, or this.
- if (previousCompilableToken != TokenNameLBRACKET
- && previousToken != TokenNameIdentifier && previousToken != 0
- && previousToken != TokenNameNOT
- && previousToken != TokenNameLPAREN
- && previousToken != TokenNameTWIDDLE
- && previousToken != TokenNameSEMICOLON
- && previousToken != TokenNameLBRACE
- && previousToken != TokenNameRBRACE
- && previousToken != TokenNamesuper) {
- // && previousToken != TokenNamethis) {
- space();
- }
- // If in a for/if/while statement, increase the parenthesis count
- // for the current openParenthesisCount
- // else increase the count for stand alone parenthesis.
- if (openParenthesisCount > 0)
- openParenthesis[openParenthesisCount - 1]++;
- else
- openParenthesis[0]++;
- pendingSpace = false;
- //S }
- break;
- case TokenNameRPAREN :
- // Decrease the parenthesis count
- // if there is no more unclosed parenthesis,
- // a new line and indent may be append (depending on the next
- // token).
- if ((openParenthesisCount > 1)
- && (openParenthesis[openParenthesisCount - 1] > 0)) {
- openParenthesis[openParenthesisCount - 1]--;
- if (openParenthesis[openParenthesisCount - 1] <= 0) {
- pendingNewlineAfterParen = true;
- inAssignment = false;
- openParenthesisCount--;
- }
- } else {
- openParenthesis[0]--;
+ // case TokenNameDOLLAR :
+ // dollarBraceCount++;
+ // break;
+ case TokenNameelse:
+ // case TokenNamefinally :
+ expectingOpenBrace = true;
+ pendingNewlineAfterParen = true;
+ indentationLevel += pushControlStatement(token);
+ break;
+ case TokenNamecase:
+ case TokenNamedefault:
+ if (tokenBeforeColonCount == tokenBeforeColon.length) {
+ System
+ .arraycopy(tokenBeforeColon, 0, (tokenBeforeColon = new int[tokenBeforeColonCount * 2]), 0, tokenBeforeColonCount);
+ }
+ tokenBeforeColon[tokenBeforeColonCount++] = TokenNamecase;
+ indentationLevel += pushControlStatement(TokenNamecase);
+ break;
+ case TokenNameQUESTION:
+ if (tokenBeforeColonCount == tokenBeforeColon.length) {
+ System
+ .arraycopy(tokenBeforeColon, 0, (tokenBeforeColon = new int[tokenBeforeColonCount * 2]), 0, tokenBeforeColonCount);
+ }
+ tokenBeforeColon[tokenBeforeColonCount++] = token;
+ break;
+ case TokenNameswitch:
+ case TokenNamefor:
+ case TokenNameforeach:
+ case TokenNameif:
+ case TokenNamewhile:
+ if (openParenthesisCount == openParenthesis.length) {
+ System.arraycopy(openParenthesis, 0, (openParenthesis = new int[openParenthesisCount * 2]), 0, openParenthesisCount);
+ }
+ openParenthesis[openParenthesisCount++] = 0;
+ expectingOpenBrace = true;
+ indentationLevel += pushControlStatement(token);
+ break;
+ case TokenNametry:
+ pendingNewlineAfterParen = true;
+ case TokenNamecatch:
+ // several CATCH statements can be contiguous.
+ // a CATCH is encountered pop until first CATCH (if a CATCH
+ // follows a TRY it works the same way,
+ // as CATCH and TRY are the same token in the stack).
+ expectingOpenBrace = true;
+ indentationLevel += pushControlStatement(TokenNamecatch);
+ break;
+ case TokenNamedo:
+ expectingOpenBrace = true;
+ indentationLevel += pushControlStatement(token);
+ nlicsToken = token;
+ break;
+ case TokenNamenew:
+ break;
+ case TokenNameLPAREN:
+ // if (previousToken == TokenNamesynchronized) {
+ // indentationLevel += pushControlStatement(previousToken);
+ // } else {
+ // Put a space between the previous and current token if the
+ // previous token was not a keyword, open paren, logical
+ // compliment (eg: !), semi-colon, open brace, close brace,
+ // super, or this.
+ if (previousCompilableToken != TokenNameLBRACKET && previousToken != TokenNameIdentifier && previousToken != 0
+ && previousToken != TokenNameNOT && previousToken != TokenNameLPAREN && previousToken != TokenNameTWIDDLE
+ && previousToken != TokenNameSEMICOLON && previousToken != TokenNameLBRACE && previousToken != TokenNameRBRACE
+ && previousToken != TokenNamesuper) {
+ // && previousToken != TokenNamethis) {
+ space();
+ }
+ // If in a for/if/while statement, increase the parenthesis count
+ // for the current openParenthesisCount
+ // else increase the count for stand alone parenthesis.
+ if (openParenthesisCount > 0)
+ openParenthesis[openParenthesisCount - 1]++;
+ else
+ openParenthesis[0]++;
+ pendingSpace = false;
+ //S }
+ break;
+ case TokenNameRPAREN:
+ // Decrease the parenthesis count
+ // if there is no more unclosed parenthesis,
+ // a new line and indent may be append (depending on the next
+ // token).
+ if ((openParenthesisCount > 1) && (openParenthesis[openParenthesisCount - 1] > 0)) {
+ openParenthesis[openParenthesisCount - 1]--;
+ if (openParenthesis[openParenthesisCount - 1] <= 0) {
+ pendingNewlineAfterParen = true;
+ inAssignment = false;
+ openParenthesisCount--;
}
- pendingSpace = false;
- break;
- case TokenNameLBRACE :
- if (previousCompilableToken == TokenNameDOLLAR) {
- dollarBraceCount++;
- } else {
- if ((previousCompilableToken == TokenNameRBRACKET)
- || (previousCompilableToken == TokenNameEQUAL)) {
+ } else {
+ openParenthesis[0]--;
+ }
+ pendingSpace = false;
+ break;
+ case TokenNameLBRACE:
+ if (previousCompilableToken == TokenNameDOLLAR) {
+ dollarBraceCount++;
+ } else {
+ if ((previousCompilableToken == TokenNameRBRACKET) || (previousCompilableToken == TokenNameEQUAL)) {
// if (previousCompilableToken == TokenNameRBRACKET) {
inArrayAssignment = true;
inAssignment = false;
@@ -713,211 +713,199 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
indentationLevel += pushBlock();
} else {
// Add new line and increase indentation level after open brace.
- pendingNewLines = 1;
- indentationLevel += pushBlock();
- }
- }
- break;
- case TokenNameRBRACE :
- if (dollarBraceCount > 0) {
- dollarBraceCount--;
- break;
- }
- if (previousCompilableToken == TokenNameRPAREN) {
- pendingSpace = false;
- }
- if (inArrayAssignment) {
- inArrayAssignment = false;
- pendingNewLines = 1;
- indentationLevel += popInclusiveUntilBlock();
- } else {
pendingNewLines = 1;
- indentationLevel += popInclusiveUntilBlock();
- if (previousCompilableToken == TokenNameRPAREN) {
- // fix for 1FGDDV6: LFCOM:WIN98 - Weird splitting on message
- // expression
- currentLineBuffer.append(options.lineSeparatorSequence);
- increaseLineDelta(options.lineSeparatorSequence.length);
- }
- if (constructionsCount > 0) {
- switch (constructions[constructionsCount - 1]) {
- case TokenNamefor :
- //indentationLevel += popExclusiveUntilBlock();
- //break;
- case TokenNameswitch :
- case TokenNameif :
- case TokenNameelse :
- case TokenNametry :
- case TokenNamecatch :
- case TokenNamefinally :
- case TokenNamewhile :
- case TokenNamedo :
- // case TokenNamesynchronized :
- clearNonBlockIndents = true;
- default :
- break;
- }
- }
+ indentationLevel += pushBlock();
}
+ }
+ break;
+ case TokenNameRBRACE:
+ if (dollarBraceCount > 0) {
+ dollarBraceCount--;
break;
- case TokenNameLBRACKET :
- openBracketCount++;
- pendingSpace = false;
- break;
- case TokenNameRBRACKET :
- openBracketCount -= (openBracketCount > 0) ? 1 : 0;
- // if there is no left bracket to close, the right bracket is
- // ignored.
- pendingSpace = false;
- break;
- case TokenNameCOMMA :
- case TokenNameDOT :
- pendingSpace = false;
- break;
- case TokenNameSEMICOLON :
- // Do not generate line terminators in the definition of
- // the for statement.
- // if not in this case, jump a line and reduce indentation after
- // the brace
- // if the block it closes belongs to a conditional statement (if,
- // while, do...).
- if (openParenthesisCount <= 1) {
- pendingNewLines = 1;
- if (expectingOpenBrace) {
- clearNonBlockIndents = true;
- expectingOpenBrace = false;
- }
- }
- inAssignment = false;
+ }
+ if (previousCompilableToken == TokenNameRPAREN) {
pendingSpace = false;
- break;
- case TokenNamePLUS_PLUS :
- case TokenNameMINUS_MINUS :
- // Do not put a space between a post-increment/decrement
- // and the identifier being modified.
- if (previousToken == TokenNameIdentifier
- || previousToken == TokenNameRBRACKET) {
- pendingSpace = false;
- }
- break;
- case TokenNamePLUS :
- // previously ADDITION
- case TokenNameMINUS :
- // Handle the unary operators plus and minus via a flag
- if (!isLiteralToken(previousToken)
- && previousToken != TokenNameIdentifier
- && previousToken != TokenNameRPAREN
- && previousToken != TokenNameRBRACKET) {
- unarySignModifier = 1;
+ }
+ if (inArrayAssignment) {
+ inArrayAssignment = false;
+ pendingNewLines = 1;
+ indentationLevel += popInclusiveUntilBlock();
+ } else {
+ pendingNewLines = 1;
+ indentationLevel += popInclusiveUntilBlock();
+ if (previousCompilableToken == TokenNameRPAREN) {
+ // fix for 1FGDDV6: LFCOM:WIN98 - Weird splitting on message
+ // expression
+ currentLineBuffer.append(options.lineSeparatorSequence);
+ increaseLineDelta(options.lineSeparatorSequence.length);
}
- break;
- case TokenNameCOLON :
- // In a switch/case statement, add a newline & indent
- // when a colon is encountered.
- if (tokenBeforeColonCount > 0) {
- if (tokenBeforeColon[tokenBeforeColonCount - 1] == TokenNamecase) {
- pendingNewLines = 1;
+ if (constructionsCount > 0) {
+ switch (constructions[constructionsCount - 1]) {
+ case TokenNamefor:
+ case TokenNameforeach:
+ //indentationLevel += popExclusiveUntilBlock();
+ //break;
+ case TokenNameswitch:
+ case TokenNameif:
+ case TokenNameelse:
+ case TokenNametry:
+ case TokenNamecatch:
+ case TokenNamefinally:
+ case TokenNamewhile:
+ case TokenNamedo:
+ // case TokenNamesynchronized :
+ clearNonBlockIndents = true;
+ default:
+ break;
}
- tokenBeforeColonCount--;
}
- break;
- case TokenNameEQUAL :
- inAssignment = true;
- break;
- case Scanner.TokenNameCOMMENT_LINE :
+ }
+ break;
+ case TokenNameLBRACKET:
+ openBracketCount++;
+ pendingSpace = false;
+ break;
+ case TokenNameRBRACKET:
+ openBracketCount -= (openBracketCount > 0) ? 1 : 0;
+ // if there is no left bracket to close, the right bracket is
+ // ignored.
+ pendingSpace = false;
+ break;
+ case TokenNameCOMMA:
+ case TokenNameDOT:
+ pendingSpace = false;
+ break;
+ case TokenNameSEMICOLON:
+ // Do not generate line terminators in the definition of
+ // the for statement.
+ // if not in this case, jump a line and reduce indentation after
+ // the brace
+ // if the block it closes belongs to a conditional statement (if,
+ // while, do...).
+ if (openParenthesisCount <= 1) {
pendingNewLines = 1;
- if (inAssignment) {
- currentLineIndentationLevel++;
+ if (expectingOpenBrace) {
+ clearNonBlockIndents = true;
+ expectingOpenBrace = false;
}
- break; // a line is always inserted after a one-line comment
- case Scanner.TokenNameCOMMENT_PHPDOC :
- case Scanner.TokenNameCOMMENT_BLOCK :
- currentCommentOffset = getCurrentCommentOffset();
- pendingNewLines = 1;
- break;
- case Scanner.TokenNameWHITESPACE :
- if (!phpTagAndWhitespace) {
- // Count the number of line terminators in the whitespace so
- // line spacing can be preserved near comments.
- char[] source = scanner.source;
- newLinesInWhitespace = 0;
- for (int i = scanner.startPosition, max = scanner.currentPosition; i < max; i++) {
- if (source[i] == '\r') {
- if (i < max - 1) {
- if (source[++i] == '\n') {
- newLinesInWhitespace++;
- } else {
- newLinesInWhitespace++;
- }
+ }
+ inAssignment = false;
+ pendingSpace = false;
+ break;
+ case TokenNamePLUS_PLUS:
+ case TokenNameMINUS_MINUS:
+ // Do not put a space between a post-increment/decrement
+ // and the identifier being modified.
+ if (previousToken == TokenNameIdentifier || previousToken == TokenNameRBRACKET) {
+ pendingSpace = false;
+ }
+ break;
+ case TokenNamePLUS:
+ // previously ADDITION
+ case TokenNameMINUS:
+ // Handle the unary operators plus and minus via a flag
+ if (!isLiteralToken(previousToken) && previousToken != TokenNameIdentifier && previousToken != TokenNameRPAREN
+ && previousToken != TokenNameRBRACKET) {
+ unarySignModifier = 1;
+ }
+ break;
+ case TokenNameCOLON:
+ // In a switch/case statement, add a newline & indent
+ // when a colon is encountered.
+ if (tokenBeforeColonCount > 0) {
+ if (tokenBeforeColon[tokenBeforeColonCount - 1] == TokenNamecase) {
+ pendingNewLines = 1;
+ }
+ tokenBeforeColonCount--;
+ }
+ break;
+ case TokenNameEQUAL:
+ inAssignment = true;
+ break;
+ case Scanner.TokenNameCOMMENT_LINE:
+ pendingNewLines = 1;
+ if (inAssignment) {
+ currentLineIndentationLevel++;
+ }
+ break; // a line is always inserted after a one-line comment
+ case Scanner.TokenNameCOMMENT_PHPDOC:
+ case Scanner.TokenNameCOMMENT_BLOCK:
+ currentCommentOffset = getCurrentCommentOffset();
+ pendingNewLines = 1;
+ break;
+ case Scanner.TokenNameWHITESPACE:
+ if (!phpTagAndWhitespace) {
+ // Count the number of line terminators in the whitespace so
+ // line spacing can be preserved near comments.
+ char[] source = scanner.source;
+ newLinesInWhitespace = 0;
+ for (int i = scanner.startPosition, max = scanner.currentPosition; i < max; i++) {
+ if (source[i] == '\r') {
+ if (i < max - 1) {
+ if (source[++i] == '\n') {
+ newLinesInWhitespace++;
} else {
newLinesInWhitespace++;
}
- } else if (source[i] == '\n') {
+ } else {
newLinesInWhitespace++;
}
+ } else if (source[i] == '\n') {
+ newLinesInWhitespace++;
}
- increaseLineDelta(scanner.startPosition - scanner.currentPosition);
- break;
- }
- // case TokenNameHTML :
- // // Add the next token to the formatted source string.
- // // outputCurrentToken(token);
- // int startPosition = scanner.startPosition;
- // flushBuffer();
- // for (int i = startPosition, max = scanner.currentPosition; i <
- // max; i++) {
- // char currentCharacter = scanner.source[i];
- // updateMappedPositions(i);
- // currentLineBuffer.append(currentCharacter);
- // }
- // break;
- default :
- if ((token == TokenNameIdentifier) || isLiteralToken(token)
- || token == TokenNamesuper) {
- // || token == TokenNamethis) {
- // Do not put a space between a unary operator
- // (eg: ++, --, +, -) and the identifier being modified.
- if (previousToken == TokenNamePLUS_PLUS
- || previousToken == TokenNameMINUS_MINUS
- || (previousToken == TokenNameMINUS_GREATER && options.compactDereferencingMode) // ->
- || (previousToken == TokenNamePLUS && unarySignModifier > 0)
- || (previousToken == TokenNameMINUS && unarySignModifier > 0)) {
- pendingSpace = false;
- }
- unarySignModifier = 0;
}
+ increaseLineDelta(scanner.startPosition - scanner.currentPosition);
break;
+ }
+ // case TokenNameHTML :
+ // // Add the next token to the formatted source string.
+ // // outputCurrentToken(token);
+ // int startPosition = scanner.startPosition;
+ // flushBuffer();
+ // for (int i = startPosition, max = scanner.currentPosition; i <
+ // max; i++) {
+ // char currentCharacter = scanner.source[i];
+ // updateMappedPositions(i);
+ // currentLineBuffer.append(currentCharacter);
+ // }
+ // break;
+ default:
+ if ((token == TokenNameIdentifier) || isLiteralToken(token) || token == TokenNamesuper) {
+ // || token == TokenNamethis) {
+ // Do not put a space between a unary operator
+ // (eg: ++, --, +, -) and the identifier being modified.
+ if (previousToken == TokenNamePLUS_PLUS || previousToken == TokenNameMINUS_MINUS
+ || (previousToken == TokenNameMINUS_GREATER && options.compactDereferencingMode) // ->
+ || (previousToken == TokenNamePLUS && unarySignModifier > 0)
+ || (previousToken == TokenNameMINUS && unarySignModifier > 0)) {
+ pendingSpace = false;
+ }
+ unarySignModifier = 0;
+ }
+ break;
}
// Do not output whitespace tokens.
if (token != Scanner.TokenNameWHITESPACE || phpTagAndWhitespace) {
/*
- * Add pending space to the formatted source string. Do not output a
- * space under the following circumstances: 1) this is the first pass 2)
- * previous token is an open paren 3) previous token is a period 4)
- * previous token is the logical compliment (eg: !) 5) previous token
- * is the bitwise compliment (eg: ~) 6) previous token is the open
- * bracket (eg: [) 7) in an assignment statement, if the previous
- * token is an open brace or the current token is a close brace 8)
- * previous token is a single line comment 9) current token is a '->'
+ * Add pending space to the formatted source string. Do not output a space under the following circumstances: 1) this is
+ * the first pass 2) previous token is an open paren 3) previous token is a period 4) previous token is the logical
+ * compliment (eg: !) 5) previous token is the bitwise compliment (eg: ~) 6) previous token is the open bracket (eg: [) 7)
+ * in an assignment statement, if the previous token is an open brace or the current token is a close brace 8) previous
+ * token is a single line comment 9) current token is a '->'
*/
- if (token == TokenNameMINUS_GREATER
- && options.compactDereferencingMode)
+ if (token == TokenNameMINUS_GREATER && options.compactDereferencingMode)
pendingSpace = false;
-
- boolean openAndCloseBrace = previousCompilableToken == TokenNameLBRACE
- && token == TokenNameRBRACE;
- if (pendingSpace
- && insertSpaceAfter(previousToken)
+
+ boolean openAndCloseBrace = previousCompilableToken == TokenNameLBRACE && token == TokenNameRBRACE;
+ if (pendingSpace && insertSpaceAfter(previousToken)
&& !(inAssignment && (previousToken == TokenNameLBRACE || token == TokenNameRBRACE))
&& previousToken != Scanner.TokenNameCOMMENT_LINE) {
- if ((!(options.compactAssignmentMode && token == TokenNameEQUAL))
- && !openAndCloseBrace)
+ if ((!(options.compactAssignmentMode && token == TokenNameEQUAL)) && !openAndCloseBrace)
space();
}
// Add the next token to the formatted source string.
outputCurrentToken(token);
- if (token == Scanner.TokenNameCOMMENT_LINE
- && openParenthesisCount > 1) {
+ if (token == Scanner.TokenNameCOMMENT_LINE && openParenthesisCount > 1) {
pendingNewLines = 0;
currentLineBuffer.append(options.lineSeparatorSequence);
increaseLineDelta(options.lineSeparatorSequence.length);
@@ -927,8 +915,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
// Whitespace tokens do not need to be remembered.
if (token != Scanner.TokenNameWHITESPACE || phpTagAndWhitespace) {
previousToken = token;
- if (token != Scanner.TokenNameCOMMENT_BLOCK
- && token != Scanner.TokenNameCOMMENT_LINE
+ if (token != Scanner.TokenNameCOMMENT_BLOCK && token != Scanner.TokenNameCOMMENT_LINE
&& token != Scanner.TokenNameCOMMENT_PHPDOC) {
previousCompilableToken = token;
}
@@ -943,9 +930,9 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
// dump the last token of the source in the formatted output.
}
}
+
/**
- * Formats the char array sourceString
, and returns a string
- * containing the formatted version.
+ * Formats the char array sourceString
, and returns a string containing the formatted version.
*
* @return the formatted ouput.
*/
@@ -956,37 +943,37 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
format();
return formattedSource.toString();
}
+
/**
- * Formats the char array sourceString
, and returns a string
- * containing the formatted version.
+ * Formats the char array sourceString
, and returns a string containing the formatted version.
*
* @param string
- * the string to format
+ * the string to format
* @param indentationLevel
- * the initial indentation level
+ * the initial indentation level
* @return the formatted ouput.
*/
public String format(String string, int indentationLevel) {
return format(string, indentationLevel, (int[]) null);
}
+
/**
- * Formats the char array sourceString
, and returns a string
- * containing the formatted version. The positions array is modified to
- * contain the mapped positions.
+ * Formats the char array sourceString
, and returns a string containing the formatted version. The positions array
+ * is modified to contain the mapped positions.
*
* @param string
- * the string to format
+ * the string to format
* @param indentationLevel
- * the initial indentation level
+ * the initial indentation level
* @param positions
- * the array of positions to map
+ * the array of positions to map
* @return the formatted ouput.
*/
public String format(String string, int indentationLevel, int[] positions) {
return this.format(string, indentationLevel, positions, null);
}
- public String format(String string, int indentationLevel, int[] positions,
- String lineSeparator) {
+
+ public String format(String string, int indentationLevel, int[] positions, String lineSeparator) {
if (lineSeparator != null) {
this.options.setLineSeparator(lineSeparator);
}
@@ -1002,32 +989,32 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
return this.formatSourceString(string);
}
}
+
/**
- * Formats the char array sourceString
, and returns a string
- * containing the formatted version. The initial indentation level is 0.
+ * Formats the char array sourceString
, and returns a string containing the formatted version. The initial
+ * indentation level is 0.
*
* @param string
- * the string to format
+ * the string to format
* @return the formatted ouput.
*/
public String format(String string) {
return this.format(string, 0, (int[]) null);
}
+
/**
- * Formats a given source string, starting indenting it at a particular depth
- * and using the given options
+ * Formats a given source string, starting indenting it at a particular depth and using the given options
*
* @deprecated backport 1.0 internal functionality
*/
- public static String format(String sourceString, int initialIndentationLevel,
- ConfigurableOption[] options) {
+ public static String format(String sourceString, int initialIndentationLevel, ConfigurableOption[] options) {
CodeFormatter formatter = new CodeFormatter(options);
formatter.setInitialIndentationLevel(initialIndentationLevel);
return formatter.formatSourceString(sourceString);
}
+
/**
- * Returns the number of characters and tab char between the beginning of the
- * line and the beginning of the comment.
+ * Returns the number of characters and tab char between the beginning of the line and the beginning of the comment.
*/
private int getCurrentCommentOffset() {
int linePtr = scanner.linePtr;
@@ -1050,61 +1037,54 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
for (int i = currentStartPosition - 1; i >= beginningOfLine; i--) {
char currentCharacter = source[i];
switch (currentCharacter) {
- case '\t' :
- offset += options.tabSize;
- break;
- case ' ' :
- offset++;
- break;
- case '\r' :
- case '\n' :
- break;
- default :
- return offset;
+ case '\t':
+ offset += options.tabSize;
+ break;
+ case ' ':
+ offset++;
+ break;
+ case '\r':
+ case '\n':
+ break;
+ default:
+ return offset;
}
}
return offset;
}
+
/**
- * Returns an array of descriptions for the configurable options. The
- * descriptions may be changed and passed back to a different compiler.
+ * Returns an array of descriptions for the configurable options. The descriptions may be changed and passed back to a different
+ * compiler.
*
* @deprecated backport 1.0 internal functionality
*/
public static ConfigurableOption[] getDefaultOptions(Locale locale) {
String componentName = CodeFormatter.class.getName();
FormatterOptions options = new FormatterOptions();
- return new ConfigurableOption[]{
- new ConfigurableOption(componentName, "newline.openingBrace", locale,
- options.newLineBeforeOpeningBraceMode ? 0 : 1),
+ return new ConfigurableOption[] {
+ new ConfigurableOption(componentName, "newline.openingBrace", locale, options.newLineBeforeOpeningBraceMode ? 0 : 1),
//$NON-NLS-1$
- new ConfigurableOption(componentName, "newline.controlStatement",
- locale, options.newlineInControlStatementMode ? 0 : 1),
+ new ConfigurableOption(componentName, "newline.controlStatement", locale, options.newlineInControlStatementMode ? 0 : 1),
//$NON-NLS-1$
- new ConfigurableOption(componentName, "newline.clearAll", locale,
- options.clearAllBlankLinesMode ? 0 : 1),
+ new ConfigurableOption(componentName, "newline.clearAll", locale, options.clearAllBlankLinesMode ? 0 : 1),
//$NON-NLS-1$
// new ConfigurableOption(componentName, "newline.elseIf", locale,
// options.compactElseIfMode ? 0 : 1), //$NON-NLS-1$
- new ConfigurableOption(componentName, "newline.emptyBlock", locale,
- options.newLineInEmptyBlockMode ? 0 : 1),
+ new ConfigurableOption(componentName, "newline.emptyBlock", locale, options.newLineInEmptyBlockMode ? 0 : 1),
//$NON-NLS-1$
- new ConfigurableOption(componentName, "line.split", locale,
- options.maxLineLength),
+ new ConfigurableOption(componentName, "line.split", locale, options.maxLineLength),
//$NON-NLS-1$
- new ConfigurableOption(componentName, "style.compactAssignment",
- locale, options.compactAssignmentMode ? 0 : 1),
+ new ConfigurableOption(componentName, "style.compactAssignment", locale, options.compactAssignmentMode ? 0 : 1),
//$NON-NLS-1$
- new ConfigurableOption(componentName, "tabulation.char", locale,
- options.indentWithTab ? 0 : 1),
+ new ConfigurableOption(componentName, "tabulation.char", locale, options.indentWithTab ? 0 : 1),
//$NON-NLS-1$
- new ConfigurableOption(componentName, "tabulation.size", locale,
- options.tabSize) //$NON-NLS-1$
+ new ConfigurableOption(componentName, "tabulation.size", locale, options.tabSize) //$NON-NLS-1$
};
}
+
/**
- * Returns the array of mapped positions. Returns null is no positions have
- * been set.
+ * Returns the array of mapped positions. Returns null is no positions have been set.
*
* @return int[]
* @deprecated There is no need to retrieve the mapped positions anymore.
@@ -1112,174 +1092,180 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
public int[] getMappedPositions() {
return mappedPositions;
}
+
/**
* Returns the priority of the token given as argument token
* @param token
- * the token of which the priority is requested
+ * the token of which the priority is requested
*/
private static int getTokenPriority(int token) {
switch (token) {
- case TokenNameextends :
- // case TokenNameimplements :
- // case TokenNamethrows :
- return 10;
- case TokenNameSEMICOLON :
- // ;
- return 20;
- case TokenNameCOMMA :
- // ,
- return 25;
- case TokenNameEQUAL :
- // =
- return 30;
- case TokenNameAND_AND :
- // &&
- case TokenNameOR_OR :
- // ||
- return 40;
- case TokenNameQUESTION :
- // ?
- case TokenNameCOLON :
- // :
- return 50; // it's better cutting on ?: than on ;
- case TokenNameEQUAL_EQUAL :
- // ==
- case TokenNameEQUAL_EQUAL_EQUAL :
- // ===
- case TokenNameNOT_EQUAL :
+ case TokenNameextends:
+ // case TokenNameimplements :
+ // case TokenNamethrows :
+ return 10;
+ case TokenNameSEMICOLON:
+ // ;
+ return 20;
+ case TokenNameCOMMA:
+ // ,
+ return 25;
+ case TokenNameEQUAL:
+ // =
+ return 30;
+ case TokenNameAND_AND:
+ // &&
+ case TokenNameOR_OR:
+ // ||
+ return 40;
+ case TokenNameQUESTION:
+ // ?
+ case TokenNameCOLON:
+ // :
+ return 50; // it's better cutting on ?: than on ;
+ case TokenNameEQUAL_EQUAL:
+ // ==
+ case TokenNameEQUAL_EQUAL_EQUAL:
+ // ===
+ case TokenNameNOT_EQUAL:
+ // !=
+ case TokenNameNOT_EQUAL_EQUAL:
// !=
- case TokenNameNOT_EQUAL_EQUAL :
- // !=
- return 60;
- case TokenNameLESS :
- // <
- case TokenNameLESS_EQUAL :
- // <=
- case TokenNameGREATER :
- // >
- case TokenNameGREATER_EQUAL :
- // >=
- // case TokenNameinstanceof : // instanceof
- return 70;
- case TokenNamePLUS :
- // +
- case TokenNameMINUS :
- // -
- return 80;
- case TokenNameMULTIPLY :
- // *
- case TokenNameDIVIDE :
- // /
- case TokenNameREMAINDER :
- // %
- return 90;
- case TokenNameLEFT_SHIFT :
- // <<
- case TokenNameRIGHT_SHIFT :
- // >>
- // case TokenNameUNSIGNED_RIGHT_SHIFT : // >>>
- return 100;
- case TokenNameAND :
- // &
- case TokenNameOR :
- // |
- case TokenNameXOR :
- // ^
- return 110;
- case TokenNameMULTIPLY_EQUAL :
- // *=
- case TokenNameDIVIDE_EQUAL :
- // /=
- case TokenNameREMAINDER_EQUAL :
- // %=
- case TokenNamePLUS_EQUAL :
- // +=
- case TokenNameMINUS_EQUAL :
- // -=
- case TokenNameLEFT_SHIFT_EQUAL :
- // <<=
- case TokenNameRIGHT_SHIFT_EQUAL :
- // >>=
- // case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>=
- case TokenNameAND_EQUAL :
- // &=
- case TokenNameXOR_EQUAL :
- // ^=
- case TokenNameOR_EQUAL :
- // |=
- return 120;
- case TokenNameDOT :
- // .
- return 130;
- default :
- return Integer.MAX_VALUE;
+ return 60;
+ case TokenNameLESS:
+ // <
+ case TokenNameLESS_EQUAL:
+ // <=
+ case TokenNameGREATER:
+ // >
+ case TokenNameGREATER_EQUAL:
+ // >=
+ // case TokenNameinstanceof : // instanceof
+ return 70;
+ case TokenNamePLUS:
+ // +
+ case TokenNameMINUS:
+ // -
+ return 80;
+ case TokenNameMULTIPLY:
+ // *
+ case TokenNameDIVIDE:
+ // /
+ case TokenNameREMAINDER:
+ // %
+ return 90;
+ case TokenNameLEFT_SHIFT:
+ // <<
+ case TokenNameRIGHT_SHIFT:
+ // >>
+ // case TokenNameUNSIGNED_RIGHT_SHIFT : // >>>
+ return 100;
+ case TokenNameAND:
+ // &
+ case TokenNameOR:
+ // |
+ case TokenNameXOR:
+ // ^
+ return 110;
+ case TokenNameMULTIPLY_EQUAL:
+ // *=
+ case TokenNameDIVIDE_EQUAL:
+ // /=
+ case TokenNameREMAINDER_EQUAL:
+ // %=
+ case TokenNamePLUS_EQUAL:
+ // +=
+ case TokenNameMINUS_EQUAL:
+ // -=
+ case TokenNameLEFT_SHIFT_EQUAL:
+ // <<=
+ case TokenNameRIGHT_SHIFT_EQUAL:
+ // >>=
+ // case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>=
+ case TokenNameAND_EQUAL:
+ // &=
+ case TokenNameXOR_EQUAL:
+ // ^=
+ case TokenNameOR_EQUAL:
+ // .=
+ case TokenNameDOT_EQUAL:
+ // |=
+ return 120;
+ case TokenNameDOT:
+ // .
+ return 130;
+ default:
+ return Integer.MAX_VALUE;
}
}
+
/**
- * Handles the exception raised when an invalid token is encountered. Returns
- * true if the exception has been handled, false otherwise.
+ * Handles the exception raised when an invalid token is encountered. Returns true if the exception has been handled, false
+ * otherwise.
*/
private boolean handleInvalidToken(Exception e) {
- if (e.getMessage().equals(Scanner.INVALID_CHARACTER_CONSTANT)
- || e.getMessage().equals(Scanner.INVALID_CHAR_IN_STRING)
+ if (e.getMessage().equals(Scanner.INVALID_CHARACTER_CONSTANT) || e.getMessage().equals(Scanner.INVALID_CHAR_IN_STRING)
|| e.getMessage().equals(Scanner.INVALID_ESCAPE)) {
return true;
}
return false;
}
+
private final void increaseGlobalDelta(int offset) {
globalDelta += offset;
}
+
private final void increaseLineDelta(int offset) {
lineDelta += offset;
}
+
private final void increaseSplitDelta(int offset) {
splitDelta += offset;
}
+
/**
- * Returns true if a space has to be inserted after operator
- * false otherwise.
+ * Returns true if a space has to be inserted after operator
false otherwise.
*/
private boolean insertSpaceAfter(int token) {
switch (token) {
- case TokenNameLPAREN :
- case TokenNameNOT :
- case TokenNameTWIDDLE :
- case TokenNameDOT :
- case 0 :
- // no token
- case TokenNameWHITESPACE :
- case TokenNameLBRACKET :
- case TokenNameDOLLAR :
- case Scanner.TokenNameCOMMENT_LINE :
- return false;
- default :
- return true;
+ case TokenNameLPAREN:
+ case TokenNameNOT:
+ case TokenNameTWIDDLE:
+ case TokenNameDOT:
+ case 0:
+ // no token
+ case TokenNameWHITESPACE:
+ case TokenNameLBRACKET:
+ case TokenNameDOLLAR:
+ case Scanner.TokenNameCOMMENT_LINE:
+ return false;
+ default:
+ return true;
}
}
+
/**
- * Returns true if a space has to be inserted before operator
- * false otherwise. operator
false otherwise. oneLineBuffer
exceeds maxLineLength
,
- * it is split and the result is dumped in formattedSource
+ * If the length of oneLineBuffer
exceeds maxLineLength
, it is split and the result is dumped in
+ * formattedSource
*
* @param newLineCount
- * the number of new lines to append
+ * the number of new lines to append
*/
private void newLine(int newLineCount) {
// format current line
@@ -1303,12 +1290,10 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
String currentLine = currentLineBuffer.toString();
if (containsOpenCloseBraces) {
containsOpenCloseBraces = false;
- outputLine(currentLine, false, indentationLevelForOpenCloseBraces, 0, -1,
- null, 0);
+ outputLine(currentLine, false, indentationLevelForOpenCloseBraces, 0, -1, null, 0);
indentationLevelForOpenCloseBraces = currentLineIndentationLevel;
} else {
- outputLine(currentLine, false, currentLineIndentationLevel, 0, -1, null,
- 0);
+ outputLine(currentLine, false, currentLineIndentationLevel, 0, -1, null, 0);
}
// dump line break(s)
for (int i = 0; i < newLineCount; i++) {
@@ -1317,150 +1302,153 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
// reset formatter for next line
int currentLength = currentLine.length();
- currentLineBuffer = new StringBuffer(currentLength > maxLineSize
- ? maxLineSize = currentLength
- : maxLineSize);
+ currentLineBuffer = new StringBuffer(currentLength > maxLineSize ? maxLineSize = currentLength : maxLineSize);
increaseGlobalDelta(splitDelta);
increaseGlobalDelta(lineDelta);
lineDelta = 0;
currentLineIndentationLevel = initialIndentationLevel;
}
+
private String operatorString(int operator) {
switch (operator) {
- case TokenNameextends :
- return "extends"; //$NON-NLS-1$
- // case TokenNameimplements :
- // return "implements"; //$NON-NLS-1$
- //
- // case TokenNamethrows :
- // return "throws"; //$NON-NLS-1$
- case TokenNameSEMICOLON :
- // ;
- return ";"; //$NON-NLS-1$
- case TokenNameCOMMA :
- // ,
- return ","; //$NON-NLS-1$
- case TokenNameEQUAL :
- // =
- return "="; //$NON-NLS-1$
- case TokenNameAND_AND :
- // && (15.22)
- return "&&"; //$NON-NLS-1$
- case TokenNameOR_OR :
- // || (15.23)
- return "||"; //$NON-NLS-1$
- case TokenNameQUESTION :
- // ? (15.24)
- return "?"; //$NON-NLS-1$
- case TokenNameCOLON :
- // : (15.24)
- return ":"; //$NON-NLS-1$
- case TokenNamePAAMAYIM_NEKUDOTAYIM :
- // : (15.24)
- return "::"; //$NON-NLS-1$
- case TokenNameEQUAL_EQUAL :
- // == (15.20, 15.20.1, 15.20.2, 15.20.3)
- return "=="; //$NON-NLS-1$
- case TokenNameEQUAL_EQUAL_EQUAL :
- // == (15.20, 15.20.1, 15.20.2, 15.20.3)
- return "==="; //$NON-NLS-1$
- case TokenNameEQUAL_GREATER :
- // -= (15.25.2)
- return "=>"; //$NON-NLS-1$
- case TokenNameNOT_EQUAL :
- // != (15.20, 15.20.1, 15.20.2, 15.20.3)
- return "!="; //$NON-NLS-1$
- case TokenNameNOT_EQUAL_EQUAL :
- // != (15.20, 15.20.1, 15.20.2, 15.20.3)
- return "!=="; //$NON-NLS-1$
- case TokenNameLESS :
- // < (15.19.1)
- return "<"; //$NON-NLS-1$
- case TokenNameLESS_EQUAL :
- // <= (15.19.1)
- return "<="; //$NON-NLS-1$
- case TokenNameGREATER :
- // > (15.19.1)
- return ">"; //$NON-NLS-1$
- case TokenNameGREATER_EQUAL :
- // >= (15.19.1)
- return ">="; //$NON-NLS-1$
- // case TokenNameinstanceof : // instanceof
- // return "instanceof"; //$NON-NLS-1$
- case TokenNamePLUS :
- // + (15.17, 15.17.2)
- return "+"; //$NON-NLS-1$
- case TokenNameMINUS :
- // - (15.17.2)
- return "-"; //$NON-NLS-1$
- case TokenNameMULTIPLY :
- // * (15.16.1)
- return "*"; //$NON-NLS-1$
- case TokenNameDIVIDE :
- // / (15.16.2)
- return "/"; //$NON-NLS-1$
- case TokenNameREMAINDER :
- // % (15.16.3)
- return "%"; //$NON-NLS-1$
- case TokenNameLEFT_SHIFT :
- // << (15.18)
- return "<<"; //$NON-NLS-1$
- case TokenNameRIGHT_SHIFT :
- // >> (15.18)
- return ">>"; //$NON-NLS-1$
- // case TokenNameUNSIGNED_RIGHT_SHIFT : // >>> (15.18)
- // return ">>>"; //$NON-NLS-1$
- case TokenNameAND :
- // & (15.21, 15.21.1, 15.21.2)
- return "&"; //$NON-NLS-1$
- case TokenNameOR :
- // | (15.21, 15.21.1, 15.21.2)
- return "|"; //$NON-NLS-1$
- case TokenNameXOR :
- // ^ (15.21, 15.21.1, 15.21.2)
- return "^"; //$NON-NLS-1$
- case TokenNameMULTIPLY_EQUAL :
- // *= (15.25.2)
- return "*="; //$NON-NLS-1$
- case TokenNameDIVIDE_EQUAL :
- // /= (15.25.2)
- return "/="; //$NON-NLS-1$
- case TokenNameREMAINDER_EQUAL :
- // %= (15.25.2)
- return "%="; //$NON-NLS-1$
- case TokenNamePLUS_EQUAL :
- // += (15.25.2)
- return "+="; //$NON-NLS-1$
- case TokenNameMINUS_EQUAL :
- // -= (15.25.2)
- return "-="; //$NON-NLS-1$
- case TokenNameMINUS_GREATER :
- // -= (15.25.2)
- return "->"; //$NON-NLS-1$
- case TokenNameLEFT_SHIFT_EQUAL :
- // <<= (15.25.2)
- return "<<="; //$NON-NLS-1$
- case TokenNameRIGHT_SHIFT_EQUAL :
- // >>= (15.25.2)
- return ">>="; //$NON-NLS-1$
- // case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>= (15.25.2)
- // return ">>>="; //$NON-NLS-1$
- case TokenNameAND_EQUAL :
- // &= (15.25.2)
- return "&="; //$NON-NLS-1$
- case TokenNameXOR_EQUAL :
- // ^= (15.25.2)
- return "^="; //$NON-NLS-1$
- case TokenNameOR_EQUAL :
- // |= (15.25.2)
- return "|="; //$NON-NLS-1$
- case TokenNameDOT :
- // .
- return "."; //$NON-NLS-1$
- default :
- return ""; //$NON-NLS-1$
+ case TokenNameextends:
+ return "extends"; //$NON-NLS-1$
+ // case TokenNameimplements :
+ // return "implements"; //$NON-NLS-1$
+ //
+ // case TokenNamethrows :
+ // return "throws"; //$NON-NLS-1$
+ case TokenNameSEMICOLON:
+ // ;
+ return ";"; //$NON-NLS-1$
+ case TokenNameCOMMA:
+ // ,
+ return ","; //$NON-NLS-1$
+ case TokenNameEQUAL:
+ // =
+ return "="; //$NON-NLS-1$
+ case TokenNameAND_AND:
+ // && (15.22)
+ return "&&"; //$NON-NLS-1$
+ case TokenNameOR_OR:
+ // || (15.23)
+ return "||"; //$NON-NLS-1$
+ case TokenNameQUESTION:
+ // ? (15.24)
+ return "?"; //$NON-NLS-1$
+ case TokenNameCOLON:
+ // : (15.24)
+ return ":"; //$NON-NLS-1$
+ case TokenNamePAAMAYIM_NEKUDOTAYIM:
+ // : (15.24)
+ return "::"; //$NON-NLS-1$
+ case TokenNameEQUAL_EQUAL:
+ // == (15.20, 15.20.1, 15.20.2, 15.20.3)
+ return "=="; //$NON-NLS-1$
+ case TokenNameEQUAL_EQUAL_EQUAL:
+ // == (15.20, 15.20.1, 15.20.2, 15.20.3)
+ return "==="; //$NON-NLS-1$
+ case TokenNameEQUAL_GREATER:
+ // -= (15.25.2)
+ return "=>"; //$NON-NLS-1$
+ case TokenNameNOT_EQUAL:
+ // != (15.20, 15.20.1, 15.20.2, 15.20.3)
+ return "!="; //$NON-NLS-1$
+ case TokenNameNOT_EQUAL_EQUAL:
+ // != (15.20, 15.20.1, 15.20.2, 15.20.3)
+ return "!=="; //$NON-NLS-1$
+ case TokenNameLESS:
+ // < (15.19.1)
+ return "<"; //$NON-NLS-1$
+ case TokenNameLESS_EQUAL:
+ // <= (15.19.1)
+ return "<="; //$NON-NLS-1$
+ case TokenNameGREATER:
+ // > (15.19.1)
+ return ">"; //$NON-NLS-1$
+ case TokenNameGREATER_EQUAL:
+ // >= (15.19.1)
+ return ">="; //$NON-NLS-1$
+ // case TokenNameinstanceof : // instanceof
+ // return "instanceof"; //$NON-NLS-1$
+ case TokenNamePLUS:
+ // + (15.17, 15.17.2)
+ return "+"; //$NON-NLS-1$
+ case TokenNameMINUS:
+ // - (15.17.2)
+ return "-"; //$NON-NLS-1$
+ case TokenNameMULTIPLY:
+ // * (15.16.1)
+ return "*"; //$NON-NLS-1$
+ case TokenNameDIVIDE:
+ // / (15.16.2)
+ return "/"; //$NON-NLS-1$
+ case TokenNameREMAINDER:
+ // % (15.16.3)
+ return "%"; //$NON-NLS-1$
+ case TokenNameLEFT_SHIFT:
+ // << (15.18)
+ return "<<"; //$NON-NLS-1$
+ case TokenNameRIGHT_SHIFT:
+ // >> (15.18)
+ return ">>"; //$NON-NLS-1$
+ // case TokenNameUNSIGNED_RIGHT_SHIFT : // >>> (15.18)
+ // return ">>>"; //$NON-NLS-1$
+ case TokenNameAND:
+ // & (15.21, 15.21.1, 15.21.2)
+ return "&"; //$NON-NLS-1$
+ case TokenNameOR:
+ // | (15.21, 15.21.1, 15.21.2)
+ return "|"; //$NON-NLS-1$
+ case TokenNameXOR:
+ // ^ (15.21, 15.21.1, 15.21.2)
+ return "^"; //$NON-NLS-1$
+ case TokenNameMULTIPLY_EQUAL:
+ // *= (15.25.2)
+ return "*="; //$NON-NLS-1$
+ case TokenNameDIVIDE_EQUAL:
+ // /= (15.25.2)
+ return "/="; //$NON-NLS-1$
+ case TokenNameREMAINDER_EQUAL:
+ // %= (15.25.2)
+ return "%="; //$NON-NLS-1$
+ case TokenNamePLUS_EQUAL:
+ // += (15.25.2)
+ return "+="; //$NON-NLS-1$
+ case TokenNameMINUS_EQUAL:
+ // -= (15.25.2)
+ return "-="; //$NON-NLS-1$
+ case TokenNameMINUS_GREATER:
+ // -= (15.25.2)
+ return "->"; //$NON-NLS-1$
+ case TokenNameLEFT_SHIFT_EQUAL:
+ // <<= (15.25.2)
+ return "<<="; //$NON-NLS-1$
+ case TokenNameRIGHT_SHIFT_EQUAL:
+ // >>= (15.25.2)
+ return ">>="; //$NON-NLS-1$
+ // case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>= (15.25.2)
+ // return ">>>="; //$NON-NLS-1$
+ case TokenNameAND_EQUAL:
+ // &= (15.25.2)
+ return "&="; //$NON-NLS-1$
+ case TokenNameXOR_EQUAL:
+ // ^= (15.25.2)
+ return "^="; //$NON-NLS-1$
+ case TokenNameOR_EQUAL:
+ // |= (15.25.2)
+ return "|="; //$NON-NLS-1$
+ case TokenNameDOT_EQUAL:
+ // .=
+ return ".="; //$NON-NLS-1$
+ case TokenNameDOT:
+ // .
+ return "."; //$NON-NLS-1$
+ default:
+ return ""; //$NON-NLS-1$
}
}
+
/**
* Appends stringToOutput
to the formatted output. token
to the formatted output. \n
, append a LINE_SEPARATOR and indent
- * after it.
+ * If it contains \n
, append a LINE_SEPARATOR and indent after it.
*/
private void outputCurrentToken(int token) {
char[] source = scanner.source;
int startPosition = scanner.startPosition;
switch (token) {
- case Scanner.TokenNameCOMMENT_PHPDOC :
- case Scanner.TokenNameCOMMENT_BLOCK :
- case Scanner.TokenNameCOMMENT_LINE :
- boolean endOfLine = false;
- int currentCommentOffset = getCurrentCommentOffset();
- int beginningOfLineSpaces = 0;
- endOfLine = false;
- currentCommentOffset = getCurrentCommentOffset();
- beginningOfLineSpaces = 0;
- boolean pendingCarriageReturn = false;
- for (int i = startPosition, max = scanner.currentPosition; i < max; i++) {
- char currentCharacter = source[i];
- updateMappedPositions(i);
- switch (currentCharacter) {
- case '\r' :
- pendingCarriageReturn = true;
- endOfLine = true;
- break;
- case '\n' :
- if (pendingCarriageReturn) {
- increaseGlobalDelta(options.lineSeparatorSequence.length - 2);
- } else {
- increaseGlobalDelta(options.lineSeparatorSequence.length - 1);
- }
- pendingCarriageReturn = false;
- currentLineBuffer.append(options.lineSeparatorSequence);
- beginningOfLineSpaces = 0;
- endOfLine = true;
- break;
- case '\t' :
- if (pendingCarriageReturn) {
- pendingCarriageReturn = false;
- increaseGlobalDelta(options.lineSeparatorSequence.length - 1);
- currentLineBuffer.append(options.lineSeparatorSequence);
- beginningOfLineSpaces = 0;
- endOfLine = true;
- }
- if (endOfLine) {
- // we remove a maximum of currentCommentOffset characters (tabs
- // are converted to space numbers).
- beginningOfLineSpaces += options.tabSize;
- if (beginningOfLineSpaces > currentCommentOffset) {
- currentLineBuffer.append(currentCharacter);
- } else {
- increaseGlobalDelta(-1);
- }
- } else {
- currentLineBuffer.append(currentCharacter);
- }
- break;
- case ' ' :
- if (pendingCarriageReturn) {
- pendingCarriageReturn = false;
- increaseGlobalDelta(options.lineSeparatorSequence.length - 1);
- currentLineBuffer.append(options.lineSeparatorSequence);
- beginningOfLineSpaces = 0;
- endOfLine = true;
- }
- if (endOfLine) {
- // we remove a maximum of currentCommentOffset characters (tabs
- // are converted to space numbers).
- beginningOfLineSpaces++;
- if (beginningOfLineSpaces > currentCommentOffset) {
- currentLineBuffer.append(currentCharacter);
- } else {
- increaseGlobalDelta(-1);
- }
- } else {
- currentLineBuffer.append(currentCharacter);
- }
- break;
- default :
- if (pendingCarriageReturn) {
- pendingCarriageReturn = false;
- increaseGlobalDelta(options.lineSeparatorSequence.length - 1);
- currentLineBuffer.append(options.lineSeparatorSequence);
- beginningOfLineSpaces = 0;
- endOfLine = true;
- } else {
- beginningOfLineSpaces = 0;
- currentLineBuffer.append(currentCharacter);
- endOfLine = false;
- }
+ case Scanner.TokenNameCOMMENT_PHPDOC:
+ case Scanner.TokenNameCOMMENT_BLOCK:
+ case Scanner.TokenNameCOMMENT_LINE:
+ boolean endOfLine = false;
+ int currentCommentOffset = getCurrentCommentOffset();
+ int beginningOfLineSpaces = 0;
+ endOfLine = false;
+ currentCommentOffset = getCurrentCommentOffset();
+ beginningOfLineSpaces = 0;
+ boolean pendingCarriageReturn = false;
+ for (int i = startPosition, max = scanner.currentPosition; i < max; i++) {
+ char currentCharacter = source[i];
+ updateMappedPositions(i);
+ switch (currentCharacter) {
+ case '\r':
+ pendingCarriageReturn = true;
+ endOfLine = true;
+ break;
+ case '\n':
+ if (pendingCarriageReturn) {
+ increaseGlobalDelta(options.lineSeparatorSequence.length - 2);
+ } else {
+ increaseGlobalDelta(options.lineSeparatorSequence.length - 1);
+ }
+ pendingCarriageReturn = false;
+ currentLineBuffer.append(options.lineSeparatorSequence);
+ beginningOfLineSpaces = 0;
+ endOfLine = true;
+ break;
+ case '\t':
+ if (pendingCarriageReturn) {
+ pendingCarriageReturn = false;
+ increaseGlobalDelta(options.lineSeparatorSequence.length - 1);
+ currentLineBuffer.append(options.lineSeparatorSequence);
+ beginningOfLineSpaces = 0;
+ endOfLine = true;
+ }
+ if (endOfLine) {
+ // we remove a maximum of currentCommentOffset characters (tabs
+ // are converted to space numbers).
+ beginningOfLineSpaces += options.tabSize;
+ if (beginningOfLineSpaces > currentCommentOffset) {
+ currentLineBuffer.append(currentCharacter);
+ } else {
+ increaseGlobalDelta(-1);
+ }
+ } else {
+ currentLineBuffer.append(currentCharacter);
+ }
+ break;
+ case ' ':
+ if (pendingCarriageReturn) {
+ pendingCarriageReturn = false;
+ increaseGlobalDelta(options.lineSeparatorSequence.length - 1);
+ currentLineBuffer.append(options.lineSeparatorSequence);
+ beginningOfLineSpaces = 0;
+ endOfLine = true;
+ }
+ if (endOfLine) {
+ // we remove a maximum of currentCommentOffset characters (tabs
+ // are converted to space numbers).
+ beginningOfLineSpaces++;
+ if (beginningOfLineSpaces > currentCommentOffset) {
+ currentLineBuffer.append(currentCharacter);
+ } else {
+ increaseGlobalDelta(-1);
+ }
+ } else {
+ currentLineBuffer.append(currentCharacter);
+ }
+ break;
+ default:
+ if (pendingCarriageReturn) {
+ pendingCarriageReturn = false;
+ increaseGlobalDelta(options.lineSeparatorSequence.length - 1);
+ currentLineBuffer.append(options.lineSeparatorSequence);
+ beginningOfLineSpaces = 0;
+ endOfLine = true;
+ } else {
+ beginningOfLineSpaces = 0;
+ currentLineBuffer.append(currentCharacter);
+ endOfLine = false;
}
}
- updateMappedPositions(scanner.currentPosition - 1);
- multipleLineCommentCounter++;
- break;
- default :
- for (int i = startPosition, max = scanner.currentPosition; i < max; i++) {
- char currentCharacter = source[i];
- updateMappedPositions(i);
- currentLineBuffer.append(currentCharacter);
- }
+ }
+ updateMappedPositions(scanner.currentPosition - 1);
+ multipleLineCommentCounter++;
+ break;
+ default:
+ for (int i = startPosition, max = scanner.currentPosition; i < max; i++) {
+ char currentCharacter = source[i];
+ updateMappedPositions(i);
+ currentLineBuffer.append(currentCharacter);
+ }
}
}
+
/**
* Outputs currentString
:currentString
+ * number of indentation to put in front of currentString
* @param operator
- * value of the operator belonging to currentString
.
+ * value of the operator belonging to currentString
.
*/
- private void outputLine(String currentString, boolean preIndented, int depth,
- int operator, int substringIndex, int[] startSubstringIndexes,
- int offsetInGlobalLine) {
+ private void outputLine(String currentString, boolean preIndented, int depth, int operator, int substringIndex,
+ int[] startSubstringIndexes, int offsetInGlobalLine) {
boolean emptyFirstSubString = false;
String operatorString = operatorString(operator);
boolean placeOperatorBehind = !breakLineBeforeOperator(operator);
@@ -1615,9 +1608,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
formattedSource.append(operatorString);
increaseSplitDelta(operatorString.length());
- if (insertSpaceAfter(operator)
- && operator != TokenNameimplements
- && operator != TokenNameextends) {
+ if (insertSpaceAfter(operator) && operator != TokenNameimplements && operator != TokenNameextends) {
// && operator != TokenNamethrows) {
formattedSource.append(' ');
increaseSplitDelta(1);
@@ -1625,15 +1616,13 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
}
SplitLine splitLine = null;
- if (options.maxLineLength == 0
- || getLength(currentString, depth) < options.maxLineLength
+ if (options.maxLineLength == 0 || getLength(currentString, depth) < options.maxLineLength
|| (splitLine = split(currentString, offsetInGlobalLine)) == null) {
// depending on the type of operator, outputs new line before of after
// dumping it
// indent before postfix operator
// indent also when the line cannot be split
- if (operator == TokenNameextends
- || operator == TokenNameimplements ) {
+ if (operator == TokenNameextends || operator == TokenNameimplements) {
// || operator == TokenNamethrows) {
formattedSource.append(' ');
increaseSplitDelta(1);
@@ -1646,13 +1635,11 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
int max = currentString.length();
if (multipleLineCommentCounter != 0) {
try {
- BufferedReader reader = new BufferedReader(new StringReader(
- currentString));
+ BufferedReader reader = new BufferedReader(new StringReader(currentString));
String line = reader.readLine();
while (line != null) {
- updateMappedPositionsWhileSplitting(beginningOfLineIndex,
- beginningOfLineIndex + line.length()
- + options.lineSeparatorSequence.length);
+ updateMappedPositionsWhileSplitting(beginningOfLineIndex, beginningOfLineIndex + line.length()
+ + options.lineSeparatorSequence.length);
formattedSource.append(line);
beginningOfLineIndex = beginningOfLineIndex + line.length();
if ((line = reader.readLine()) != null) {
@@ -1666,42 +1653,38 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
e.printStackTrace();
}
} else {
- updateMappedPositionsWhileSplitting(beginningOfLineIndex,
- beginningOfLineIndex + max);
+ updateMappedPositionsWhileSplitting(beginningOfLineIndex, beginningOfLineIndex + max);
for (int i = 0; i < max; i++) {
char currentChar = currentString.charAt(i);
switch (currentChar) {
- case '\r' :
- break;
- case '\n' :
- if (i != max - 1) {
- // fix for 1FFYL5C: LFCOM:ALL - Incorrect indentation when
- // split with a comment inside a condition
- // a substring cannot end with a lineSeparatorSequence,
- // except if it has been added by format() after a one-line
- // comment
- formattedSource.append(options.lineSeparatorSequence);
- // 1FGDDV6: LFCOM:WIN98 - Weird splitting on message expression
- dumpTab(depth - 1);
- }
- break;
- default :
- formattedSource.append(currentChar);
+ case '\r':
+ break;
+ case '\n':
+ if (i != max - 1) {
+ // fix for 1FFYL5C: LFCOM:ALL - Incorrect indentation when
+ // split with a comment inside a condition
+ // a substring cannot end with a lineSeparatorSequence,
+ // except if it has been added by format() after a one-line
+ // comment
+ formattedSource.append(options.lineSeparatorSequence);
+ // 1FGDDV6: LFCOM:WIN98 - Weird splitting on message expression
+ dumpTab(depth - 1);
+ }
+ break;
+ default:
+ formattedSource.append(currentChar);
}
}
}
// update positions inside the mappedPositions table
if (substringIndex != -1) {
if (multipleLineCommentCounter == 0) {
- int startPosition = beginningOfLineIndex
- + startSubstringIndexes[substringIndex];
- updateMappedPositionsWhileSplitting(startPosition, startPosition
- + max);
+ int startPosition = beginningOfLineIndex + startSubstringIndexes[substringIndex];
+ updateMappedPositionsWhileSplitting(startPosition, startPosition + max);
}
// compute the splitDelta resulting with the operator and blank removal
if (substringIndex + 1 != startSubstringIndexes.length) {
- increaseSplitDelta(startSubstringIndexes[substringIndex] + max
- - startSubstringIndexes[substringIndex + 1]);
+ increaseSplitDelta(startSubstringIndexes[substringIndex] + max - startSubstringIndexes[substringIndex + 1]);
}
}
// dump postfix operator?
@@ -1721,8 +1704,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
// fix for 1FG0BA3: LFCOM:WIN98 - Weird splitting on interfaces
// extends has to stand alone on a line when currentString has been split.
- if (options.maxLineLength != 0 && splitLine != null
- && (operator == TokenNameextends)) {
+ if (options.maxLineLength != 0 && splitLine != null && (operator == TokenNameextends)) {
// || operator == TokenNameimplements
// || operator == TokenNamethrows)) {
formattedSource.append(options.lineSeparatorSequence);
@@ -1759,10 +1741,8 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
int newDepth = (currentResult.startsWith("/*") //$NON-NLS-1$
|| currentResult.startsWith("//")) //$NON-NLS-1$
? indentationLevel - 1 : depth;
- outputLine(currentResult, i == 0 || (i == 1 && emptyFirstSubString)
- ? preIndented
- : false, i == 0 ? newDepth : newDepth + 1, splitOperators[i], i,
- splitLine.startSubstringsIndexes, currentString
+ outputLine(currentResult, i == 0 || (i == 1 && emptyFirstSubString) ? preIndented : false,
+ i == 0 ? newDepth : newDepth + 1, splitOperators[i], i, splitLine.startSubstringsIndexes, currentString
.indexOf(currentResult));
if (i != max - 1) {
formattedSource.append(options.lineSeparatorSequence);
@@ -1784,8 +1764,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
formattedSource.append(lastOperatorString);
increaseSplitDelta(lastOperatorString.length());
- if (insertSpaceAfter(lastOperator) && lastOperator != TokenNameimplements
- && lastOperator != TokenNameextends) {
+ if (insertSpaceAfter(lastOperator) && lastOperator != TokenNameimplements && lastOperator != TokenNameextends) {
// && lastOperator != TokenNamethrows) {
formattedSource.append(' ');
increaseSplitDelta(1);
@@ -1802,21 +1781,21 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
//increaseSplitDelta(operatorString.length());
}
}
+
/**
* Pops the top statement of the stack if it is token
*/
private int pop(int token) {
int delta = 0;
- if ((constructionsCount > 0)
- && (constructions[constructionsCount - 1] == token)) {
+ if ((constructionsCount > 0) && (constructions[constructionsCount - 1] == token)) {
delta--;
constructionsCount--;
}
return delta;
}
+
/**
- * Pops the top statement of the stack if it is a BLOCK
or a
- * NONINDENT_BLOCK
.
+ * Pops the top statement of the stack if it is a BLOCK
or a NONINDENT_BLOCK
.
*/
private int popBlock() {
int delta = 0;
@@ -1828,13 +1807,13 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
return delta;
}
+
/**
- * Pops elements until the stack is empty or the top element is token
.
- * token
.token
from the stack.
*
* @param token
- * the token to be left as the top of the stack
+ * the token to be left as the top of the stack
*/
private int popExclusiveUntil(int token) {
int delta = 0;
@@ -1846,44 +1825,43 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
return delta;
}
+
/**
- * Pops elements until the stack is empty or the top element is a BLOCK
- * or a NONINDENT_BLOCK
.BLOCK
or a NONINDENT_BLOCK
.BLOCK
,
- * a NONINDENT_BLOCK
or a CASE
.BLOCK
, a NONINDENT_BLOCK
or a
+ * CASE
.token
.
- * token
.token
from the stack too.
*
* @param token
- * the token to remove from the stack
+ * the token to remove from the stack
*/
private int popInclusiveUntil(int token) {
int startCount = constructionsCount;
@@ -1900,16 +1878,15 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
return delta;
}
+
/**
- * Pops elements until the stack is empty or the top element is a BLOCK
- * or a NONINDENT_BLOCK
.BLOCK
or a NONINDENT_BLOCK
.BLOCK
if the stack is empty or if the top element
- * is a BLOCK
, pushes NONINDENT_BLOCK
- * otherwise. Creates a new bigger array if the current one is full.
+ * Pushes a BLOCK
if the stack is empty or if the top element is a BLOCK
, pushes
+ * NONINDENT_BLOCK
otherwise. Creates a new bigger array if the current one is full.
*/
private int pushBlock() {
int delta = 0;
if (constructionsCount == constructions.length)
- System.arraycopy(constructions, 0,
- (constructions = new int[constructionsCount * 2]), 0,
- constructionsCount);
- if ((constructionsCount == 0)
- || (constructions[constructionsCount - 1] == BLOCK)
- || (constructions[constructionsCount - 1] == NONINDENT_BLOCK)
- || (constructions[constructionsCount - 1] == TokenNamecase)) {
+ System.arraycopy(constructions, 0, (constructions = new int[constructionsCount * 2]), 0, constructionsCount);
+ if ((constructionsCount == 0) || (constructions[constructionsCount - 1] == BLOCK)
+ || (constructions[constructionsCount - 1] == NONINDENT_BLOCK) || (constructions[constructionsCount - 1] == TokenNamecase)) {
delta++;
constructions[constructionsCount++] = BLOCK;
} else {
@@ -1943,33 +1916,32 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
}
return delta;
}
+
/**
* Pushes token
.stringToSplit
on the top level token stringToSplit
on the top level token