[21] Processed string templates falsely contain backslash characters

eclipse-jdt#1719
jarthana · Dec 12, 2023 · 0d4afb0 · 0d4afb0
1 parent f8dddad
commit 0d4afb0
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Parser.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Parser.java
@@ -10031,7 +10031,6 @@ protected void consumeTemplate(int token) {
 	}
 	//	get rid of all the cached values
 	this.scanner.withoutUnicodePtr = 0;
-	this.scanner.textBlockOffset = -1;
 	StringTemplate template = new StringTemplate(fragments, expressions, fragments[0].sourceStart, fragments[expressions.length].sourceEnd, isMultiline);
 	pushOnExpressionStack(template);
 }

diff --git a/...eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Scanner.java b/...eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Scanner.java
@@ -1888,6 +1888,7 @@ protected int scanForStringLiteral() throws InvalidInputException {
 		this.startPosition = startBkup;
 		return token;
 	} else {
+		this.textBlockOffset = -1; // Make sure that the previous values set by any preceding text block is reset.
 		int textFragmentStart = this.currentPosition - 1;
 		int lastCharPos = this.currentPosition;
 		try {

diff --git a/...tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/StringTemplateTest.java b/...tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/StringTemplateTest.java
@@ -1756,4 +1756,43 @@ interface Intf {
 				"Syntax error on token \")\", delete this token\n" +
 				"----------\n");
 	}
+	public void testIssue1719() {
+		runConformTest(
+				new String[] {
+					"X.java",
+					"""
+					public class X {
+					  public static void main(String[] args) {
+					    String name = "Bill";
+					    System.out.println(STR."\\{name}");
+					    String html = STR.\"""
+					         \\{name}
+					      \""";
+					  }
+					}"""
+				},
+				"Bill");
+	}
+	public void testIssue1722() {
+		runConformTest(
+				new String[] {
+					"X.java",
+					"""
+					public class X {
+					  public static void main(String[] args) {
+					    String firstName = "Bill", lastName = "Duck";
+					    System.out.println(STR."\\{firstName} \\{lastName}");
+
+					    String title = "My Web Page";
+
+					    String html = STR.\"""
+					        </head>
+					      \""";
+					    System.out.println(html);
+					  }
+					}"""
+				},
+				"Bill Duck\n" +
+				"  </head>");
+	}
 }