diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java index 334024f16..53d5245f5 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java @@ -5,8 +5,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Arrays; -import java.util.stream.Collectors; import javax.tools.FileObject; import javax.tools.JavaFileManager; import javax.tools.JavaFileObject; @@ -31,8 +29,6 @@ public class SemanticdbJavacOptions { public NoRelativePathMode noRelativePath = NoRelativePathMode.INDEX_ANYWAY; public Path generatedTargetRoot; - public static String stubClassName = "META-INF-semanticdb-stub"; - public SemanticdbJavacOptions() { errors = new ArrayList<>(); } @@ -133,9 +129,11 @@ private static TargetPaths getJavacClassesDir(SemanticdbJavacOptions result, Con try { JavaFileManager fm = ctx.get(JavaFileManager.class); FileObject sourceOutputDirStub = - fm.getJavaFileForOutput(SOURCE_OUTPUT, stubClassName, JavaFileObject.Kind.SOURCE, null); + fm.getJavaFileForOutput( + SOURCE_OUTPUT, SemanticdbPlugin.stubClassName, JavaFileObject.Kind.SOURCE, null); FileObject clasSOutputDirStub = - fm.getJavaFileForOutput(CLASS_OUTPUT, stubClassName, JavaFileObject.Kind.CLASS, null); + fm.getJavaFileForOutput( + CLASS_OUTPUT, SemanticdbPlugin.stubClassName, JavaFileObject.Kind.CLASS, null); classOutputDir = Paths.get(clasSOutputDirStub.toUri()).toAbsolutePath().getParent(); sourceOutputDir = Paths.get(sourceOutputDirStub.toUri()).toAbsolutePath().getParent(); } catch (Exception e) { diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java index 69408d612..816682c5b 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java @@ -9,6 +9,8 @@ /** Entrypoint of the semanticdb-javac compiler plugin. */ public class SemanticdbPlugin implements Plugin { + public static String stubClassName = "META-INF-semanticdb-stub"; + @Override public String getName() { return "semanticdb"; diff --git a/tests/unit/src/main/scala/tests/SimpleFileManager.java b/tests/unit/src/main/scala/tests/SimpleFileManager.java index 49c41ea29..c75b586b1 100644 --- a/tests/unit/src/main/scala/tests/SimpleFileManager.java +++ b/tests/unit/src/main/scala/tests/SimpleFileManager.java @@ -9,10 +9,9 @@ import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; -import com.sourcegraph.semanticdb_javac.SemanticdbJavacOptions; +import com.sourcegraph.semanticdb_javac.SemanticdbPlugin; -public class SimpleFileManager - extends ForwardingJavaFileManager { +public class SimpleFileManager extends ForwardingJavaFileManager { public final List compiled = new ArrayList<>(); public final Path targetroot; @@ -25,15 +24,13 @@ protected SimpleFileManager(StandardJavaFileManager fileManager, Path targetroot // standard constructors/getters @Override - public JavaFileObject getJavaFileForOutput(Location location, - String className, JavaFileObject.Kind kind, FileObject sibling) { + public JavaFileObject getJavaFileForOutput( + Location location, String className, JavaFileObject.Kind kind, FileObject sibling) { URI uri = targetroot.resolve(className).toUri(); SimpleClassFile result = new SimpleClassFile(uri); - if (!className.equals(SemanticdbJavacOptions.stubClassName)) { + if (!className.equals(SemanticdbPlugin.stubClassName)) { compiled.add(result); } return result; } - } -