localDefinitions,
PackageTable packages,
- LsifSemanticdbOptions options) {
+ ScipSemanticdbOptions options) {
this.writer = writer;
this.globals = globals;
this.exportedSymbols = exportedSymbols;
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifByteOutputStream.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipByteOutputStream.java
similarity index 75%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifByteOutputStream.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipByteOutputStream.java
index d340c335..60dc97c1 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifByteOutputStream.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipByteOutputStream.java
@@ -1,14 +1,14 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import java.io.ByteArrayOutputStream;
import java.io.OutputStreamWriter;
/** Wrapper around a ByteArrayOutputStream and OutputStreamWriter. */
-public class LsifByteOutputStream {
+public class ScipByteOutputStream {
public final ByteArrayOutputStream output;
public final OutputStreamWriter writer;
- public LsifByteOutputStream() {
+ public ScipByteOutputStream() {
this.output = new ByteArrayOutputStream();
this.writer = new OutputStreamWriter(output);
}
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifOutputFormat.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputFormat.java
similarity index 61%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifOutputFormat.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputFormat.java
index 2c97a2a1..52b7faa3 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifOutputFormat.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputFormat.java
@@ -1,11 +1,11 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
/**
- * Whether to generate dump.lsif (JSON) or dump.lsif-protobuf (Protobuf).
+ * Whether to generate index.scip (JSON) or index.scip-protobuf (Protobuf).
*
* The Protobuf format is experimental and currently only exists as a proof-of-concept.
*/
-public enum LsifOutputFormat {
+public enum ScipOutputFormat {
GRAPH_NDJSON,
GRAPH_PROTOBUF,
TYPED_PROTOBUF,
@@ -20,11 +20,11 @@ public boolean isNewlineDelimitedJSON() {
return this == GRAPH_NDJSON || this == TYPED_NDJSON;
}
- public static LsifOutputFormat fromFilename(String name) {
+ public static ScipOutputFormat fromFilename(String name) {
if (name.endsWith(".lsif")) return GRAPH_NDJSON;
if (name.endsWith(".lsif-protobuf")) return GRAPH_PROTOBUF;
- if (name.endsWith(".lsif-typed")) return TYPED_PROTOBUF;
- if (name.endsWith(".lsif-typed.ndjson")) return TYPED_NDJSON;
+ if (name.endsWith(".scip")) return TYPED_PROTOBUF;
+ if (name.endsWith(".scip.ndjson")) return TYPED_NDJSON;
return UNKNOWN;
}
}
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifOutputStream.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputStream.java
similarity index 84%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifOutputStream.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputStream.java
index 2a27f3ea..3eaf6af5 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifOutputStream.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputStream.java
@@ -1,4 +1,4 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import com.google.protobuf.Descriptors.FieldDescriptor;
import com.google.protobuf.util.JsonFormat;
@@ -13,18 +13,18 @@
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.atomic.AtomicBoolean;
-/** Low-level methods to write raw LSIF objects into the output stream. */
-public class LsifOutputStream {
- private final LsifSemanticdbOptions options;
+/** Low-level methods to write raw SCIP objects into the output stream. */
+public class ScipOutputStream {
+ private final ScipSemanticdbOptions options;
private final OutputStream out;
private final ConcurrentLinkedDeque buffer;
private final AtomicBoolean isFlushing;
private static final byte[] NEWLINE = "\n".getBytes(StandardCharsets.UTF_8);
- private final ThreadLocal baos =
- ThreadLocal.withInitial(LsifByteOutputStream::new);
+ private final ThreadLocal baos =
+ ThreadLocal.withInitial(ScipByteOutputStream::new);
private final Printer jsonPrinter;
- public LsifOutputStream(LsifSemanticdbOptions options, OutputStream out) {
+ public ScipOutputStream(ScipSemanticdbOptions options, OutputStream out) {
this.options = options;
this.out = out;
buffer = new ConcurrentLinkedDeque<>();
@@ -45,7 +45,7 @@ public void write(byte[] bytes) {
}
public void writeLsifObject(LsifObject.Builder object) {
- LsifByteOutputStream b = baos.get();
+ ScipByteOutputStream b = baos.get();
b.output.reset();
try {
switch (options.format) {
diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipProcessingException.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipProcessingException.java
new file mode 100644
index 00000000..79ceb717
--- /dev/null
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipProcessingException.java
@@ -0,0 +1,13 @@
+package com.sourcegraph.scip_semanticdb;
+
+public class ScipProcessingException extends Throwable {
+
+ public ScipProcessingException(ScipTextDocument doc, Throwable cause) {
+ super(doc.semanticdbPath.toString(), cause);
+ }
+
+ @Override
+ public Throwable fillInStackTrace() {
+ return this;
+ }
+}
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdb.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
similarity index 87%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdb.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
index 5fa76ef2..62e6402c 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdb.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
@@ -1,4 +1,4 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import com.google.protobuf.CodedInputStream;
import com.sourcegraph.lsif_protocol.MarkupKind;
@@ -7,7 +7,7 @@
import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence;
import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role;
import com.sourcegraph.semanticdb_javac.SemanticdbSymbols;
-import lib.codeintel.lsif_typed.LsifTyped;
+import lib.codeintel.scip.Scip;
import java.io.IOException;
import java.io.InputStream;
@@ -21,21 +21,21 @@
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-/** The core logic that converts SemanticDB into LSIF. */
-public class LsifSemanticdb {
- private final LsifWriter writer;
- private final LsifSemanticdbOptions options;
+/** The core logic that converts SemanticDB into SCIP. */
+public class ScipSemanticdb {
+ private final ScipWriter writer;
+ private final ScipSemanticdbOptions options;
private final Map globals;
- public LsifSemanticdb(LsifWriter writer, LsifSemanticdbOptions options) {
+ public ScipSemanticdb(ScipWriter writer, ScipSemanticdbOptions options) {
this.writer = writer;
this.options = options;
this.globals = new ConcurrentHashMap<>();
}
- public static void run(LsifSemanticdbOptions options) throws IOException {
- LsifWriter writer = new LsifWriter(options);
- new LsifSemanticdb(writer, options).run();
+ public static void run(ScipSemanticdbOptions options) throws IOException {
+ ScipWriter writer = new ScipWriter(options);
+ new ScipSemanticdb(writer, options).run();
}
private void run() throws IOException {
@@ -46,11 +46,11 @@ private void run() throws IOException {
if (files.isEmpty()) {
options.reporter.error(
"No SemanticDB files found. "
- + "This typically means that `lsif-java` is unable to automatically "
+ + "This typically means that `scip-java` is unable to automatically "
+ "index this codebase. If you are using Gradle or Maven, please report an issue to "
- + "https://github.com/sourcegraph/lsif-java and include steps to reproduce. "
+ + "https://github.com/sourcegraph/scip-java and include steps to reproduce. "
+ "If you are using a different build tool, make sure that you have followed all "
- + "of the steps from https://sourcegraph.github.io/lsif-java/docs/manual-configuration.html");
+ + "of the steps from https://sourcegraph.github.io/scip-java/docs/manual-configuration.html");
return;
}
options.reporter.startProcessing(files.size());
@@ -80,7 +80,7 @@ public static boolean isDefinitionRole(Role role) {
}
private void processTypedDocument(Path path, PackageTable packages) {
- for (LsifTextDocument doc : parseTextDocument(path).collect(Collectors.toList())) {
+ for (ScipTextDocument doc : parseTextDocument(path).collect(Collectors.toList())) {
if (doc.semanticdb.getOccurrencesCount() == 0) {
continue;
}
@@ -90,12 +90,11 @@ private void processTypedDocument(Path path, PackageTable packages) {
StreamSupport.stream(options.sourceroot.relativize(absolutePath).spliterator(), false)
.map(p -> p.getFileName().toString())
.collect(Collectors.joining("/"));
- LsifTyped.Document.Builder tdoc =
- LsifTyped.Document.newBuilder().setRelativePath(relativePath);
+ Scip.Document.Builder tdoc = Scip.Document.newBuilder().setRelativePath(relativePath);
for (SymbolOccurrence occ : doc.sortedSymbolOccurrences()) {
int role = 0;
if (isDefinitionRole(occ.getRole())) {
- role |= LsifTyped.SymbolRole.Definition_VALUE;
+ role |= Scip.SymbolRole.Definition_VALUE;
}
boolean isSingleLineRange = occ.getRange().getStartLine() == occ.getRange().getEndLine();
Iterable range =
@@ -111,7 +110,7 @@ private void processTypedDocument(Path path, PackageTable packages) {
occ.getRange().getEndCharacter());
Package pkg = packages.packageForSymbol(occ.getSymbol()).orElse(Package.EMPTY);
tdoc.addOccurrences(
- LsifTyped.Occurrence.newBuilder()
+ Scip.Occurrence.newBuilder()
.addAllRange(range)
.setSymbol(typedSymbol(occ.getSymbol(), pkg))
.setSymbolRoles(role));
@@ -119,8 +118,8 @@ private void processTypedDocument(Path path, PackageTable packages) {
Symtab symtab = new Symtab(doc.semanticdb);
for (SymbolInformation info : doc.semanticdb.getSymbolsList()) {
Package pkg = packages.packageForSymbol(info.getSymbol()).orElse(Package.EMPTY);
- LsifTyped.SymbolInformation.Builder tinfo =
- LsifTyped.SymbolInformation.newBuilder().setSymbol(typedSymbol(info.getSymbol(), pkg));
+ Scip.SymbolInformation.Builder tinfo =
+ Scip.SymbolInformation.newBuilder().setSymbol(typedSymbol(info.getSymbol(), pkg));
for (String overriddenSymbol : info.getOverriddenSymbolsList()) {
if (isIgnoredOverriddenSymbol(overriddenSymbol)) {
@@ -129,7 +128,7 @@ private void processTypedDocument(Path path, PackageTable packages) {
Package overriddenSymbolPkg =
packages.packageForSymbol(overriddenSymbol).orElse(Package.EMPTY);
tinfo.addRelationships(
- LsifTyped.Relationship.newBuilder()
+ Scip.Relationship.newBuilder()
.setSymbol(typedSymbol(overriddenSymbol, overriddenSymbolPkg))
.setIsImplementation(true)
.setIsReference(SemanticdbSymbols.isMethod(info.getSymbol())));
@@ -146,19 +145,19 @@ private void processTypedDocument(Path path, PackageTable packages) {
}
tdoc.addSymbols(tinfo);
}
- writer.emitTyped(LsifTyped.Index.newBuilder().addDocuments(tdoc).build());
+ writer.emitTyped(Scip.Index.newBuilder().addDocuments(tdoc).build());
}
}
- private LsifTyped.Index typedMetadata() {
- return LsifTyped.Index.newBuilder()
+ private Scip.Index typedMetadata() {
+ return Scip.Index.newBuilder()
.setMetadata(
- LsifTyped.Metadata.newBuilder()
- .setVersion(LsifTyped.ProtocolVersion.UnspecifiedProtocolVersion)
+ Scip.Metadata.newBuilder()
+ .setVersion(Scip.ProtocolVersion.UnspecifiedProtocolVersion)
.setProjectRoot(options.sourceroot.toUri().toString())
- .setTextDocumentEncoding(LsifTyped.TextEncoding.UTF8)
+ .setTextDocumentEncoding(Scip.TextEncoding.UTF8)
.setToolInfo(
- LsifTyped.ToolInfo.newBuilder()
+ Scip.ToolInfo.newBuilder()
.setName(options.toolInfo.getName())
.setVersion(options.toolInfo.getVersion())
.addAllArguments(options.toolInfo.getArgsList())))
@@ -199,17 +198,17 @@ private Stream processPath(
}
private Stream processDocument(
- LsifTextDocument doc, Set isExportedSymbol, PackageTable packages) {
+ ScipTextDocument doc, Set isExportedSymbol, PackageTable packages) {
try {
return Stream.of(processDocumentUnsafe(doc, isExportedSymbol, packages));
} catch (Exception e) {
- options.reporter.error(new LsifProcessingException(doc, e));
+ options.reporter.error(new ScipProcessingException(doc, e));
return Stream.empty();
}
}
private Integer processDocumentUnsafe(
- LsifTextDocument doc, Set isExportedSymbol, PackageTable packages) {
+ ScipTextDocument doc, Set isExportedSymbol, PackageTable packages) {
Symtab symtab = new Symtab(doc.semanticdb);
int documentId = writer.emitDocument(doc);
@@ -311,11 +310,11 @@ private Integer processDocumentUnsafe(
return documentId;
}
- private Stream parseTextDocument(Path semanticdbPath) {
+ private Stream parseTextDocument(Path semanticdbPath) {
try {
return textDocumentsParseFrom(semanticdbPath).getDocumentsList().stream()
.filter(sdb -> !sdb.getOccurrencesList().isEmpty())
- .map(sdb -> new LsifTextDocument(semanticdbPath, sdb, options.sourceroot));
+ .map(sdb -> new ScipTextDocument(semanticdbPath, sdb, options.sourceroot));
} catch (IOException e) {
options.reporter.error("invalid protobuf: " + semanticdbPath);
options.reporter.error(e);
@@ -356,7 +355,7 @@ private Semanticdb.TextDocuments textDocumentsParseFromBytes(byte[] bytes) throw
// NOTE(olafur): For some reason, NoSuchMethodError gets thrown when running `snapshots/run`
// in the sbt build. I'm unable to reproduce the error in `snapshots/test` or when running the
// published version
- // of `lsif-java index`.
+ // of `scip-java index`.
return Semanticdb.TextDocuments.parseFrom(bytes);
}
}
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdbOptions.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbOptions.java
similarity index 73%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdbOptions.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbOptions.java
index c592cf5c..dfc61c4a 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdbOptions.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbOptions.java
@@ -1,31 +1,31 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import com.sourcegraph.lsif_protocol.LsifToolInfo;
import java.nio.file.Path;
import java.util.List;
-/** Configuration options to tweak the lsif-semanticdb command. */
-public class LsifSemanticdbOptions {
+/** Configuration options to tweak the scip-semanticdb command. */
+public class ScipSemanticdbOptions {
public final List targetroots;
public final Path output;
public final Path sourceroot;
- public final LsifSemanticdbReporter reporter;
+ public final ScipSemanticdbReporter reporter;
public final LsifToolInfo toolInfo;
public final String language;
- public final LsifOutputFormat format;
+ public final ScipOutputFormat format;
public final boolean parallel;
public final List packages;
public final String buildKind;
- public LsifSemanticdbOptions(
+ public ScipSemanticdbOptions(
List targetroots,
Path output,
Path sourceroot,
- LsifSemanticdbReporter reporter,
+ ScipSemanticdbReporter reporter,
LsifToolInfo toolInfo,
String language,
- LsifOutputFormat format,
+ ScipOutputFormat format,
boolean parallel,
List packages,
String buildKind) {
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdbReporter.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbReporter.java
similarity index 64%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdbReporter.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbReporter.java
index a2a8e3e0..c42992b8 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdbReporter.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbReporter.java
@@ -1,12 +1,12 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
/**
- * API to hook into the event stream of the lsif-semanticdb command.
+ * API to hook into the event stream of the scip-semanticdb command.
*
- * The lsif-semanticdb command doesn't fail fast on the first error. Clients are expected to
+ *
The scip-semanticdb command doesn't fail fast on the first error. Clients are expected to
* handle errors through the error method.
*/
-public abstract class LsifSemanticdbReporter {
+public abstract class ScipSemanticdbReporter {
public void error(Throwable e) {}
public void error(String message) {
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifTextDocument.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipTextDocument.java
similarity index 96%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifTextDocument.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipTextDocument.java
index 74e13596..ab89b10c 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifTextDocument.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipTextDocument.java
@@ -1,4 +1,4 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import com.sourcegraph.semanticdb_javac.Semanticdb;
import com.sourcegraph.semanticdb_javac.SemanticdbSymbols;
@@ -6,15 +6,15 @@
import java.nio.file.Path;
import java.util.*;
-/** Wrapper around a SemanticDB TextDocument with LSIF-related utilities. */
-public class LsifTextDocument {
+/** Wrapper around a SemanticDB TextDocument with SCIP-related utilities. */
+public class ScipTextDocument {
public final Path semanticdbPath;
public Semanticdb.TextDocument semanticdb;
public int id;
public final Map symbols;
public final Map localSymbols;
- public LsifTextDocument(
+ public ScipTextDocument(
Path semanticdbPath, Semanticdb.TextDocument semanticdb, Path sourceroot) {
this.semanticdbPath = semanticdbPath;
this.symbols = new HashMap<>();
@@ -25,7 +25,7 @@ public LsifTextDocument(
@Override
public String toString() {
- return "LsifDocument{"
+ return "ScipDocument{"
+ "path="
+ semanticdbPath
+ ", semanticdb="
@@ -36,7 +36,7 @@ public String toString() {
}
public List sortedSymbolOccurrences() {
- return LsifTextDocument.sortedSymbolOccurrences(semanticdb);
+ return ScipTextDocument.sortedSymbolOccurrences(semanticdb);
}
public static List sortedSymbolOccurrences(
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifWriter.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java
similarity index 70%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifWriter.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java
index d4fd88dd..8ec8237c 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifWriter.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java
@@ -1,4 +1,4 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import com.sourcegraph.lsif_protocol.LsifHover;
import com.sourcegraph.lsif_protocol.LsifHover.Content;
@@ -6,7 +6,7 @@
import com.sourcegraph.lsif_protocol.LsifPosition;
import com.sourcegraph.semanticdb_javac.Semanticdb;
import com.sourcegraph.semanticdb_javac.SemanticdbSymbols;
-import lib.codeintel.lsif_typed.LsifTyped;
+import lib.codeintel.scip.Scip;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -20,36 +20,36 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-/** High-level utility methods to write LSIF vertex/edge objects into the LSIF output stream. */
-public class LsifWriter implements AutoCloseable {
+/** High-level utility methods to write SCIP vertex/edge objects into the SCIP output stream. */
+public class ScipWriter implements AutoCloseable {
private final Path tmp;
- private final LsifOutputStream output;
- private final LsifSemanticdbOptions options;
+ private final ScipOutputStream output;
+ private final ScipSemanticdbOptions options;
private final AtomicInteger id = new AtomicInteger();
- public LsifWriter(LsifSemanticdbOptions options) throws IOException {
+ public ScipWriter(ScipSemanticdbOptions options) throws IOException {
if (OperatingSystem.isWindows()) {
- this.tmp = Files.createTempFile("lsif-semanticdb", "dump.lsif");
+ this.tmp = Files.createTempFile("scip-semanticdb", "index.scip");
} else {
this.tmp =
Files.createTempFile(
- "lsif-semanticdb",
- "dump.lsif",
+ "scip-semanticdb",
+ "index.scip",
PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-r--r--")));
}
this.output =
- new LsifOutputStream(options, new BufferedOutputStream(Files.newOutputStream(tmp)));
+ new ScipOutputStream(options, new BufferedOutputStream(Files.newOutputStream(tmp)));
this.options = options;
}
- public void emitTyped(LsifTyped.Index index) {
+ public void emitTyped(Scip.Index index) {
this.output.write(index.toByteArray());
}
public void emitMetaData() {
emitObject(
- lsifVertex("metaData")
+ scipVertex("metaData")
.setVersion("0.4.3")
.setProjectRoot(options.sourceroot.toUri().toString())
.setPositionEncoding("utf-16")
@@ -57,23 +57,23 @@ public void emitMetaData() {
}
public int emitProject(String language) {
- return emitObject(lsifVertex("project").setKind(language));
+ return emitObject(scipVertex("project").setKind(language));
}
- public int emitDocument(LsifTextDocument doc) {
+ public int emitDocument(ScipTextDocument doc) {
return emitObject(
- lsifVertex("document")
+ scipVertex("document")
.setUri(doc.semanticdb.getUri())
.setLanguage(doc.semanticdb.getLanguage().toString().toLowerCase()));
}
public void emitContains(int outV, List inVs) {
- emitObject(lsifEdge("contains").setOutV(outV).addAllInVs(inVs));
+ emitObject(scipEdge("contains").setOutV(outV).addAllInVs(inVs));
}
public int emitRange(Semanticdb.Range range) {
return emitObject(
- lsifVertex("range")
+ scipVertex("range")
.setStart(
LsifPosition.newBuilder()
.setLine(range.getStartLine())
@@ -85,32 +85,32 @@ public int emitRange(Semanticdb.Range range) {
}
public int emitResultSet() {
- return emitObject(lsifVertex("resultSet"));
+ return emitObject(scipVertex("resultSet"));
}
public void emitNext(int outV, int inV) {
- emitObject(lsifEdge("next").setOutV(outV).setInV(inV));
+ emitObject(scipEdge("next").setOutV(outV).setInV(inV));
}
public void emitEdge(String label, int outV, int inV) {
- emitObject(lsifEdge(label).setOutV(outV).setInV(inV));
+ emitObject(scipEdge(label).setOutV(outV).setInV(inV));
}
public int emitReferenceResult(int resultSet) {
- int referenceResult = emitObject(lsifVertex("referenceResult"));
+ int referenceResult = emitObject(scipVertex("referenceResult"));
emitEdge("textDocument/references", resultSet, referenceResult);
return referenceResult;
}
public int emitDefinitionResult(int resultSet) {
- int definitionResult = emitObject(lsifVertex("definitionResult"));
+ int definitionResult = emitObject(scipVertex("definitionResult"));
emitEdge("textDocument/definition", resultSet, definitionResult);
return definitionResult;
}
public int emitHoverResult(MarkupContent markupContents) {
return emitObject(
- lsifVertex("hoverResult")
+ scipVertex("hoverResult")
.setResult(
LsifHover.newBuilder()
.setContents(
@@ -120,39 +120,39 @@ public int emitHoverResult(MarkupContent markupContents) {
}
public void emitHoverEdge(int outV, int inV) {
- emitObject(lsifEdge("textDocument/hover").setOutV(outV).setInV(inV));
+ emitObject(scipEdge("textDocument/hover").setOutV(outV).setInV(inV));
}
public void emitMonikerEdge(int outV, int inV) {
- emitObject(lsifEdge("moniker").setOutV(outV).setInV(inV));
+ emitObject(scipEdge("moniker").setOutV(outV).setInV(inV));
}
public int emitMonikerVertex(String symbol, boolean isExportedSymbol) {
String kind =
SemanticdbSymbols.isLocal(symbol) ? "local" : isExportedSymbol ? "export" : "import";
return emitObject(
- lsifVertex("moniker").setKind(kind).setScheme("semanticdb").setIdentifier(symbol));
+ scipVertex("moniker").setKind(kind).setScheme("semanticdb").setIdentifier(symbol));
}
public void emitPackageInformationEdge(int monikerId, int packageId) {
- emitObject(lsifEdge("packageInformation").setOutV(monikerId).setInV(packageId));
+ emitObject(scipEdge("packageInformation").setOutV(monikerId).setInV(packageId));
}
public int emitpackageinformationVertex(Package pkg) {
return emitObject(
- lsifVertex("packageInformation")
+ scipVertex("packageInformation")
.setName(pkg.repoName())
.setManager("jvm-dependencies")
.setVersion(pkg.version()));
}
public void emitItem(int outV, int inV, int document) {
- emitObject(lsifEdge("item").setOutV(outV).addInVs(inV).setDocument(document));
+ emitObject(scipEdge("item").setOutV(outV).addInVs(inV).setDocument(document));
}
public void emitReferenceResultsItemEdge(int outV, Iterable inVs, int document) {
emitObject(
- lsifEdge("item")
+ scipEdge("item")
.setOutV(outV)
.addAllInVs(inVs)
.setDocument(document)
@@ -182,16 +182,16 @@ public int emitObject(LsifObject.Builder object) {
return object.getId();
}
- private LsifObject.Builder lsifObject() {
+ private LsifObject.Builder scipObject() {
return LsifObject.newBuilder().setId(nextId());
}
- private LsifObject.Builder lsifEdge(String label) {
- return lsifObject().setType("edge").setLabel(label);
+ private LsifObject.Builder scipEdge(String label) {
+ return scipObject().setType("edge").setLabel(label);
}
- private LsifObject.Builder lsifVertex(String label) {
- return lsifObject().setType("vertex").setLabel(label);
+ private LsifObject.Builder scipVertex(String label) {
+ return scipObject().setType("vertex").setLabel(label);
}
private int nextId() {
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SemanticdbTreeVisitor.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbTreeVisitor.java
similarity index 98%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SemanticdbTreeVisitor.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbTreeVisitor.java
index da82567a..3ecd82a4 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SemanticdbTreeVisitor.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbTreeVisitor.java
@@ -1,4 +1,4 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import com.sourcegraph.semanticdb_javac.Semanticdb.*;
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SemanticdbWalker.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbWalker.java
similarity index 87%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SemanticdbWalker.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbWalker.java
index b092973d..c0cd0a71 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SemanticdbWalker.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SemanticdbWalker.java
@@ -1,4 +1,4 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import java.io.IOException;
import java.nio.file.FileSystems;
@@ -14,11 +14,11 @@
/** A file visitor that recursively collects all SemanticDB files in a given directory. */
public class SemanticdbWalker extends SimpleFileVisitor {
private final ArrayList result;
- private final LsifSemanticdbOptions options;
+ private final ScipSemanticdbOptions options;
private final PathMatcher semanticdbPattern =
FileSystems.getDefault().getPathMatcher("glob:**.semanticdb");
- public SemanticdbWalker(LsifSemanticdbOptions options) {
+ public SemanticdbWalker(ScipSemanticdbOptions options) {
this.options = options;
result = new ArrayList<>();
}
@@ -37,7 +37,7 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) {
return FileVisitResult.CONTINUE;
}
- public static List findSemanticdbFiles(LsifSemanticdbOptions options) throws IOException {
+ public static List findSemanticdbFiles(ScipSemanticdbOptions options) throws IOException {
SemanticdbWalker walker = new SemanticdbWalker(options);
PathMatcher jarPattern = FileSystems.getDefault().getPathMatcher("glob:**.jar");
for (Path root : options.targetroots) {
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatter.java
similarity index 99%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatter.java
index 72050b90..43efa6ab 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatter.java
@@ -1,4 +1,4 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation.Property;
import com.sourcegraph.semanticdb_javac.Semanticdb.*;
@@ -226,7 +226,7 @@ private void formatMethodSignature(MethodSignature methodSignature) {
if (symbolInformation.getKind() == SymbolInformation.Kind.CONSTRUCTOR) {
String owner = SymbolDescriptor.parseFromSymbol(symbolInformation.getSymbol()).owner;
- // Fix for https://github.com/sourcegraph/lsif-java/issues/150
+ // Fix for https://github.com/sourcegraph/scip-java/issues/150
if (!owner.equals(SemanticdbSymbols.NONE)) {
s.append(SymbolDescriptor.parseFromSymbol(owner).descriptor.name);
}
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatterException.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatterException.java
similarity index 93%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatterException.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatterException.java
index 636f8c20..5c094aeb 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatterException.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatterException.java
@@ -1,4 +1,4 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import com.sourcegraph.semanticdb_javac.Semanticdb;
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SymbolDescriptor.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolDescriptor.java
similarity index 99%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SymbolDescriptor.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolDescriptor.java
index a9da8f1c..77bfb32a 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SymbolDescriptor.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolDescriptor.java
@@ -1,4 +1,4 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import com.sourcegraph.semanticdb_javac.SemanticdbSymbols;
import com.sourcegraph.semanticdb_javac.SemanticdbSymbols.Descriptor;
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SymbolOccurrences.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolOccurrences.java
similarity index 94%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SymbolOccurrences.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolOccurrences.java
index 82908200..b4d30949 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SymbolOccurrences.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolOccurrences.java
@@ -1,4 +1,4 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import com.sourcegraph.semanticdb_javac.Semanticdb;
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/Symtab.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Symtab.java
similarity index 95%
rename from lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/Symtab.java
rename to scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Symtab.java
index f066d2dd..5324df0e 100644
--- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/Symtab.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Symtab.java
@@ -1,4 +1,4 @@
-package com.sourcegraph.lsif_semanticdb;
+package com.sourcegraph.scip_semanticdb;
import com.sourcegraph.semanticdb_javac.Semanticdb;
diff --git a/lsif-semanticdb/src/main/protobuf/bazelbuild.proto b/scip-semanticdb/src/main/protobuf/bazelbuild.proto
similarity index 99%
rename from lsif-semanticdb/src/main/protobuf/bazelbuild.proto
rename to scip-semanticdb/src/main/protobuf/bazelbuild.proto
index 97334f51..f95dbc70 100644
--- a/lsif-semanticdb/src/main/protobuf/bazelbuild.proto
+++ b/scip-semanticdb/src/main/protobuf/bazelbuild.proto
@@ -21,7 +21,7 @@ package bazel_query;
// option cc_api_version = 2;
// option java_api_version = 1;
-option java_package = "com.sourcegraph.lsif_java";
+option java_package = "com.sourcegraph.scip_java";
message License {
repeated string license_type = 1;
diff --git a/lsif-semanticdb/src/main/protobuf/lsif.proto b/scip-semanticdb/src/main/protobuf/lsif.proto
similarity index 99%
rename from lsif-semanticdb/src/main/protobuf/lsif.proto
rename to scip-semanticdb/src/main/protobuf/lsif.proto
index 22440081..70654279 100644
--- a/lsif-semanticdb/src/main/protobuf/lsif.proto
+++ b/scip-semanticdb/src/main/protobuf/lsif.proto
@@ -1,6 +1,7 @@
syntax = "proto3";
option java_multiple_files = true;
+
package com.sourcegraph.lsif_protocol;
message LsifObject {
diff --git a/lsif-semanticdb/src/main/protobuf/lsif-typed.proto b/scip-semanticdb/src/main/protobuf/scip.proto
similarity index 99%
rename from lsif-semanticdb/src/main/protobuf/lsif-typed.proto
rename to scip-semanticdb/src/main/protobuf/scip.proto
index 9469a81b..6e0b8cc6 100644
--- a/lsif-semanticdb/src/main/protobuf/lsif-typed.proto
+++ b/scip-semanticdb/src/main/protobuf/scip.proto
@@ -10,11 +10,11 @@
syntax = "proto3";
-package lib.codeintel.lsif_typed;
+package lib.codeintel.scip;
-option go_package = "github.com/sourcegraph/sourcegraph/lib/codeintel/lsif_typed/";
+option go_package = "github.com/sourcegraph/sourcegraph/lib/codeintel/scip/";
-// Index represents a complete LSIF index for a workspace this is rooted at a
+// Index represents a complete SCIP index for a workspace this is rooted at a
// single directory. An Index message payload can have a large memory footprint
// and it's therefore recommended to emit and consume an Index payload one field
// value at a time. To permit streaming consumption of an Index payload, the
diff --git a/semanticdb-agent/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbAgent.java b/semanticdb-agent/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbAgent.java
index e147bcc1..5b1bb187 100644
--- a/semanticdb-agent/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbAgent.java
+++ b/semanticdb-agent/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbAgent.java
@@ -71,7 +71,7 @@ public static void premain(String agentArgs, Instrumentation inst) {
}
private static PrintStream newLogger() {
- Path path = Paths.get(System.getProperty("user.home"), ".lsif-java", "logs.txt");
+ Path path = Paths.get(System.getProperty("user.home"), ".scip-java", "logs.txt");
try {
Files.createDirectories(path.getParent());
OutputStream fos =
diff --git a/semanticdb-java/src/main/protobuf/semanticdb.proto b/semanticdb-java/src/main/protobuf/semanticdb.proto
index 382f2425..e8fea62d 100644
--- a/semanticdb-java/src/main/protobuf/semanticdb.proto
+++ b/semanticdb-java/src/main/protobuf/semanticdb.proto
@@ -170,8 +170,8 @@ message SymbolOccurrence {
REFERENCE = 1;
DEFINITION = 2;
// NOTE: this role does not exist in the upstream SemanticDB spec.
- // WE added SYNTHETIC_DEFINITION fix the following lsif-java issue:
- // https://github.com/sourcegraph/lsif-java/issues/399
+ // WE added SYNTHETIC_DEFINITION fix the following scip-java issue:
+ // https://github.com/sourcegraph/scip-java/issues/399
SYNTHETIC_DEFINITION = 3;
}
Range range = 1;
diff --git a/semanticdb-javac/defs.bzl b/semanticdb-javac/defs.bzl
index 05310045..8890eb97 100644
--- a/semanticdb-javac/defs.bzl
+++ b/semanticdb-javac/defs.bzl
@@ -16,12 +16,12 @@ def java_binary(javacopts=[], plugins=[],**kwargs):
def _actual_javacopts(javacopts):
return select({
- "@lsif_java//semanticdb-javac:is_enabled": ["'-Xplugin:semanticdb -build-tool:bazel'"] + javacopts,
+ "@scip_java//semanticdb-javac:is_enabled": ["'-Xplugin:semanticdb -build-tool:bazel'"] + javacopts,
"//conditions:default": javacopts,
})
def _actual_plugins(plugins):
return select({
- "@lsif_java//semanticdb-javac:is_enabled": ["@lsif_java//semanticdb-javac:plugin"] + plugins,
+ "@scip_java//semanticdb-javac:is_enabled": ["@scip_java//semanticdb-javac:plugin"] + plugins,
"//conditions:default": plugins,
})
diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java
index 61c59965..ffb803e6 100644
--- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java
+++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java
@@ -129,7 +129,7 @@ public static Path absolutePathFromUri(SemanticdbJavacOptions options, JavaFileO
}
// Infers the `-sourceroot:` flag from the provided file.
- // FIXME: add unit tests https://github.com/sourcegraph/lsif-java/issues/444
+ // FIXME: add unit tests https://github.com/sourcegraph/scip-java/issues/444
private void inferBazelSourceroot(JavaFileObject file) {
if (options.uriScheme != UriScheme.BAZEL || options.sourceroot != null) {
return;
diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java
index 9bb622bb..120b449e 100644
--- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java
+++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java
@@ -157,7 +157,7 @@ public Void visitClass(ClassTree node, Void unused) {
for (Symbol.TypeVariableSymbol typeSym : cls.sym.getTypeParameters()) {
if (i >= typeParameters.size()) {
// Happens in testcontainers/testcontainers-java, see
- // https://github.com/sourcegraph/lsif-java/issues/319
+ // https://github.com/sourcegraph/scip-java/issues/319
// Failed to reproduce with a minimal source file so we don't have a test case that hits
// this branch.
break;
diff --git a/tests/benchmarks/src/main/scala/benchmarks/CompileBench.scala b/tests/benchmarks/src/main/scala/benchmarks/CompileBench.scala
index 49c88745..00264ca0 100644
--- a/tests/benchmarks/src/main/scala/benchmarks/CompileBench.scala
+++ b/tests/benchmarks/src/main/scala/benchmarks/CompileBench.scala
@@ -11,7 +11,7 @@ import scala.meta.internal.io.FileIO
import scala.meta.io.AbsolutePath
import com.sourcegraph.io.DeleteVisitor
-import com.sourcegraph.lsif_java.Dependencies
+import com.sourcegraph.scip_java.Dependencies
import org.openjdk.jmh.annotations._
import tests.TestCompiler
diff --git a/tests/benchmarks/src/main/scala/benchmarks/LsifSemanticdbBench.scala b/tests/benchmarks/src/main/scala/benchmarks/ScipSemanticdbBench.scala
similarity index 74%
rename from tests/benchmarks/src/main/scala/benchmarks/LsifSemanticdbBench.scala
rename to tests/benchmarks/src/main/scala/benchmarks/ScipSemanticdbBench.scala
index 4f5469af..df37874a 100644
--- a/tests/benchmarks/src/main/scala/benchmarks/LsifSemanticdbBench.scala
+++ b/tests/benchmarks/src/main/scala/benchmarks/ScipSemanticdbBench.scala
@@ -5,20 +5,20 @@ import java.nio.file.Path
import java.util.concurrent.TimeUnit
import com.sourcegraph.io.DeleteVisitor
-import com.sourcegraph.lsif_java.Dependencies
-import com.sourcegraph.lsif_java.LsifJava
+import com.sourcegraph.scip_java.Dependencies
+import com.sourcegraph.scip_java.ScipJava
import org.openjdk.jmh.annotations._
import tests.TestCompiler
@State(Scope.Benchmark)
-class LsifSemanticdbBench {
+class ScipSemanticdbBench {
var targetroot: Path = _
var deps: Dependencies = _
@Setup
def setup(): Unit = {
- targetroot = Files.createTempDirectory("lsif-java")
+ targetroot = Files.createTempDirectory("scip-java")
deps = Dependencies
.resolveDependencies(List("com.google.guava:guava:30.1-jre"))
val compiler =
@@ -41,31 +41,31 @@ class LsifSemanticdbBench {
@Benchmark
@BenchmarkMode(Array(Mode.SingleShotTime))
@OutputTimeUnit(TimeUnit.MILLISECONDS)
- def jsonParallel(): Unit = run("dump.lsif", parallel = true)
+ def jsonParallel(): Unit = run("index.scip", parallel = true)
@Benchmark
@BenchmarkMode(Array(Mode.SingleShotTime))
@OutputTimeUnit(TimeUnit.MILLISECONDS)
- def json(): Unit = run("dump.lsif", parallel = false)
+ def json(): Unit = run("index.scip", parallel = false)
@Benchmark
@BenchmarkMode(Array(Mode.SingleShotTime))
@OutputTimeUnit(TimeUnit.MILLISECONDS)
- def protobufParallel(): Unit = run("dump.lsif-protobuf", parallel = true)
+ def protobufParallel(): Unit = run("index.scip-protobuf", parallel = true)
@Benchmark
@BenchmarkMode(Array(Mode.SingleShotTime))
@OutputTimeUnit(TimeUnit.MILLISECONDS)
- def protobuf(): Unit = run("dump.lsif-protobuf", parallel = false)
+ def protobuf(): Unit = run("index.scip-protobuf", parallel = false)
private def run(filename: String, parallel: Boolean): Unit = {
- val output = Files.createTempFile("lsif-java", filename)
+ val output = Files.createTempFile("scip-java", filename)
val parallelFlag =
if (parallel)
"--parallel"
else
"--no-parallel"
- val exit = LsifJava
+ val exit = ScipJava
.app
.run(
List(
diff --git a/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala
index 08c4ad06..490f1bcd 100644
--- a/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala
+++ b/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala
@@ -9,8 +9,8 @@ import scala.util.Properties
import scala.meta.internal.io.FileIO
import scala.meta.io.AbsolutePath
-import com.sourcegraph.lsif_java.LsifJava
-import com.sourcegraph.lsif_java.buildtools.ClasspathEntry
+import com.sourcegraph.scip_java.ScipJava
+import com.sourcegraph.scip_java.buildtools.ClasspathEntry
import moped.testkit.DeleteVisitor
import moped.testkit.FileLayout
import moped.testkit.MopedSuite
@@ -18,7 +18,7 @@ import munit.Tag
import munit.TestOptions
import os.Shellable
-abstract class BaseBuildToolSuite extends MopedSuite(LsifJava.app) {
+abstract class BaseBuildToolSuite extends MopedSuite(ScipJava.app) {
override def environmentVariables: Map[String, String] = sys.env
def tags = List.empty[Tag]
diff --git a/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala
index 6e3c7b9c..9c936592 100644
--- a/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala
+++ b/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala
@@ -106,7 +106,7 @@ class GradleBuildToolSuite extends BaseBuildToolSuite {
expectedError = Some { error =>
assert(
clue(error).contains(
- """error: lsif-java does not support Gradle 6.7 when used together with Java toolchains. To fix this problem, upgrade to Gradle version 6.8 or newer and try again."""
+ """error: scip-java does not support Gradle 6.7 when used together with Java toolchains. To fix this problem, upgrade to Gradle version 6.8 or newer and try again."""
)
)
},
diff --git a/tests/buildTools/src/test/scala/tests/SbtBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/SbtBuildToolSuite.scala
index 99d6b40e..3df2fd64 100644
--- a/tests/buildTools/src/test/scala/tests/SbtBuildToolSuite.scala
+++ b/tests/buildTools/src/test/scala/tests/SbtBuildToolSuite.scala
@@ -3,7 +3,7 @@ package tests
import munit.IgnoreSuite
// Ignored because the sbt-sourcegraph plugin adds the -build-tool:sbt flag, which
-// is yet not supported by any stable release of lsif-java. We can un-ignore this
+// is yet not supported by any stable release of scip-java. We can un-ignore this
// test suite after the next release.
@IgnoreSuite
class SbtBuildToolSuite extends BaseBuildToolSuite {
diff --git a/tests/buildTools/src/test/scala/tests/LsifBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala
similarity index 94%
rename from tests/buildTools/src/test/scala/tests/LsifBuildToolSuite.scala
rename to tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala
index b4c243e6..8a212222 100644
--- a/tests/buildTools/src/test/scala/tests/LsifBuildToolSuite.scala
+++ b/tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala
@@ -1,8 +1,8 @@
package tests
-import com.sourcegraph.lsif_java.{BuildInfo => V}
+import com.sourcegraph.scip_java.{BuildInfo => V}
-class LsifBuildToolSuite extends BaseBuildToolSuite {
+class ScipBuildToolSuite extends BaseBuildToolSuite {
override def tags = List(SkipWindows)
checkBuild(
"basic",
diff --git a/tests/gradle-example/.gitignore b/tests/gradle-example/.gitignore
index fccaf641..581a649e 100644
--- a/tests/gradle-example/.gitignore
+++ b/tests/gradle-example/.gitignore
@@ -1,4 +1,4 @@
-dump.lsif
+index.scip
semanticdb-targetroot/
.classpath
.project
diff --git a/tests/snapshots/src/main/generated/index-semanticdb/locals b/tests/snapshots/src/main/generated/index-semanticdb/locals
index 26ea6607..12164071 100644
--- a/tests/snapshots/src/main/generated/index-semanticdb/locals
+++ b/tests/snapshots/src/main/generated/index-semanticdb/locals
@@ -15,7 +15,7 @@ public class Example {
──────────────────────────────────
-│ LSIF Graph for symbol 'local0' │
+│ SCIP Graph for symbol 'local0' │
──────────────────────────────────
╭──────────╮
│project(2)│
diff --git a/tests/snapshots/src/main/generated/index-semanticdb/multifile b/tests/snapshots/src/main/generated/index-semanticdb/multifile
index d9f95605..2984ca35 100644
--- a/tests/snapshots/src/main/generated/index-semanticdb/multifile
+++ b/tests/snapshots/src/main/generated/index-semanticdb/multifile
@@ -22,7 +22,7 @@ public class Example2 {
─────────────────────────────────────────────
-│ LSIF Graph for symbol 'example/Example1#' │
+│ SCIP Graph for symbol 'example/Example1#' │
─────────────────────────────────────────────
╭──────────╮
│project(2)│
diff --git a/tests/snapshots/src/main/generated/index-semanticdb/packages b/tests/snapshots/src/main/generated/index-semanticdb/packages
index 3bd0c801..c81b2f01 100644
--- a/tests/snapshots/src/main/generated/index-semanticdb/packages
+++ b/tests/snapshots/src/main/generated/index-semanticdb/packages
@@ -18,7 +18,7 @@ public class Example {
───────────────────────────────────────────────────────
-│ LSIF Graph for symbol 'org/hamcrest/MatcherAssert#' │
+│ SCIP Graph for symbol 'org/hamcrest/MatcherAssert#' │
───────────────────────────────────────────────────────
╭──────────╮
│project(2)│
diff --git a/tests/snapshots/src/main/generated/index-semanticdb/packages-jvm b/tests/snapshots/src/main/generated/index-semanticdb/packages-jvm
index 668b6956..bd0dee98 100644
--- a/tests/snapshots/src/main/generated/index-semanticdb/packages-jvm
+++ b/tests/snapshots/src/main/generated/index-semanticdb/packages-jvm
@@ -13,7 +13,7 @@ public class Example {
─────────────────────────────────────────────
-│ LSIF Graph for symbol 'java/lang/String#' │
+│ SCIP Graph for symbol 'java/lang/String#' │
─────────────────────────────────────────────
╭──────────╮
│project(2)│
diff --git a/tests/snapshots/src/main/generated/index-semanticdb/reference b/tests/snapshots/src/main/generated/index-semanticdb/reference
index 0fb6ac01..5d05b951 100644
--- a/tests/snapshots/src/main/generated/index-semanticdb/reference
+++ b/tests/snapshots/src/main/generated/index-semanticdb/reference
@@ -14,7 +14,7 @@ public class Example {
────────────────────────────────────────────
-│ LSIF Graph for symbol 'example/Example#' │
+│ SCIP Graph for symbol 'example/Example#' │
────────────────────────────────────────────
╭──────────╮
│project(2)│
diff --git a/tests/snapshots/src/main/scala/tests/LibrarySnapshotGenerator.scala b/tests/snapshots/src/main/scala/tests/LibrarySnapshotGenerator.scala
index f79689c6..0d6e2de4 100644
--- a/tests/snapshots/src/main/scala/tests/LibrarySnapshotGenerator.scala
+++ b/tests/snapshots/src/main/scala/tests/LibrarySnapshotGenerator.scala
@@ -12,19 +12,19 @@ import java.nio.file.attribute.BasicFileAttributes
import scala.util.Properties
-import com.sourcegraph.lsif_java.LsifJava
+import com.sourcegraph.scip_java.ScipJava
import moped.reporters.ConsoleReporter
class LibrarySnapshotGenerator extends SnapshotGenerator {
val scalaPattern = FileSystems.getDefault.getPathMatcher("glob:**.scala")
val javaPattern = FileSystems.getDefault.getPathMatcher("glob:**.java")
- def runLsifJava(arguments: List[String]): Unit = {
+ def runScipJava(arguments: List[String]): Unit = {
val baos = new ByteArrayOutputStream
- val exitCode = LsifJava
+ val exitCode = ScipJava
.app
.withReporter(ConsoleReporter(new PrintStream(baos)))
.withEnv(
- LsifJava
+ ScipJava
.app
.env
.withStandardOutput(new PrintStream(baos))
@@ -53,7 +53,7 @@ class LibrarySnapshotGenerator extends SnapshotGenerator {
println(s"indexing library '$name'")
val providedArguments = provided.flatMap(p => List("--provided", p))
val snapshotDir = Files.createTempDirectory("semanticdb-javac")
- runLsifJava(
+ runScipJava(
List(
"index-dependency",
"--snapshot",
diff --git a/tests/snapshots/src/main/scala/tests/MinimizedSnapshotGenerator.scala b/tests/snapshots/src/main/scala/tests/MinimizedSnapshotGenerator.scala
index c6b853d4..20706e78 100644
--- a/tests/snapshots/src/main/scala/tests/MinimizedSnapshotGenerator.scala
+++ b/tests/snapshots/src/main/scala/tests/MinimizedSnapshotGenerator.scala
@@ -2,8 +2,8 @@ package tests
import scala.meta.io.AbsolutePath
-import com.sourcegraph.lsif_java.SemanticdbPrinters
-import com.sourcegraph.lsif_semanticdb.LsifTextDocument
+import com.sourcegraph.scip_java.SemanticdbPrinters
+import com.sourcegraph.scip_semanticdb.ScipTextDocument
class MinimizedSnapshotGenerator extends SnapshotGenerator {
override def run(context: SnapshotContext, handler: SnapshotHandler): Unit = {
@@ -26,7 +26,7 @@ class MinimizedSnapshotGenerator extends SnapshotGenerator {
val expectOutput = context
.expectDirectory
.resolve(relativeToSourceDirectory.toNIO)
- val doc = LsifTextDocument
+ val doc = ScipTextDocument
.manifestOccurrencesForSyntheticSymbols(file.textDocument)
handler.onSnapshotTest(
context,
diff --git a/tests/snapshots/src/main/scala/tests/MinimizedLsifSnapshotGenerator.scala b/tests/snapshots/src/main/scala/tests/MinimizedscipSnapshotGenerator.scala
similarity index 89%
rename from tests/snapshots/src/main/scala/tests/MinimizedLsifSnapshotGenerator.scala
rename to tests/snapshots/src/main/scala/tests/MinimizedscipSnapshotGenerator.scala
index 6d3990f5..69fb4e06 100644
--- a/tests/snapshots/src/main/scala/tests/MinimizedLsifSnapshotGenerator.scala
+++ b/tests/snapshots/src/main/scala/tests/MinimizedscipSnapshotGenerator.scala
@@ -9,13 +9,13 @@ import scala.meta.internal.io.FileIO
import scala.meta.io.AbsolutePath
import com.sourcegraph.io.DeleteVisitor
-import com.sourcegraph.lsif_java.LsifJava
+import com.sourcegraph.scip_java.ScipJava
import munit.internal.console.AnsiColors
import munit.internal.difflib.Diffs
-class MinimizedLsifSnapshotGenerator extends SnapshotGenerator {
+class MinimizedScipSnapshotGenerator extends SnapshotGenerator {
def run(args: List[String]): Unit = {
- val exit = LsifJava.app.run(args)
+ val exit = ScipJava.app.run(args)
require(exit == 0)
}
def onFinished(context: SnapshotContext): Unit = ()
@@ -40,8 +40,8 @@ class MinimizedLsifSnapshotGenerator extends SnapshotGenerator {
sourceDirectory: AbsolutePath
): Unit = {
val sourceroot = AbsolutePath(BuildInfo.sourceroot)
- val lsifOutput = Files.createTempDirectory("lsif-java").resolve("dump.lsif")
- val snapshotOutput = AbsolutePath(Files.createTempDirectory("lsif-java"))
+ val scipOutput = Files.createTempDirectory("scip-java").resolve("dump.lsif")
+ val snapshotOutput = AbsolutePath(Files.createTempDirectory("scip-java"))
try {
run(
List(
@@ -49,7 +49,7 @@ class MinimizedLsifSnapshotGenerator extends SnapshotGenerator {
"--cwd",
sourceroot.toString(),
"--output",
- lsifOutput.toString,
+ scipOutput.toString,
"--targetroot",
targetroot.toString()
)
@@ -60,7 +60,7 @@ class MinimizedLsifSnapshotGenerator extends SnapshotGenerator {
"--cwd",
sourceroot.toString(),
"--input",
- lsifOutput.toString,
+ scipOutput.toString,
"--output",
snapshotOutput.toString
)
@@ -94,7 +94,7 @@ class MinimizedLsifSnapshotGenerator extends SnapshotGenerator {
val expectFile = context.expectDirectory.resolve("snapshot-lsif.diff")
handler.onSnapshotTest(context, expectFile, () => diffs.mkString("\n"))
} finally {
- Files.walkFileTree(lsifOutput, new DeleteVisitor())
+ Files.walkFileTree(scipOutput, new DeleteVisitor())
Files.walkFileTree(snapshotOutput.toNIO, new DeleteVisitor())
}
}
diff --git a/tests/snapshots/src/main/scala/tests/LsifGraphSnapshotGenerator.scala b/tests/snapshots/src/main/scala/tests/ScipGraphSnapshotGenerator.scala
similarity index 84%
rename from tests/snapshots/src/main/scala/tests/LsifGraphSnapshotGenerator.scala
rename to tests/snapshots/src/main/scala/tests/ScipGraphSnapshotGenerator.scala
index 88cf240d..5b78bd68 100644
--- a/tests/snapshots/src/main/scala/tests/LsifGraphSnapshotGenerator.scala
+++ b/tests/snapshots/src/main/scala/tests/ScipGraphSnapshotGenerator.scala
@@ -5,13 +5,13 @@ import java.nio.file.Files
import java.nio.file.Path
import com.sourcegraph.io.DeleteVisitor
-import com.sourcegraph.lsif_java.LsifJava
-import com.sourcegraph.lsif_java.commands.SnapshotLsifCommand
-import com.sourcegraph.lsif_java.commands.SnapshotLsifCommand.IndexedLsif
+import com.sourcegraph.scip_java.ScipJava
+import com.sourcegraph.scip_java.commands.SnapshotLsifCommand
+import com.sourcegraph.scip_java.commands.SnapshotLsifCommand.IndexedScip
import moped.reporters.ConsoleReporter
import moped.testkit.FileLayout
-class LsifGraphSnapshotGenerator extends SnapshotGenerator {
+class ScipGraphSnapshotGenerator extends SnapshotGenerator {
override def run(context: SnapshotContext, handler: SnapshotHandler): Unit = {
val gen = new Gen(context, handler)
@@ -85,9 +85,9 @@ class LsifGraphSnapshotGenerator extends SnapshotGenerator {
class Gen(context: SnapshotContext, handler: SnapshotHandler) {
def runSuccessfully(args: List[String], sourceroot: Path): Unit = {
- val exit = LsifJava
+ val exit = ScipJava
.app
- .withEnv(LsifJava.app.env.withWorkingDirectory(sourceroot))
+ .withEnv(ScipJava.app.env.withWorkingDirectory(sourceroot))
.run(args)
require(exit == 0)
}
@@ -104,9 +104,9 @@ class LsifGraphSnapshotGenerator extends SnapshotGenerator {
context,
expectFile,
() => {
- val tmp = Files.createTempDirectory("lsif-java")
+ val tmp = Files.createTempDirectory("scip-java")
val targetroot = tmp.resolve("targetroot")
- val outputLsif = tmp.resolve("dump.lsif")
+ val outputScip = tmp.resolve("dump.lsif")
val outputSnapshot = tmp.resolve("snapshot")
val sourceroot = tmp.resolve("workingDirectory")
FileLayout.fromString(original, sourceroot)
@@ -135,19 +135,19 @@ class LsifGraphSnapshotGenerator extends SnapshotGenerator {
"index-semanticdb",
"--no-parallel",
"--output",
- outputLsif.toString,
+ outputScip.toString,
targetroot.toString
),
sourceroot
)
- val objects = SnapshotLsifCommand.parseInput(outputLsif)
+ val objects = SnapshotLsifCommand.parseInput(outputScip)
val reporter = ConsoleReporter(System.out)
- val lsif = new IndexedLsif(outputLsif, objects, sourceroot, reporter)
+ val scip = new IndexedScip(outputScip, objects, sourceroot, reporter)
runSuccessfully(
List(
"snapshot-lsif",
"--input",
- outputLsif.toString(),
+ outputScip.toString(),
"--output",
outputSnapshot.toString()
),
@@ -157,13 +157,13 @@ class LsifGraphSnapshotGenerator extends SnapshotGenerator {
Files.isDirectory(outputSnapshot),
s"snapshot-lsif command did not create directory $outputSnapshot"
)
- val snapshotLsif = FileLayout.asString(outputSnapshot)
+ val snapshotScip = FileLayout.asString(outputSnapshot)
val obtained = new StringBuilder()
.header("Source code")
- .append(snapshotLsif)
+ .append(snapshotScip)
.append("\n")
- .header(s"LSIF Graph for symbol '$symbol'")
- .append(lsif.asciiGraph(symbol))
+ .header(s"SCIP Graph for symbol '$symbol'")
+ .append(scip.asciiGraph(symbol))
.append("\n")
.toString()
Files.walkFileTree(tmp, new DeleteVisitor())
diff --git a/tests/snapshots/src/main/scala/tests/SemanticdbJavacSnapshotGenerator.scala b/tests/snapshots/src/main/scala/tests/SemanticdbJavacSnapshotGenerator.scala
index 3872d9e6..a56c9417 100644
--- a/tests/snapshots/src/main/scala/tests/SemanticdbJavacSnapshotGenerator.scala
+++ b/tests/snapshots/src/main/scala/tests/SemanticdbJavacSnapshotGenerator.scala
@@ -5,7 +5,7 @@ object SemanticdbJavacSnapshotGenerator
List(
new LibrarySnapshotGenerator(),
new MinimizedSnapshotGenerator(),
- new MinimizedLsifSnapshotGenerator(),
- new LsifGraphSnapshotGenerator()
+ new MinimizedScipSnapshotGenerator(),
+ new ScipGraphSnapshotGenerator()
)
)
diff --git a/tests/snapshots/src/test/scala/tests/SnapshotSuite.scala b/tests/snapshots/src/test/scala/tests/SnapshotSuite.scala
index 1560a1f8..4ae7cebf 100644
--- a/tests/snapshots/src/test/scala/tests/SnapshotSuite.scala
+++ b/tests/snapshots/src/test/scala/tests/SnapshotSuite.scala
@@ -16,8 +16,8 @@ class LibrarySnapshotSuite extends SnapshotSuite(new LibrarySnapshotGenerator)
class MinimizedSnapshotSuite
extends SnapshotSuite(new MinimizedSnapshotGenerator)
-class MinimizedLsifSnapshotSuite
- extends SnapshotSuite(new MinimizedLsifSnapshotGenerator)
+class MinimizedScipSnapshotSuite
+ extends SnapshotSuite(new MinimizedScipSnapshotGenerator)
-class LsifGraphSnapshotSuite
- extends SnapshotSuite(new LsifGraphSnapshotGenerator)
+class ScipGraphSnapshotSuite
+ extends SnapshotSuite(new ScipGraphSnapshotGenerator)
diff --git a/tests/unit/src/main/scala/tests/TestCompiler.scala b/tests/unit/src/main/scala/tests/TestCompiler.scala
index 2fcf0fbb..7e2db434 100644
--- a/tests/unit/src/main/scala/tests/TestCompiler.scala
+++ b/tests/unit/src/main/scala/tests/TestCompiler.scala
@@ -88,7 +88,7 @@ class TestCompiler(
.asScala
.toList
val compilerWithClasspath = compiler.newInstance(
- "file://lsif-java",
+ "file://scip-java",
Classpath(classpath).entries.map(_.toNIO).asJava,
(scalacOptions ++ extraScalacOptions).asJava
)
diff --git a/tests/unit/src/test/scala/tests/JavaVersionSuite.scala b/tests/unit/src/test/scala/tests/JavaVersionSuite.scala
index 1260f0e6..013cadcc 100644
--- a/tests/unit/src/test/scala/tests/JavaVersionSuite.scala
+++ b/tests/unit/src/test/scala/tests/JavaVersionSuite.scala
@@ -1,6 +1,6 @@
package tests
-import com.sourcegraph.lsif_semanticdb.JavaVersion
+import com.sourcegraph.scip_semanticdb.JavaVersion
import munit.FunSuite
import munit.TestOptions
diff --git a/tests/unit/src/test/scala/tests/OverridesSuite.scala b/tests/unit/src/test/scala/tests/OverridesSuite.scala
index a29e9fe4..daa732ee 100644
--- a/tests/unit/src/test/scala/tests/OverridesSuite.scala
+++ b/tests/unit/src/test/scala/tests/OverridesSuite.scala
@@ -4,7 +4,7 @@ import java.util.stream.Collectors
import scala.meta.Input
-import com.sourcegraph.lsif_semanticdb.Symtab
+import com.sourcegraph.scip_semanticdb.Symtab
import munit.FunSuite
import munit.TestOptions
diff --git a/tests/unit/src/test/scala/tests/ScalaVersionSuite.scala b/tests/unit/src/test/scala/tests/ScalaVersionSuite.scala
index 8dd707ab..a52e9415 100644
--- a/tests/unit/src/test/scala/tests/ScalaVersionSuite.scala
+++ b/tests/unit/src/test/scala/tests/ScalaVersionSuite.scala
@@ -2,8 +2,8 @@ package tests
import java.nio.file.Paths
-import com.sourcegraph.lsif_java.buildtools.ScalaVersion
-import com.sourcegraph.lsif_java.{BuildInfo => V}
+import com.sourcegraph.scip_java.buildtools.ScalaVersion
+import com.sourcegraph.scip_java.{BuildInfo => V}
import munit.FunSuite
import munit.TestOptions
diff --git a/tests/unit/src/test/scala/tests/SemanticdbPrintersSuite.scala b/tests/unit/src/test/scala/tests/SemanticdbPrintersSuite.scala
index 4b3cb380..6b9ba48e 100644
--- a/tests/unit/src/test/scala/tests/SemanticdbPrintersSuite.scala
+++ b/tests/unit/src/test/scala/tests/SemanticdbPrintersSuite.scala
@@ -1,6 +1,6 @@
package tests
-import com.sourcegraph.lsif_java.SemanticdbPrinters
+import com.sourcegraph.scip_java.SemanticdbPrinters
import com.sourcegraph.semanticdb_javac.Semanticdb.Documentation
import com.sourcegraph.semanticdb_javac.Semanticdb.Range
import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation
diff --git a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala b/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala
index 3b99ee49..8bc17b53 100644
--- a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala
+++ b/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala
@@ -4,11 +4,11 @@ import java.nio.file.Files
import scala.meta.inputs.Input
-import com.sourcegraph.lsif_java.LsifJava
+import com.sourcegraph.scip_java.ScipJava
import moped.testkit.FileLayout
import moped.testkit.MopedSuite
-class SnapshotCommandSuite extends MopedSuite(LsifJava.app) {
+class SnapshotCommandSuite extends MopedSuite(ScipJava.app) {
test("snapshot") {
FileLayout.fromString(
"""/main/Sample.java
diff --git a/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala b/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala
index 670e1276..9e07f8d9 100644
--- a/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala
+++ b/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala
@@ -2,7 +2,7 @@ package tests
import scala.meta.internal.semanticdb.Scala._
-import com.sourcegraph.lsif_semanticdb.SymbolDescriptor
+import com.sourcegraph.scip_semanticdb.SymbolDescriptor
import com.sourcegraph.semanticdb_javac.SemanticdbSymbols.Descriptor.Kind
import munit.FunSuite
import munit.TestOptions
diff --git a/website/pages/en/index.js b/website/pages/en/index.js
index 350b8b42..23851556 100755
--- a/website/pages/en/index.js
+++ b/website/pages/en/index.js
@@ -109,7 +109,7 @@ const Features = (props) => {
{
title: "Simple installation",
content:
- "Run the `lsif-java` command-line tool at the root of your Gradle/Maven/sbt build to generate an LSIF index. No manual configuration needed.",
+ "Run the `scip-java` command-line tool at the root of your Gradle/Maven/sbt build to generate an SCIP index. No manual configuration needed.",
image:
"https://user-images.githubusercontent.com/1408093/109820615-769c5580-7c35-11eb-9063-98e932c5d6c5.png",
imageAlign: "left",
diff --git a/website/siteConfig.js b/website/siteConfig.js
index 6aeb6ae4..19b8fbd0 100644
--- a/website/siteConfig.js
+++ b/website/siteConfig.js
@@ -1,17 +1,17 @@
// See https://docusaurus.io/docs/site-config.html for all the possible
// site configuration options.
-const repoUrl = "https://github.com/sourcegraph/lsif-java";
-const baseUrl = "/lsif-java/";
+const repoUrl = "https://github.com/sourcegraph/scip-java";
+const baseUrl = "/scip-java/";
const siteConfig = {
- title: "lsif-java",
- tagline: "Java indexer for the Language Server Index Format (LSIF)",
- url: "https://sourcegraph.github.io/lsif-java",
+ title: "scip-java",
+ tagline: "Java indexer for the Language Server Index Format (SCIP)",
+ url: "https://sourcegraph.github.io/scip-java",
baseUrl: baseUrl,
// Used for publishing and more
- projectName: "lsif-java",
+ projectName: "scip-java",
organizationName: "sourcegraph",
// algolia: {
@@ -29,8 +29,8 @@ const siteConfig = {
// users,
/* path to images for header/footer */
- headerIcon: "img/lsif-java.png",
- footerIcon: "img/lsif-java.png",
+ headerIcon: "img/scip-java.png",
+ footerIcon: "img/scip-java.png",
favicon: "img/favicon.ico",
/* colors for website */
@@ -46,7 +46,7 @@ const siteConfig = {
usePrism: ['scala'],
// This copyright info is used in /core/Footer.js and blog rss/atom feeds.
- copyright: `Copyright © ${new Date().getFullYear()} lsif-java developers`,
+ copyright: `Copyright © ${new Date().getFullYear()} scip-java developers`,
highlight: {
// Highlight.js theme to use for syntax highlighting in code blocks
@@ -57,8 +57,8 @@ const siteConfig = {
onPageNav: "separate",
/* Open Graph and Twitter card images */
- ogImage: "img/lsif-java.png",
- twitterImage: "img/lsif-java.png",
+ ogImage: "img/scip-java.png",
+ twitterImage: "img/scip-java.png",
editUrl: `${repoUrl}/edit/main/docs/`,
diff --git a/website/static/img/lsif-java.png b/website/static/img/scip-java.png
similarity index 100%
rename from website/static/img/lsif-java.png
rename to website/static/img/scip-java.png