8000 Merge pull request #621 from sourcegraph/olafurpg/benchmarks · sourcegraph/scip-java@9a8200e · GitHub
[go: up one dir, main page]
Skip to content

Commit 9a8200e

Browse files
olafurpgolafurpg
authored
Merge pull request #621 from sourcegraph/olafurpg/benchmarks
Get benchmarks running correctly
2 parents d4bbe72 + 2ba1ec3 commit 9a8200e

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

‎semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import java.nio.file.Path;
66
import java.nio.file.Paths;
77
import java.util.ArrayList;
8-
import java.util.Arrays;
9-
import java.util.stream.Collectors;
108
import javax.tools.FileObject;
119
import javax.tools.JavaFileManager;
1210
import javax.tools.JavaFileObject;
@@ -31,8 +29,6 @@ public class SemanticdbJavacOptions {
3129
public NoRelativePathMode noRelativePath = NoRelativePathMode.INDEX_ANYWAY;
3230
public Path generatedTargetRoot;
3331

34-
public static String stubClassName = "META-INF-semanticdb-stub";
35-
3632
public SemanticdbJavacOptions() {
3733
errors = new ArrayList<>();
3834
}
@@ -133,9 +129,11 @@ private static TargetPaths getJavacClassesDir(SemanticdbJavacOptions result, Con
133129
try {
134130
JavaFileManager fm = ctx.get(JavaFileManager.class);
135131
FileObject sourceOutputDirStub =
136-
fm.getJavaFileForOutput(SOURCE_OUTPUT, stubClassName, JavaFileObject.Kind.SOURCE, null);
132+
fm.getJavaFileForOutput(
133+
SOURCE_OUTPUT, SemanticdbPlugin.stubClassName, JavaFileObject.Kind.SOURCE, null);
137134
FileObject clasSOutputDirStub =
138-
fm.getJavaFileForOutput(CLASS_OUTPUT, stubClassName, JavaFileObject.Kind.CLASS, null);
135+
fm.getJavaFileForOutput(
136+
CLASS_OUTPUT, SemanticdbPlugin.stubClassName, JavaFileObject.Kind.CLASS, null);
139137
classOutputDir = Paths.get(clasSOutputDirStub.toUri()).toAbsolutePath().getParent();
140138
sourceOutputDir = Paths.get(sourceOutputDirStub.toUri()).toAbsolutePath().getParent();
141139
} catch (Exception e) {

‎semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
/** Entrypoint of the semanticdb-javac compiler plugin. */
1010
public class SemanticdbPlugin implements Plugin {
1111

12+
public static String stubClassName = "META-INF-semanticdb-stub";
13+
1214
@Override
1315
public String getName() {
1416
return "semanticdb";

‎tests/unit/src/main/scala/tests/SimpleFileManager.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
import javax.tools.JavaFileObject;
1010
import javax.tools.StandardJavaFileManager;
1111

12-
import com.sourcegraph.semanticdb_javac.SemanticdbJavacOptions;
12+
import com.sourcegraph.semanticdb_javac.SemanticdbPlugin;
1313

14-
public class SimpleFileManager
15-
extends ForwardingJavaFileManager<StandardJavaFileManager> {
14+
public class SimpleFileManager extends ForwardingJavaFileManager<StandardJavaFileManager> {
1615

1716
public final List<SimpleClassFile> compiled = new ArrayList<>();
1817
public final Path targetroot;
@@ -25,15 +24,13 @@ protected SimpleFileManager(StandardJavaFileManager fileManager, Path targetroot
2524
// standard constructors/getters
2625

2726
@Override
28-
public JavaFileObject getJavaFileForOutput(Location location,
29-
String className, JavaFileObject.Kind kind, FileObject sibling) {
27+
public JavaFileObject getJavaFileForOutput(
28+
Location location, String className, JavaFileObject.Kind kind, FileObject sibling) {
3029
URI uri = targetroot.resolve(className).toUri();
3130
SimpleClassFile result = new SimpleClassFile(uri);
32-
if (!className.equals(SemanticdbJavacOptions.stubClassName)) {
31+
if (!className.equals(SemanticdbPlugin.stubClassName)) {
3332
compiled.add(result);
3433
}
3534
return result;
3635
}
37-
3836
}
39-

0 commit comments

Comments
 (0)
0