[Text blocks] Code review driven incremental clean up (eclipse-jdt#4138)

Author: srikanth-sankaran

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java

@@ -704,7 +704,7 @@ private void reportNLSProblems() {
 			int i = 0;
 			stringLiteralsLoop: for (; i < stringLiteralsLength; i++) {
 				literal = this.stringLiterals[i];
-				final int literalLineNumber = literal instanceof TextBlock ? ((TextBlock)literal).endLineNumber : literal.getLineNumber();
+				final int literalLineNumber = literal instanceof TextBlock textBlock ? textBlock.endLineNumber : literal.getLineNumber();
 				if (lastLineNumber != literalLineNumber) {
 					indexInLine = 1;
 					lastLineNumber = literalLineNumber;

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/TextBlock.java

@@ -18,20 +18,18 @@ public class TextBlock extends StringLiteral {
 
 	public int endLineNumber;
 
-	private TextBlock(char[] token, int start, int end, int lineNumber, int endLineNumber) {
+	public TextBlock(char[] token, int start, int end, int lineNumber, int endLineNumber) {
 		super(token, start,end, lineNumber);
-		this.endLineNumber= endLineNumber - 1; // line number is 1 based
-	}
-	public static TextBlock createTextBlock(char[] token, int start, int end, int lineNumber, int endLineNumber) {
-		return new TextBlock(token, start,end, lineNumber, endLineNumber);
+		this.endLineNumber = endLineNumber - 1; // line number is 1 based
 	}
+
 	@Override
 	public StringBuilder printExpression(int indent, StringBuilder output) {
 		output.append("\"\"\"\n"); //$NON-NLS-1$
-		for (char c:this.source()) {
+		for (char c: this.source()) {
 			Util.appendEscapedChar(output, c, true);
 		}
 		output.append("\"\"\""); //$NON-NLS-1$
 		return output;
 	}
-}
+}

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Parser.java

@@ -9156,34 +9156,15 @@ protected void consumeStaticOnly() {
 }
 private void consumeTextBlock() {
 	problemReporter().validateJavaFeatureSupport(JavaFeature.TEXT_BLOCKS, this.scanner.startPosition, this.scanner.currentPosition - 1);
-	char[] allchars = this.scanner.getCurrentTextBlock();
-	TextBlock textBlock = createTextBlock(allchars, this.scanner.startPosition, this.scanner.currentPosition - 1);
-	pushOnExpressionStack(textBlock);
-}
-private TextBlock createTextBlock(char[] allchars, int start, int end) {
-	TextBlock textBlock;
-	if (this.recordStringLiterals &&
-			!this.reparsingFunctionalExpression &&
-			this.checkExternalizeStrings &&
-			this.lastPosistion < this.scanner.currentPosition &&
-			!this.statementRecoveryActivated) {
-		textBlock =
-				TextBlock.createTextBlock(
-						allchars,
-						start,
-						end,
-						Util.getLineNumber(this.scanner.startPosition, this.scanner.lineEnds, 0, this.scanner.linePtr),
-						Util.getLineNumber(this.scanner.currentPosition - 1, this.scanner.lineEnds, 0, this.scanner.linePtr));
+	boolean shouldRecordStringLiterals = this.recordStringLiterals && !this.reparsingFunctionalExpression && this.checkExternalizeStrings &&
+											this.lastPosistion < this.scanner.currentPosition && !this.statementRecoveryActivated;
+
+	TextBlock textBlock = new TextBlock(this.scanner.getCurrentTextBlock(), this.scanner.startPosition, this.scanner.currentPosition - 1,
+						                shouldRecordStringLiterals ? Util.getLineNumber(this.scanner.startPosition, this.scanner.lineEnds, 0, this.scanner.linePtr) : 0,
+						                shouldRecordStringLiterals ? Util.getLineNumber(this.scanner.currentPosition - 1, this.scanner.lineEnds, 0, this.scanner.linePtr) : 0);
+	if (shouldRecordStringLiterals)
 		this.compilationUnit.recordStringLiteral(textBlock, this.currentElement != null);
-	} else {
-		textBlock = TextBlock.createTextBlock(
-				allchars,
-			start,
-			end,
-			0,
-			0);
-	}
-	return textBlock;
+	pushOnExpressionStack(textBlock);
 }
 protected void consumeSwitchBlock(boolean hasContents) {
 	// SwitchBlock ::= '{' { SwitchBlockStatements SwitchLabels } '}'

org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTConverter.java

@@ -2053,8 +2053,8 @@ public Expression convert(org.eclipse.jdt.internal.compiler.ast.Expression expre
 		if (expression instanceof org.eclipse.jdt.internal.compiler.ast.ExtendedStringLiteral) {
 			return convert((org.eclipse.jdt.internal.compiler.ast.ExtendedStringLiteral) expression);
 		}
-		if (expression instanceof org.eclipse.jdt.internal.compiler.ast.TextBlock) {
-			return convert((org.eclipse.jdt.internal.compiler.ast.TextBlock) expression);
+		if (expression instanceof org.eclipse.jdt.internal.compiler.ast.TextBlock textBlock) {
+			return convert(textBlock);
 		}
 		if (expression instanceof org.eclipse.jdt.internal.compiler.ast.StringLiteral) {
 			return convert((org.eclipse.jdt.internal.compiler.ast.StringLiteral) expression);