Skip to content

Get benchmarks running correctly #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olafurpg merged 1 commit into from
Jul 26, 2023
Merged

Get benchmarks running correctly #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<>();
}
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
13 changes: 5 additions & 8 deletions tests/unit/src/main/scala/tests/SimpleFileManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<StandardJavaFileManager> {
public class SimpleFileManager extends ForwardingJavaFileManager<StandardJavaFileManager> {

public final List<SimpleClassFile> compiled = new ArrayList<>();
public final Path targetroot;
Expand All @@ -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;
}

}