From 123723a925bb53d9ecda92eda2cea50f224d9338 Mon Sep 17 00:00:00 2001 From: Christian Stein Date: Sun, 20 Aug 2017 16:56:29 +0200 Subject: [PATCH] Set supported Java source level to "9" Fixes #176 --- .../java/com/google/googlejavaformat/java/Formatter.java | 5 +++++ .../com/google/googlejavaformat/java/testdata/i176.input | 6 ++++++ .../com/google/googlejavaformat/java/testdata/i176.output | 7 +++++++ 3 files changed, 18 insertions(+) create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/i176.input create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/i176.output diff --git a/core/src/main/java/com/google/googlejavaformat/java/Formatter.java b/core/src/main/java/com/google/googlejavaformat/java/Formatter.java index 81e02b402..991ed3ec3 100644 --- a/core/src/main/java/com/google/googlejavaformat/java/Formatter.java +++ b/core/src/main/java/com/google/googlejavaformat/java/Formatter.java @@ -47,6 +47,7 @@ import org.openjdk.javax.tools.SimpleJavaFileObject; import org.openjdk.javax.tools.StandardLocation; import org.openjdk.tools.javac.file.JavacFileManager; +import org.openjdk.tools.javac.main.Option; import org.openjdk.tools.javac.parser.JavacParser; import org.openjdk.tools.javac.parser.ParserFactory; import org.openjdk.tools.javac.tree.JCTree.JCCompilationUnit; @@ -135,6 +136,10 @@ static void format( DiagnosticCollector diagnostics = new DiagnosticCollector<>(); context.put(DiagnosticListener.class, diagnostics); Options.instance(context).put("allowStringFolding", "false"); + // TODO(cushon): this should default to the latest supported source level, remove this after + // backing out + // https://github.com/google/error-prone-javac/commit/c97f34ddd2308302587ce2de6d0c984836ea5b9f + Options.instance(context).put(Option.SOURCE, "9"); JCCompilationUnit unit; JavacFileManager fileManager = new JavacFileManager(context, true, UTF_8); try { diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i176.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i176.input new file mode 100644 index 000000000..78aabff6d --- /dev/null +++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i176.input @@ -0,0 +1,6 @@ +interface +InterfaceWithPrivateStaticMethod +{ + private static void bar() { } + default void foo() { bar(); } +} diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i176.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i176.output new file mode 100644 index 000000000..0e33b9057 --- /dev/null +++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i176.output @@ -0,0 +1,7 @@ +interface InterfaceWithPrivateStaticMethod { + private static void bar() {} + + default void foo() { + bar(); + } +}