Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion src/main/java/com/google/testing/compile/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ static ParseResult parse(Iterable<? extends JavaFileObject> sources, String sour
for (JavaFileObject source : sources) {
log.useSource(source);
JavacParser parser =
parserFactory.newParser(
newParser(
parserFactory,
source.getCharContent(false),
/* keepDocComments= */ true,
/* keepEndPos= */ true,
Expand All @@ -84,6 +85,31 @@ static ParseResult parse(Iterable<? extends JavaFileObject> sources, String sour
}
}

private static final boolean IS_END_POS_TABLE_PRESENT = getIsEndPosTablePresent();

private static boolean getIsEndPosTablePresent() {
try {
// JDK versions before https://bugs.openjdk.org/browse/JDK-8372948
Class.forName("com.sun.tools.javac.tree.EndPosTable");
return true;
} catch (ClassNotFoundException e) {
return false;
}
}

private static JavacParser newParser(
ParserFactory parserFactory,
CharSequence source,
boolean keepDocComments,
boolean keepEndPos,
boolean keepLineMap) {
if (IS_END_POS_TABLE_PRESENT) {
return parserFactory.newParser(source, keepDocComments, keepEndPos, keepLineMap);
}
return parserFactory.newParser(
source, keepDocComments, keepLineMap, /* parseModuleInfo */ false);
}

/** Returns {@code true} if errors were found while parsing source files. */
private static boolean foundParseErrors(List<Diagnostic<? extends JavaFileObject>> diagnostics) {
return diagnostics.stream().anyMatch(d -> d.getKind().equals(ERROR));
Expand Down
Loading