archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8285932: Implementation of JEP 430 String Templates (Preview)

Browse source 
Reviewed-by: mcimadamore, rriggs, darcy
This commit is contained in:
Jim Laskey 2023-05-10 11:34:01 +00:00
parent da2c930262
commit 4aa65cbeef
74 changed files with 9309 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

104
test/langtools/tools/javac/parser/JavacParserTest.java
View file

@ -87,6 +87,7 @@ import com.sun.source.tree.DefaultCaseLabelTree;
import com.sun.source.tree.ModuleTree;
import com.sun.source.util.TreePathScanner;
import com.sun.tools.javac.api.JavacTaskPool;
import com.sun.tools.javac.api.JavacTaskPool.Worker;
import java.util.Objects;
public class JavacParserTest extends TestCase {
@ -1912,6 +1913,52 @@ public class JavacParserTest extends TestCase {
}.scan(cut, null);
}
@Test
void testStringTemplate1() throws IOException {
String code = """
package test;
public class Test {
Test(int a) {
String s = "prefix \\{a} suffix";
}
}
""";
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null,
null, null, Arrays.asList(new MyFileObject(code)));
CompilationUnitTree cut = ct.parse().iterator().next();
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
MethodTree constr = (MethodTree) clazz.getMembers().get(0);
VariableTree decl = (VariableTree) constr.getBody().getStatements().get(0);
SourcePositions sp = Trees.instance(ct).getSourcePositions();
int initStart = (int) sp.getStartPosition(cut, decl.getInitializer());
int initEnd = (int) sp.getEndPosition(cut, decl.getInitializer());
assertEquals("correct templated String span expected", code.substring(initStart, initEnd), "\"prefix \\{a} suffix\"");
}
@Test
void testStringTemplate2() throws IOException {
String code = """
package test;
public class Test {
Test(int a) {
String s = STR."prefix \\{a} suffix";
}
}
""";
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null,
null, null, Arrays.asList(new MyFileObject(code)));
CompilationUnitTree cut = ct.parse().iterator().next();
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
MethodTree constr = (MethodTree) clazz.getMembers().get(0);
VariableTree decl = (VariableTree) constr.getBody().getStatements().get(0);
SourcePositions sp = Trees.instance(ct).getSourcePositions();
int initStart = (int) sp.getStartPosition(cut, decl.getInitializer());
int initEnd = (int) sp.getEndPosition(cut, decl.getInitializer());
assertEquals("correct templated String span expected", code.substring(initStart, initEnd), "STR.\"prefix \\{a} suffix\"");
}
@Test //JDK-8293897
void testImplicitFinalInTryWithResources() throws IOException {
String code = """
@ -1993,6 +2040,63 @@ public class JavacParserTest extends TestCase {
}.scan(cut, null);
}
@Test
void testIncompleteStringTemplate() throws IOException {
String template = "\"\\{o.toString()}\"";
String prefix = """
package t;
class Test {
void test(Object o) {
String s = STR.""";
Worker<Void> verifyParseable = task -> {
try {
task.parse().iterator().next();
return null;
} catch (IOException ex) {
throw new AssertionError(ex);
}
};
JavacTaskPool pool = new JavacTaskPool(1);
DiagnosticListener<JavaFileObject> dl = d -> {};
List<String> options = List.of("--enable-preview",
"-source", System.getProperty("java.specification.version"));
for (int i = 0; i < template.length(); i++) {
pool.getTask(null, fm, dl, options,
null, Arrays.asList(new MyFileObject(prefix + template.substring(0, i))),
verifyParseable
);
}
for (int i = 0; i < template.length() - 1; i++) {
pool.getTask(null, fm, dl, options,
null, Arrays.asList(new MyFileObject(prefix + template.substring(0, i) + "\"")),
verifyParseable);
}
String incomplete = prefix + "\"\\{o.";
pool.getTask(null, fm, dl, options,
null, Arrays.asList(new MyFileObject(incomplete)), task -> {
try {
CompilationUnitTree cut = task.parse().iterator().next();
String result = cut.toString().replaceAll("\\R", "\n");
System.out.println("RESULT\n" + result);
assertEquals("incorrect AST",
result,
"""
package t;
\n\
class Test {
\n\
void test(Object o) {
String s = STR.<error>;
}
}""");
return null;
} catch (IOException ex) {
throw new AssertionError(ex);
}
});
}
@Test //JDK-8295401
void testModuleInfoProvidesRecovery() throws IOException {
String code = """