diff --git a/lsif-java/src/main/scala/com/sourcegraph/lsif_java/commands/SnapshotLsifCommand.scala b/lsif-java/src/main/scala/com/sourcegraph/lsif_java/commands/SnapshotLsifCommand.scala index 0abf2e52..5d325afd 100644 --- a/lsif-java/src/main/scala/com/sourcegraph/lsif_java/commands/SnapshotLsifCommand.scala +++ b/lsif-java/src/main/scala/com/sourcegraph/lsif_java/commands/SnapshotLsifCommand.scala @@ -279,7 +279,7 @@ object SnapshotLsifCommand { ) s"range(${node.getId}) ${renderPos(node.getStart)} '${p.text}'" case ("vertex", "packageInformation") => - s"${node.getName}(${node.getId})" + s"${node.getName} ${node.getVersion}(${node.getId})" case ("vertex", label) => s"${label}(${node.getId})" case _ => diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/JdkPackage.java b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/JdkPackage.java index 0807c5f4..36750cd5 100644 --- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/JdkPackage.java +++ b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/JdkPackage.java @@ -9,7 +9,7 @@ public JdkPackage(String version) { @Override public String repoName() { - return String.format("jdk/%s", version); + return "jdk"; } @Override diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifWriter.java b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifWriter.java index f0c80f23..8e91659a 100644 --- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifWriter.java +++ b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifWriter.java @@ -127,7 +127,7 @@ public int emitpackageinformationVertex(Package pkg) { return emitObject( lsifVertex("packageInformation") .setName(pkg.repoName()) - .setManager("packagehub") + .setManager("jvm-dependencies") .setVersion(pkg.version())); } diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/MavenPackage.java b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/MavenPackage.java index a10b0fc6..92afe0a5 100644 --- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/MavenPackage.java +++ b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/MavenPackage.java @@ -17,7 +17,7 @@ public MavenPackage(Path jar, String groupId, String artifactId, String version) @Override public String repoName() { - return String.format("maven/%s/%s/%s", groupId, artifactId, version); + return String.format("maven/%s/%s", groupId, artifactId); } @Override diff --git a/tests/snapshots/src/main/generated/index-semanticdb/packages b/tests/snapshots/src/main/generated/index-semanticdb/packages index c5e326b0..3bd0c801 100644 --- a/tests/snapshots/src/main/generated/index-semanticdb/packages +++ b/tests/snapshots/src/main/generated/index-semanticdb/packages @@ -57,5 +57,5 @@ public class Example { │ │ │ │ v v v │ ╭────────────────────────────────────────╮ ╭─────────────┴─────╮ - │maven/org.hamcrest/hamcrest-core/1.3(23)│ │referenceResult(76)│ + │maven/org.hamcrest/hamcrest-core 1.3(23)│ │referenceResult(76)│ ╰────────────────────────────────────────╯ ╰───────────────────╯ diff --git a/tests/snapshots/src/main/generated/index-semanticdb/packages-jvm b/tests/snapshots/src/main/generated/index-semanticdb/packages-jvm index 918e6beb..668b6956 100644 --- a/tests/snapshots/src/main/generated/index-semanticdb/packages-jvm +++ b/tests/snapshots/src/main/generated/index-semanticdb/packages-jvm @@ -43,5 +43,5 @@ public class Example { │ ││ v v│ ╭──────────╮ ╭──────────────┴────╮ - │jdk/11(33)│ │referenceResult(35)│ + │jdk 11(33)│ │referenceResult(35)│ ╰──────────╯ ╰───────────────────╯