From ae00302625f945d46401fee9788d4f8a2750c801 Mon Sep 17 00:00:00 2001 From: jupblb Date: Thu, 4 Jun 2026 15:51:41 +0200 Subject: [PATCH 1/9] Drop semanticdb prefix from internal symbol APIs --- .../sourcegraph/semanticdb_javac/GlobalSymbolsCache.java | 8 ++++---- .../com/sourcegraph/semanticdb_javac/ScipVisitor.java | 2 +- .../com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java index ef26b7fd..9776f533 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java @@ -26,19 +26,19 @@ public GlobalSymbolsCache(SemanticdbJavacOptions options) { this.options = options; } - public String semanticdbSymbol(Element sym, LocalSymbolsCache locals) { + public String symbol(Element sym, LocalSymbolsCache locals) { String result = globals.get(sym); if (result != null) return result; String localResult = locals.get(sym); if (localResult != null) return localResult; - result = uncachedSemanticdbSymbol(sym, locals); + result = uncachedSymbol(sym, locals); if (SemanticdbSymbols.isGlobal(result)) { globals.put(sym, result); } return result; } - private String uncachedSemanticdbSymbol(Element sym, LocalSymbolsCache locals) { + private String uncachedSymbol(Element sym, LocalSymbolsCache locals) { if (sym == null) return SemanticdbSymbols.ROOT_PACKAGE; if (sym instanceof PackageElement) { @@ -66,7 +66,7 @@ private String uncachedSemanticdbSymbol(Element sym, LocalSymbolsCache parentTypeElements(TypeElement typeElement) { diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt index c3f5c6ed..8c261758 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt +++ b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt @@ -69,7 +69,7 @@ class GlobalSymbolsCache(testing: Boolean = false) : Iterable { locals[symbol]?.let { return it } - return uncachedSemanticdbSymbol(symbol, locals).also { + return uncachedSymbol(symbol, locals).also { if (it.isGlobal()) globals[symbol] = it } } @@ -77,7 +77,7 @@ class GlobalSymbolsCache(testing: Boolean = false) : Iterable { packages[symbol]?.let { return it } - return uncachedSemanticdbSymbol(symbol).also { if (it.isGlobal()) packages[symbol] = it } + return uncachedSymbol(symbol).also { if (it.isGlobal()) packages[symbol] = it } } private fun skip(symbol: FirBasedSymbol<*>?): Boolean { @@ -86,7 +86,7 @@ class GlobalSymbolsCache(testing: Boolean = false) : Iterable { } @OptIn(SymbolInternals::class) - private fun uncachedSemanticdbSymbol( + private fun uncachedSymbol( symbol: FirBasedSymbol<*>?, locals: LocalSymbolsCache ): Symbol { @@ -103,7 +103,7 @@ class GlobalSymbolsCache(testing: Boolean = false) : Iterable { return Symbol.createGlobal(owner, semanticdbDescriptor) } - private fun uncachedSemanticdbSymbol(symbol: FqName): Symbol { + private fun uncachedSymbol(symbol: FqName): Symbol { if (symbol.isRoot) return Symbol.ROOT_PACKAGE val owner = this.getSymbol(symbol.parent()) From d4c495ea142eb30d3b0434b715285ed22952a05e Mon Sep 17 00:00:00 2001 From: jupblb Date: Thu, 4 Jun 2026 15:56:08 +0200 Subject: [PATCH 2/9] Drop kotlin.contracts usage from semanticdb-kotlinc --- .../semanticdb_kotlinc/AnalyzerCheckers.kt | 17 +---------------- .../semanticdb_kotlinc/AnalyzerRegistrar.kt | 2 -- .../semanticdb_kotlinc/PostAnalysisExtension.kt | 2 -- .../SemanticdbTextDocumentBuilder.kt | 2 -- .../semanticdb_kotlinc/SemanticdbVisitor.kt | 2 -- .../semanticdb_kotlinc/SymbolsCache.kt | 11 +---------- .../semanticdb_kotlinc/test/AnalyzerTest.kt | 2 -- .../test/SemanticdbSymbolsTest.kt | 2 -- .../semanticdb_kotlinc/test/Utils.kt | 8 -------- 9 files changed, 2 insertions(+), 46 deletions(-) diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerCheckers.kt b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerCheckers.kt index f4952b27..dde0c0bb 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerCheckers.kt +++ b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerCheckers.kt @@ -1,7 +1,6 @@ package com.sourcegraph.semanticdb_kotlinc import java.nio.file.Path -import kotlin.contracts.ExperimentalContracts import org.jetbrains.kotlin.* import org.jetbrains.kotlin.com.intellij.lang.LighterASTNode import org.jetbrains.kotlin.com.intellij.util.diff.FlyweightCapableTreeStructure @@ -31,7 +30,6 @@ import org.jetbrains.kotlin.name.FqName open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtension(session) { companion object { - @OptIn(ExperimentalContracts::class) val visitors: MutableMap = mutableMapOf() private fun getIdentifier(element: KtSourceElement): KtSourceElement = @@ -78,10 +76,9 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio private class SemanticFileChecker(private val sourceroot: Path) : FirFileChecker(MppCheckerKind.Common) { companion object { - @OptIn(ExperimentalContracts::class) val globals = GlobalSymbolsCache() + val globals = GlobalSymbolsCache() } - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(declaration: FirFile) { val ktFile = declaration.sourceFile ?: return @@ -92,7 +89,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio } class SemanticImportsChecker : FirFileChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(declaration: FirFile) { val ktFile = declaration.sourceFile ?: return @@ -167,7 +163,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio } private class SemanticClassLikeChecker : FirClassLikeChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(declaration: FirClassLikeDeclaration) { val source = declaration.source ?: return @@ -196,7 +191,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio } private class SemanticConstructorChecker : FirConstructorChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(declaration: FirConstructor) { val source = declaration.source ?: return @@ -231,7 +225,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio } private class SemanticSimpleFunctionChecker : FirSimpleFunctionChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(declaration: FirSimpleFunction) { val source = declaration.source ?: return @@ -249,7 +242,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio private class SemanticAnonymousFunctionChecker : FirAnonymousFunctionChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(declaration: FirAnonymousFunction) { val source = declaration.source ?: return @@ -260,7 +252,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio } private class SemanticPropertyChecker : FirPropertyChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(declaration: FirProperty) { val source = declaration.source ?: return @@ -277,7 +268,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio } private class SemanticValueParameterChecker : FirValueParameterChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(declaration: FirValueParameter) { val source = declaration.source ?: return @@ -294,7 +284,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio } private class SemanticTypeParameterChecker : FirTypeParameterChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(declaration: FirTypeParameter) { val source = declaration.source ?: return @@ -305,7 +294,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio } private class SemanticTypeAliasChecker : FirTypeAliasChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(declaration: FirTypeAlias) { val source = declaration.source ?: return @@ -317,7 +305,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio private class SemanticPropertyAccessorChecker : FirPropertyAccessorChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(declaration: FirPropertyAccessor) { val source = declaration.source ?: return @@ -346,7 +333,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio private class SemanticQualifiedAccessExpressionChecker : FirQualifiedAccessExpressionChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(expression: FirQualifiedAccessExpression) { val source = expression.source ?: return @@ -381,7 +367,6 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio private class SemanticClassReferenceExpressionChecker : FirTypeOperatorCallChecker(MppCheckerKind.Common) { - @OptIn(ExperimentalContracts::class) context(context: CheckerContext, reporter: DiagnosticReporter) override fun check(expression: FirTypeOperatorCall) { val typeRef = expression.conversionTypeRef diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerRegistrar.kt b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerRegistrar.kt index 278ef870..6d1152c5 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerRegistrar.kt +++ b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerRegistrar.kt @@ -1,7 +1,6 @@ package com.sourcegraph.semanticdb_kotlinc import com.sourcegraph.semanticdb.SemanticdbOptions -import kotlin.contracts.ExperimentalContracts import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi @@ -10,7 +9,6 @@ import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter import org.scip_code.scip.Document @OptIn(ExperimentalCompilerApi::class) -@ExperimentalContracts class AnalyzerRegistrar(private val callback: (Document) -> Unit = {}) : CompilerPluginRegistrar() { override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) { diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/PostAnalysisExtension.kt b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/PostAnalysisExtension.kt index 15dab03d..ec341d0b 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/PostAnalysisExtension.kt +++ b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/PostAnalysisExtension.kt @@ -6,7 +6,6 @@ import java.io.PrintWriter import java.io.Writer import java.nio.file.Path import java.nio.file.Paths -import kotlin.contracts.ExperimentalContracts import org.jetbrains.kotlin.KtSourceFile import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext @@ -25,7 +24,6 @@ import org.scip_code.scip.Document * file's [Document] and serializes it under `/META-INF/scip/.scip`. * Files outside the source root are skipped with a stderr warning. */ -@ExperimentalContracts class PostAnalysisExtension( private val sourceRoot: Path, private val targetRoot: Path, diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbTextDocumentBuilder.kt b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbTextDocumentBuilder.kt index 60190823..9e30d40b 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbTextDocumentBuilder.kt +++ b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbTextDocumentBuilder.kt @@ -4,7 +4,6 @@ import com.sourcegraph.semanticdb.ScipDocumentBuilder import com.sourcegraph.semanticdb.ScipShardPaths import java.nio.file.Path import java.nio.file.Paths -import kotlin.contracts.ExperimentalContracts import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtSourceFile import org.jetbrains.kotlin.fir.FirElement @@ -29,7 +28,6 @@ import org.scip_code.scip.signature import org.scip_code.scip.symbolInformation /** Builds a SCIP [Document] for a single Kotlin source file. */ -@ExperimentalContracts class SemanticdbTextDocumentBuilder( private val sourceroot: Path, private val file: KtSourceFile, diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbVisitor.kt b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbVisitor.kt index 0ba792ff..e9ae2c60 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbVisitor.kt +++ b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbVisitor.kt @@ -1,7 +1,6 @@ package com.sourcegraph.semanticdb_kotlinc import java.nio.file.Path -import kotlin.contracts.ExperimentalContracts import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtSourceFile import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext @@ -18,7 +17,6 @@ import org.scip_code.scip.Document * [AnalyzerCheckers] call into this and the resulting [Document] is written as a * `.scip` shard at the end of compilation. */ -@ExperimentalContracts class SemanticdbVisitor( sourceroot: Path, file: KtSourceFile, diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt index 8c261758..f9778369 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt +++ b/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt @@ -3,8 +3,6 @@ package com.sourcegraph.semanticdb_kotlinc import com.sourcegraph.semanticdb.LocalSymbolsCache as SharedLocalSymbolsCache import com.sourcegraph.semanticdb_kotlinc.SemanticdbSymbolDescriptor.Kind import java.lang.System.err -import kotlin.contracts.ExperimentalContracts -import kotlin.contracts.contract import org.jetbrains.kotlin.fir.analysis.checkers.declaration.isLocalMember import org.jetbrains.kotlin.fir.analysis.checkers.getContainingSymbol import org.jetbrains.kotlin.fir.declarations.DirectDeclarationsAccess @@ -20,7 +18,6 @@ import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly -@ExperimentalContracts class GlobalSymbolsCache(testing: Boolean = false) : Iterable { private val globals = if (testing) LinkedHashMap, Symbol>() @@ -80,17 +77,12 @@ class GlobalSymbolsCache(testing: Boolean = false) : Iterable { return uncachedSymbol(symbol).also { if (it.isGlobal()) packages[symbol] = it } } - private fun skip(symbol: FirBasedSymbol<*>?): Boolean { - contract { returns(false) implies (symbol != null) } - return symbol == null || symbol is FirAnonymousFunctionSymbol - } - @OptIn(SymbolInternals::class) private fun uncachedSymbol( symbol: FirBasedSymbol<*>?, locals: LocalSymbolsCache ): Symbol { - if (skip(symbol)) return Symbol.NONE + if (symbol == null || symbol is FirAnonymousFunctionSymbol) return Symbol.NONE if (symbol.fir.isLocalMember) return locals + symbol @@ -219,7 +211,6 @@ fun LocalSymbolsCache(): LocalSymbolsCache = operator fun LocalSymbolsCache.plus(symbol: FirBasedSymbol<*>): Symbol = put(symbol) -@ExperimentalContracts class SymbolsCache(private val globals: GlobalSymbolsCache, private val locals: LocalSymbolsCache) { operator fun get(symbol: FirBasedSymbol<*>) = globals[symbol, locals] operator fun get(symbol: FqName) = globals[symbol] diff --git a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/AnalyzerTest.kt b/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/AnalyzerTest.kt index 48e1c737..69ea85a3 100644 --- a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/AnalyzerTest.kt +++ b/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/AnalyzerTest.kt @@ -13,7 +13,6 @@ import io.kotest.matchers.shouldNotBe import java.io.File import java.nio.file.Path import java.nio.file.Paths -import kotlin.contracts.ExperimentalContracts import kotlin.test.Test import kotlin.test.assertEquals import org.intellij.lang.annotations.Language @@ -24,7 +23,6 @@ import org.scip_code.scip.Occurrence import org.scip_code.scip.SymbolInformation @OptIn(ExperimentalCompilerApi::class) -@ExperimentalContracts class AnalyzerTest { fun compileSemanticdb(path: Path, @Language("kotlin") code: String): Document { val buildPath = File(path.resolve("build").toString()).apply { mkdir() } diff --git a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/SemanticdbSymbolsTest.kt b/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/SemanticdbSymbolsTest.kt index dd3a0e23..afea0b39 100644 --- a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/SemanticdbSymbolsTest.kt +++ b/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/SemanticdbSymbolsTest.kt @@ -4,14 +4,12 @@ import com.sourcegraph.semanticdb_kotlinc.* import com.sourcegraph.semanticdb_kotlinc.test.ExpectedSymbols.ScipData import com.sourcegraph.semanticdb_kotlinc.test.ExpectedSymbols.SymbolCacheData import com.tschuchort.compiletesting.SourceFile -import kotlin.contracts.ExperimentalContracts import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi import org.junit.jupiter.api.TestFactory import org.scip_code.scip.Occurrence import org.scip_code.scip.SymbolInformation @ExperimentalCompilerApi -@ExperimentalContracts class SemanticdbSymbolsTest { @TestFactory fun `method disambiguator`() = diff --git a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/Utils.kt b/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/Utils.kt index 908c1429..6173c089 100644 --- a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/Utils.kt +++ b/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/Utils.kt @@ -11,7 +11,6 @@ import io.kotest.matchers.collections.shouldContainInOrder import io.kotest.matchers.shouldBe import java.nio.file.Path import java.nio.file.Paths -import kotlin.contracts.ExperimentalContracts import org.intellij.lang.annotations.Language import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar @@ -55,7 +54,6 @@ fun SourceFile.Companion.testKt(@Language("kotlin") contents: String): SourceFil kotlin("Test.kt", contents) @ExperimentalCompilerApi -@ExperimentalContracts fun List.mapCheckExpectedSymbols(): List = this.flatMap { (testName, source, symbolsData, scipData) -> val globals = GlobalSymbolsCache(testing = true) @@ -85,7 +83,6 @@ fun List.mapCheckExpectedSymbols(): List = }) } -@ExperimentalContracts fun checkContainsExpectedSymbols( globals: GlobalSymbolsCache, locals: LocalSymbolsCache, @@ -108,7 +105,6 @@ fun checkContainsExpectedScip( } @OptIn(ExperimentalCompilerApi::class) -@ExperimentalContracts private fun configureTestCompiler( source: SourceFile, globals: GlobalSymbolsCache, @@ -127,7 +123,6 @@ private fun configureTestCompiler( return compilation } -@OptIn(ExperimentalContracts::class) private class TestAnalyzerDeclarationCheckers( globals: GlobalSymbolsCache, locals: LocalSymbolsCache, @@ -148,7 +143,6 @@ private class TestAnalyzerDeclarationCheckers( } private class TestAnalyzerCheckers(session: FirSession) : AnalyzerCheckers(session) { - @OptIn(ExperimentalContracts::class) override val declarationCheckers: DeclarationCheckers get() = TestAnalyzerDeclarationCheckers( @@ -158,7 +152,6 @@ private class TestAnalyzerCheckers(session: FirSession) : AnalyzerCheckers(sessi ) } -@OptIn(ExperimentalContracts::class) class TestAnalyzerParamsProvider( session: FirSession, var globals: GlobalSymbolsCache, @@ -180,7 +173,6 @@ val FirSession.testAnalyzerParamsProvider: TestAnalyzerParamsProvider by FirSess .sessionComponentAccessor() @OptIn(ExperimentalCompilerApi::class) -@ExperimentalContracts fun semanticdbVisitorAnalyzer( globals: GlobalSymbolsCache, locals: LocalSymbolsCache, From e726543b69b550fe3ad78a9b5d525fba352d9358 Mon Sep 17 00:00:00 2001 From: jupblb Date: Thu, 4 Jun 2026 16:37:25 +0200 Subject: [PATCH 3/9] Drop semanticdb naming; rename modules, packages, classes, scheme to scip Mass rename across modules, Java/Kotlin packages, identifiers, and external surface: - Module dirs: semanticdb-{shared,javac,kotlinc,gradle-plugin} -> scip-*; scip-semanticdb -> scip-aggregator - Java packages: com.sourcegraph.semanticdb{,_javac,_kotlinc} -> com.sourcegraph.scip{,_javac,_kotlinc}; scip_semanticdb -> scip_aggregator - CLI subcommand: index-semanticdb -> index-scip - javac plugin handle: -Xplugin:semanticdb -> -Xplugin:scip - kotlinc plugin id: semanticdb-kotlinc -> scip-kotlinc - System properties: -Dsemanticdb.* -> -Dscip.* - SCIP symbol scheme literal: 'semanticdb' -> 'scip-java' (breaking change in indexer output; snapshots regenerated) Scalameta sbt keys (semanticdbEnabled/Version/TargetRoot) and the scala.meta.internal.semanticdb import are preserved. --- .bazelignore | 12 +- .dockerignore | 2 +- .github/workflows/ci.yml | 24 +- .gitignore | 8 +- CONTRIBUTING.md | 4 +- build.sbt | 124 +++--- docs/design.md | 18 +- docs/getting-started.md | 12 +- docs/manual-configuration.md | 50 +-- .../bazel-example/src/main/java/example/BUILD | 8 +- .../main/java/source-generator-example/BUILD | 2 +- examples/maven-example/pom.xml | 4 +- .../maven/DependencyWriterMojo.java | 4 +- .../META-INF/maven/plugin.template.xml | 4 +- {scip-semanticdb => scip-aggregator}/BUILD | 8 +- .../scip_aggregator}/BazelBuildTool.java | 14 +- .../scip_aggregator}/BazelOptions.java | 12 +- .../scip_aggregator}/InputStreamBytes.java | 2 +- .../scip_aggregator}/JdkPackage.java | 2 +- .../scip_aggregator}/MavenPackage.java | 2 +- .../MessageOnlyException.java | 2 +- .../scip_aggregator}/OperatingSystem.java | 2 +- .../sourcegraph/scip_aggregator}/Package.java | 2 +- .../scip_aggregator}/PackageTable.java | 4 +- .../scip_aggregator/ScipAggregator.java | 18 +- .../ScipAggregatorOptions.java | 12 +- .../ScipAggregatorReporter.java | 8 +- .../scip_aggregator}/ScipOutputStream.java | 2 +- .../scip_aggregator}/ScipWriter.java | 10 +- .../scip_aggregator}/SymbolDescriptor.java | 41 +- .../scip_aggregator}/SymbolRewriter.java | 10 +- .../src/main/protobuf/bazelbuild.proto | 0 .../src/main/scala/ScipGradlePlugin.scala | 32 +- .../main/resources/scip-java/scip_java.bzl | 8 +- .../ConsoleScipAggregatorReporter.scala} | 10 +- .../ScipAggregatorProgressRenderer.scala} | 6 +- .../com/sourcegraph/scip_java/Embedded.scala | 32 +- .../com/sourcegraph/scip_java/ScipJava.scala | 4 +- .../sourcegraph/scip_java/ScipSymbol.scala | 12 +- .../scip_java/buildtools/BazelBuildTool.scala | 2 +- .../scip_java/buildtools/BuildTool.scala | 10 +- .../scip_java/buildtools/ClasspathEntry.scala | 4 +- .../buildtools/GradleBuildTool.scala | 35 +- .../scip_java/buildtools/MavenBuildTool.scala | 9 +- .../scip_java/buildtools/ScipBuildTool.scala | 38 +- .../scip_java/commands/IndexCommand.scala | 6 +- ...dbCommand.scala => IndexScipCommand.scala} | 24 +- {semanticdb-javac => scip-javac}/BUILD | 6 +- {semanticdb-javac => scip-javac}/defs.bzl | 6 +- .../scip_javac}/CompilationUnitException.java | 2 +- .../scip_javac}/CompilerRange.java | 24 +- .../sourcegraph/scip_javac}/Debugging.java | 2 +- .../scip_javac}/GlobalSymbolsCache.java | 61 ++- .../scip_javac/InjectScipOptions.java | 30 +- .../sourcegraph/scip_javac}/RangeFinder.java | 2 +- .../com/sourcegraph/scip_javac}/Result.java | 2 +- .../ScipJavaSignatureFormatter.java | 6 +- .../scip_javac/ScipJavacOptions.java | 28 +- .../scip_javac/ScipOptionBuilder.java | 19 +- .../sourcegraph/scip_javac/ScipPlugin.java | 25 ++ .../sourcegraph/scip_javac/ScipReporter.java | 15 +- .../scip_javac/ScipTaskListener.java | 32 +- .../sourcegraph/scip_javac}/ScipVisitor.java | 18 +- .../sourcegraph/scip_javac}/TargetPaths.java | 2 +- .../services/com.sun.source.util.Plugin | 1 + .../main/java/snapshots/ClassConsumer.java | 28 ++ .../java/snapshots/CompanionConsumer.java | 25 ++ .../src/main/java/snapshots/KotlinClass.java | 45 ++ .../main/java/snapshots/KotlinLambdas.java | 43 ++ .../main/java/snapshots/ObjectKtConsumer.java | 26 ++ .../src/main/kotlin/snapshots/Class.kt | 129 ++++++ .../main/kotlin/snapshots/CompanionOwner.kt | 44 ++ .../src/main/kotlin/snapshots/Docstrings.kt | 47 +++ .../src/main/kotlin/snapshots/Functions.kt | 19 + .../main/kotlin/snapshots/Implementations.kt | 129 ++++++ .../src/main/kotlin/snapshots/Lambdas.kt | 58 +-- .../src/main/kotlin/snapshots/ObjectKt.kt | 37 ++ .../main/java/snapshots/ClassConsumer.java | 0 .../java/snapshots/CompanionConsumer.java | 0 .../src/main/java/snapshots/KotlinClass.java | 0 .../main/java/snapshots/KotlinLambdas.java | 0 .../main/java/snapshots/ObjectKtConsumer.java | 0 .../src/main/kotlin/snapshots/Class.kt | 0 .../main/kotlin/snapshots/CompanionOwner.kt | 0 .../src/main/kotlin/snapshots/Docstrings.kt | 0 .../src/main/kotlin/snapshots/Functions.kt | 0 .../main/kotlin/snapshots/Implementations.kt | 0 .../src/main/kotlin/snapshots/Lambdas.kt | 0 .../src/main/kotlin/snapshots/ObjectKt.kt | 0 .../scip_kotlinc}/AnalyzerCheckers.kt | 6 +- .../AnalyzerCommandLineProcessor.kt | 6 +- .../AnalyzerFirExtensionRegistrar.kt | 6 +- .../scip_kotlinc}/AnalyzerParamsProvider.kt | 8 +- .../scip_kotlinc}/AnalyzerRegistrar.kt | 6 +- .../com/sourcegraph/scip_kotlinc}/LineMap.kt | 2 +- .../scip_kotlinc}/PostAnalysisExtension.kt | 10 +- .../sourcegraph/scip_kotlinc/ScipSymbols.kt | 12 +- .../scip_kotlinc/ScipTextDocumentBuilder.kt | 10 +- .../sourcegraph/scip_kotlinc/ScipVisitor.kt | 8 +- .../sourcegraph/scip_kotlinc}/SymbolsCache.kt | 36 +- ...otlin.compiler.plugin.CommandLineProcessor | 1 + ...in.compiler.plugin.CompilerPluginRegistrar | 1 + .../scip_kotlinc}/test/AnalyzerTest.kt | 38 +- .../scip_kotlinc}/test/ScipBuilders.kt | 6 +- .../scip_kotlinc/test/ScipSymbolsTest.kt | 10 +- .../sourcegraph/scip_kotlinc}/test/Utils.kt | 16 +- {semanticdb-shared => scip-shared}/BUILD | 2 +- .../sourcegraph/scip}/LocalSymbolsCache.java | 4 +- .../sourcegraph/scip}/NoRelativePathMode.java | 12 +- .../scip}/ScipDocumentBuilder.java | 2 +- .../com/sourcegraph/scip/ScipOptions.java | 6 +- .../com/sourcegraph/scip}/ScipShardPaths.java | 6 +- .../sourcegraph/scip}/ScipShardWriter.java | 2 +- .../com/sourcegraph/scip/ScipSymbols.java | 14 +- .../java/com/sourcegraph/scip}/UriScheme.java | 2 +- .../semanticdb_javac/SemanticdbPlugin.java | 25 -- .../services/com.sun.source.util.Plugin | 1 - .../main/java/snapshots/ClassConsumer.java | 28 -- .../java/snapshots/CompanionConsumer.java | 25 -- .../src/main/java/snapshots/KotlinClass.java | 45 -- .../main/java/snapshots/KotlinLambdas.java | 43 -- .../main/java/snapshots/ObjectKtConsumer.java | 26 -- .../src/main/kotlin/snapshots/Class.kt | 129 ------ .../main/kotlin/snapshots/CompanionOwner.kt | 44 -- .../src/main/kotlin/snapshots/Docstrings.kt | 47 --- .../src/main/kotlin/snapshots/Functions.kt | 19 - .../main/kotlin/snapshots/Implementations.kt | 129 ------ .../src/main/kotlin/snapshots/ObjectKt.kt | 37 -- ...otlin.compiler.plugin.CommandLineProcessor | 1 - ...in.compiler.plugin.CompilerPluginRegistrar | 1 - .../test/scala/tests/BaseBuildToolSuite.scala | 6 +- .../scala/tests/GradleBuildToolSuite.scala | 26 +- .../tests/GradleBuildToolSuiteBase.scala | 4 +- .../scala/tests/MavenBuildToolSuite.scala | 2 +- .../test/scala/tests/ScipBuildToolSuite.scala | 4 +- tests/gradle-example/.gitignore | 2 +- tests/minimized/BUILD | 4 +- .../main/java/minimized/AbstractClasses.java | 26 +- .../java/minimized/AnnotationParameters.java | 130 +++--- .../src/main/java/minimized/Annotations.java | 90 ++-- .../AnnotationsOnParameterizedTypes.java | 224 +++++----- .../main/java/minimized/AnonymousClasses.java | 50 +-- .../src/main/java/minimized/Arrays.java | 28 +- .../src/main/java/minimized/ClassOf.java | 22 +- .../src/main/java/minimized/Docstrings.java | 46 +- .../minimized/EnumImplementsInterface.java | 38 +- .../src/main/java/minimized/Enums.java | 122 +++--- .../src/main/java/minimized/Fields.java | 130 +++--- .../java/minimized/ForComprehensions.java | 42 +- .../src/main/java/minimized/InnerClasses.java | 392 +++++++++--------- .../src/main/java/minimized/Interfaces.java | 66 +-- .../main/java/minimized/LombokBuilder.java | 96 ++--- .../src/main/java/minimized/Methods.java | 92 ++-- .../java/minimized/MinimizedJavaMain.java | 92 ++-- .../java/minimized/ParameterizedTypes.java | 146 +++---- .../src/main/java/minimized/Primitives.java | 66 +-- .../src/main/java/minimized/RawTypes.java | 34 +- .../src/main/java/minimized/SubClasses.java | 62 +-- .../src/main/java/minimized/TabIndented.java | 40 +- .../main/java/minimized/TypeAnnotations.java | 68 +-- .../main/java/minimized/TypeVariables.java | 100 ++--- .../MinimizedSnapshotScipGenerator.scala | 2 +- .../main/scala/tests/SimpleFileManager.java | 4 +- .../main/scala/tests/TempDirectories.scala | 2 +- .../src/main/scala/tests/TestCompiler.scala | 19 +- .../tests/JavacClassesDirectorySuite.scala | 2 +- .../test/scala/tests/JdkPackageSuite.scala | 2 +- .../src/test/scala/tests/OverridesSuite.scala | 2 +- .../scala/tests/SnapshotCommandSuite.scala | 22 +- .../scala/tests/SymbolDescriptorSuite.scala | 4 +- .../src/test/scala/tests/TargetedSuite.scala | 2 +- 171 files changed, 2345 insertions(+), 2368 deletions(-) rename {scip-semanticdb => scip-aggregator}/BUILD (84%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/BazelBuildTool.java (94%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/BazelOptions.java (95%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/InputStreamBytes.java (93%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/JdkPackage.java (96%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/MavenPackage.java (96%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/MessageOnlyException.java (90%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/OperatingSystem.java (77%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/Package.java (93%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/PackageTable.java (97%) rename scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregator.java (95%) rename scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbOptions.java => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorOptions.java (82%) rename scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbReporter.java => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorReporter.java (65%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/ScipOutputStream.java (95%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/ScipWriter.java (83%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/SymbolDescriptor.java (69%) rename {scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb => scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator}/SymbolRewriter.java (76%) rename {scip-semanticdb => scip-aggregator}/src/main/protobuf/bazelbuild.proto (100%) rename semanticdb-gradle-plugin/src/main/scala/SemanticdbGradlePlugin.scala => scip-gradle-plugin/src/main/scala/ScipGradlePlugin.scala (91%) rename scip-java/src/main/scala/com/sourcegraph/{scip_semanticdb/ConsolescipSemanticdbReporter.scala => scip_aggregator/ConsoleScipAggregatorReporter.scala} (79%) rename scip-java/src/main/scala/com/sourcegraph/{scip_semanticdb/ScipSemanticdbProgressRenderer.scala => scip_aggregator/ScipAggregatorProgressRenderer.scala} (83%) rename scip-java/src/main/scala/com/sourcegraph/scip_java/commands/{IndexSemanticdbCommand.scala => IndexScipCommand.scala} (83%) rename {semanticdb-javac => scip-javac}/BUILD (87%) rename {semanticdb-javac => scip-javac}/defs.bzl (68%) rename {semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac => scip-javac/src/main/java/com/sourcegraph/scip_javac}/CompilationUnitException.java (85%) rename {semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac => scip-javac/src/main/java/com/sourcegraph/scip_javac}/CompilerRange.java (71%) rename {semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac => scip-javac/src/main/java/com/sourcegraph/scip_javac}/Debugging.java (89%) rename {semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac => scip-javac/src/main/java/com/sourcegraph/scip_javac}/GlobalSymbolsCache.java (68%) rename semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/InjectSemanticdbOptions.java => scip-javac/src/main/java/com/sourcegraph/scip_javac/InjectScipOptions.java (60%) rename {semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac => scip-javac/src/main/java/com/sourcegraph/scip_javac}/RangeFinder.java (98%) rename {semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac => scip-javac/src/main/java/com/sourcegraph/scip_javac}/Result.java (97%) rename {semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac => scip-javac/src/main/java/com/sourcegraph/scip_javac}/ScipJavaSignatureFormatter.java (99%) rename semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java => scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavacOptions.java (83%) rename semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbOptionBuilder.java => scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipOptionBuilder.java (84%) create mode 100644 scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipPlugin.java rename semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbReporter.java => scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipReporter.java (82%) rename semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java => scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipTaskListener.java (91%) rename {semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac => scip-javac/src/main/java/com/sourcegraph/scip_javac}/ScipVisitor.java (97%) rename {semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac => scip-javac/src/main/java/com/sourcegraph/scip_javac}/TargetPaths.java (83%) create mode 100644 scip-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin create mode 100644 scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java create mode 100644 scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java create mode 100644 scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java create mode 100644 scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java create mode 100644 scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java create mode 100644 scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt create mode 100644 scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt create mode 100644 scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt create mode 100644 scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt create mode 100644 scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt rename {semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc => scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc}/minimized/src/main/kotlin/snapshots/Lambdas.kt (54%) create mode 100644 scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/java/snapshots/ClassConsumer.java (100%) rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/java/snapshots/CompanionConsumer.java (100%) rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/java/snapshots/KotlinClass.java (100%) rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/java/snapshots/KotlinLambdas.java (100%) rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/java/snapshots/ObjectKtConsumer.java (100%) rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/kotlin/snapshots/Class.kt (100%) rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/kotlin/snapshots/CompanionOwner.kt (100%) rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/kotlin/snapshots/Docstrings.kt (100%) rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/kotlin/snapshots/Functions.kt (100%) rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/kotlin/snapshots/Implementations.kt (100%) rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/kotlin/snapshots/Lambdas.kt (100%) rename {semanticdb-kotlinc => scip-kotlinc}/minimized/src/main/kotlin/snapshots/ObjectKt.kt (100%) rename {semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc => scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc}/AnalyzerCheckers.kt (98%) rename {semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc => scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc}/AnalyzerCommandLineProcessor.kt (92%) rename {semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc => scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc}/AnalyzerFirExtensionRegistrar.kt (67%) rename {semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc => scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc}/AnalyzerParamsProvider.kt (75%) rename {semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc => scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc}/AnalyzerRegistrar.kt (89%) rename {semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc => scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc}/LineMap.kt (97%) rename {semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc => scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc}/PostAnalysisExtension.kt (91%) rename semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbSymbols.kt => scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipSymbols.kt (85%) rename semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbTextDocumentBuilder.kt => scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipTextDocumentBuilder.kt (97%) rename semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbVisitor.kt => scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipVisitor.kt (94%) rename {semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc => scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc}/SymbolsCache.kt (86%) create mode 100644 scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor create mode 100644 scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar rename {semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc => scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc}/test/AnalyzerTest.kt (97%) rename {semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc => scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc}/test/ScipBuilders.kt (96%) rename semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/SemanticdbSymbolsTest.kt => scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipSymbolsTest.kt (99%) rename {semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc => scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc}/test/Utils.kt (93%) rename {semanticdb-shared => scip-shared}/BUILD (91%) rename {semanticdb-shared/src/main/java/com/sourcegraph/semanticdb => scip-shared/src/main/java/com/sourcegraph/scip}/LocalSymbolsCache.java (90%) rename {semanticdb-shared/src/main/java/com/sourcegraph/semanticdb => scip-shared/src/main/java/com/sourcegraph/scip}/NoRelativePathMode.java (73%) rename {semanticdb-shared/src/main/java/com/sourcegraph/semanticdb => scip-shared/src/main/java/com/sourcegraph/scip}/ScipDocumentBuilder.java (98%) rename semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/SemanticdbOptions.java => scip-shared/src/main/java/com/sourcegraph/scip/ScipOptions.java (63%) rename {semanticdb-shared/src/main/java/com/sourcegraph/semanticdb => scip-shared/src/main/java/com/sourcegraph/scip}/ScipShardPaths.java (94%) rename {semanticdb-shared/src/main/java/com/sourcegraph/semanticdb => scip-shared/src/main/java/com/sourcegraph/scip}/ScipShardWriter.java (95%) rename semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/SemanticdbSymbols.java => scip-shared/src/main/java/com/sourcegraph/scip/ScipSymbols.java (92%) rename {semanticdb-shared/src/main/java/com/sourcegraph/semanticdb => scip-shared/src/main/java/com/sourcegraph/scip}/UriScheme.java (56%) delete mode 100644 semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java delete mode 100644 semanticdb-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin delete mode 100644 semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java delete mode 100644 semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java delete mode 100644 semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java delete mode 100644 semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java delete mode 100644 semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java delete mode 100644 semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt delete mode 100644 semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt delete mode 100644 semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt delete mode 100644 semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt delete mode 100644 semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt delete mode 100644 semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt delete mode 100644 semanticdb-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor delete mode 100644 semanticdb-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar diff --git a/.bazelignore b/.bazelignore index 03bd4892..0b48fc8b 100644 --- a/.bazelignore +++ b/.bazelignore @@ -3,12 +3,12 @@ examples/ maven-plugin/target/ project/target/ scip-java/target/ -scip-semanticdb/target/ -semanticdb-agent/target/ -semanticdb-gradle-plugin/target/ -semanticdb-java/target/ -semanticdb-javac/target/ -semanticdb-kotlinc/target/ +scip-aggregator/target/ +scip-agent/target/ +scip-gradle-plugin/target/ +scip-java/target/ +scip-javac/target/ +scip-kotlinc/target/ target/ tests/buildTools/target/ tests/minimized/target/ diff --git a/.dockerignore b/.dockerignore index ef28dd5d..de654cf6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -65,5 +65,5 @@ bazel-lsif-java VERSION -semanticdb-gradle-plugin/gradle +scip-gradle-plugin/gradle aspects/scip_java.bzl diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d97bc37a..3c9914ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,12 +68,12 @@ jobs: - uses: DeterminateSystems/magic-nix-cache-action@v13 - - run: nix develop --command bazelisk build //... --//semanticdb-javac:enabled=true - - run: nix develop --command bazelisk run scip-semanticdb:bazel -- --sourceroot "$PWD" + - run: nix develop --command bazelisk build //... --//scip-javac:enabled=true + - run: nix develop --command bazelisk run scip-aggregator:bazel -- --sourceroot "$PWD" - run: du -h index.scip - - run: nix develop "$GITHUB_WORKSPACE" --command bazelisk build //... --@scip_java//semanticdb-javac:enabled=true + - run: nix develop "$GITHUB_WORKSPACE" --command bazelisk build //... --@scip_java//scip-javac:enabled=true working-directory: examples/bazel-example - - run: nix develop "$GITHUB_WORKSPACE" --command bazelisk run @scip_java//scip-semanticdb:bazel -- --sourceroot "$PWD" + - run: nix develop "$GITHUB_WORKSPACE" --command bazelisk run @scip_java//scip-aggregator:bazel -- --sourceroot "$PWD" working-directory: examples/bazel-example - run: du -h index.scip working-directory: examples/bazel-example @@ -108,7 +108,7 @@ jobs: kotlin_plugin: runs-on: ubuntu-latest - name: semanticdb-kotlinc + name: scip-kotlinc steps: - uses: actions/checkout@v4 @@ -118,16 +118,16 @@ jobs: - uses: DeterminateSystems/magic-nix-cache-action@v13 - - name: semanticdb-kotlinc tests - run: nix develop --command sbt semanticdbKotlinc/test + - name: scip-kotlinc tests + run: nix develop --command sbt scipKotlinc/test - name: Kotlin snapshots - run: nix develop --command sbt semanticdbKotlincMinimized/kotlincSnapshots + run: nix develop --command sbt scipKotlincMinimized/kotlincSnapshots - name: Check snapshot drift run: | git diff --exit-code \ - semanticdb-kotlinc/minimized/src/generatedSnapshots + scip-kotlinc/minimized/src/generatedSnapshots check: runs-on: ubuntu-latest @@ -169,13 +169,13 @@ jobs: mvn clean verify -DskipTests "-Dscip-java.version=$SCIP_JAVA_VERSION" sourcegraph:sourcegraphDependencies working-directory: examples/maven-example - - run: nix develop "$GITHUB_WORKSPACE#jdk${{ matrix.java }}" --command "$SCIP_JAVA_CLI" index-semanticdb target/semanticdb-targetroot + - run: nix develop "$GITHUB_WORKSPACE#jdk${{ matrix.java }}" --command "$SCIP_JAVA_CLI" index-scip target/scip-targetroot working-directory: examples/maven-example - run: | set -e - grep org.hamcrest target/semanticdb-targetroot/*dependencies.txt - grep "$PWD/src/main/java" target/semanticdb-targetroot/*dependencies.txt + grep org.hamcrest target/scip-targetroot/*dependencies.txt + grep "$PWD/src/main/java" target/scip-targetroot/*dependencies.txt working-directory: examples/maven-example - run: du -h index.scip diff --git a/.gitignore b/.gitignore index 14024120..6baf3fe6 100644 --- a/.gitignore +++ b/.gitignore @@ -70,15 +70,15 @@ bazel-testlogs VERSION -semanticdb-gradle-plugin/gradle +scip-gradle-plugin/gradle /aspects/ tests/snapshots/META-INF/ -# semanticdb-kotlinc kctfork-based tests run kotlinc with our plugin, which -# writes META-INF/semanticdb/sources/Test.kt.semanticdb relative to the test +# scip-kotlinc kctfork-based tests run kotlinc with our plugin, which +# writes META-INF/scip/sources/Test.kt.scip relative to the test # cwd. -semanticdb-kotlinc/META-INF/ +scip-kotlinc/META-INF/ # Standard sbt project metadata directories. project/target/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 808c2bef..adc2ec51 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,8 +31,8 @@ If you'd rather install tools manually, you'll need at least: These are the main components of the project. -- `semanticdb-javac/src/main/java`: the Java compiler plugin that creates - SemanticDB files. +- `scip-javac/src/main/java`: the Java compiler plugin that creates + SCIP files. - `tests/minimized`: minimized Java source files that reproduce interesting test cases. - `tests/unit`: fast running unit tests that are helpful for local edit-and-test diff --git a/build.sbt b/build.sbt index 721c3b41..67050a19 100644 --- a/build.sbt +++ b/build.sbt @@ -73,20 +73,20 @@ commands += // Shared module with the SCIP shard utilities (symbol encoder, document // builder, on-disk writer) consumed by both the Java compiler plugin -// (semanticdb-javac) and the Kotlin compiler plugin (semanticdb-kotlinc). -lazy val semanticdbShared = project - .in(file("semanticdb-shared")) +// (scip-javac) and the Kotlin compiler plugin (scip-kotlinc). +lazy val scipShared = project + .in(file("scip-shared")) .settings( - moduleName := "semanticdb-shared", + moduleName := "scip-shared", javaOnlySettings, libraryDependencies += "org.scip-code" % "scip-java-bindings" % V.scipBindings ) lazy val gradlePlugin = project - .in(file("semanticdb-gradle-plugin")) + .in(file("scip-gradle-plugin")) .settings( - name := "semanticdb-gradle", + name := "scip-gradle", buildInfoPackage := "com.sourcegraph.scip_java", publish / skip := true, scalacOptions ++= Seq("-target:11", "-release", "11"), @@ -103,22 +103,22 @@ lazy val gradlePlugin = project sbtVersion, scalaVersion, "javacModuleOptions" -> javacModuleOptions, - "semanticdbVersion" -> V.scalameta, + "scalametaVersion" -> V.scalameta, "scala213" -> V.scala213 ) ) .enablePlugins(BuildInfoPlugin) lazy val javacPlugin = project - .in(file("semanticdb-javac")) + .in(file("scip-javac")) .settings( fatjarPackageSettings, javaOnlySettings, - moduleName := "semanticdb-javac", + moduleName := "scip-javac", // Scoped to compile so doc tasks (which reject -g) are unaffected. Compile / compile / javacOptions += "-g", // JDK 14+ ServiceLoader-scans the classpath for Plugin providers; our - // own META-INF/services entry points at SemanticdbPlugin before it's + // own META-INF/services entry points at ScipPlugin before it's // built. Force an empty processor path so javac skips the scan. Compile / compile / javacOptions ++= { val empty = target.value / "empty-processorpath" @@ -129,16 +129,16 @@ lazy val javacPlugin = project Seq( ShadeRule .rename( - // Don't rename SemanticdbPlugin since the fully-qualified name is + // Don't rename ScipPlugin since the fully-qualified name is // referenced from META-INF/services/com.sun.source.util.Plugin - "com.sourcegraph.semanticdb_javac.SemanticdbPlugin" -> - "com.sourcegraph.semanticdb_javac.SemanticdbPlugin", - // Don't rename InjectSemanticdbOptions because we load it via FQN to + "com.sourcegraph.scip_javac.ScipPlugin" -> + "com.sourcegraph.scip_javac.ScipPlugin", + // Don't rename InjectScipOptions because we load it via FQN to // process a list of Java compiler options. - "com.sourcegraph.semanticdb_javac.InjectSemanticdbOptions" -> - "com.sourcegraph.semanticdb_javac.InjectSemanticdbOptions", + "com.sourcegraph.scip_javac.InjectScipOptions" -> + "com.sourcegraph.scip_javac.InjectScipOptions", "com.google.**" -> "com.sourcegraph.shaded.com.google.@1", - // Shade everything else in the semanticdb-javac compiler plugin in + // Shade everything else in the scip-javac compiler plugin in // order to be able to index the plugin code itself. Without this step, // we can't add the plugin to the classpath while compiling the source // code of the plugin itself because it results in cryptic compile errors. @@ -149,13 +149,13 @@ lazy val javacPlugin = project .inAll ) ) - .dependsOn(semanticdbShared) + .dependsOn(scipShared) lazy val scip = project - .in(file("scip-semanticdb")) + .in(file("scip-aggregator")) .settings( publishMavenStyle := true, - moduleName := "scip-semanticdb", + moduleName := "scip-aggregator", javaOnlySettings, libraryDependencies ++= Seq("org.scip-code" % "scip-java-bindings" % V.scipBindings), @@ -163,7 +163,7 @@ lazy val scip = project Seq(PB.gens.java(V.protobuf) -> (Compile / sourceManaged).value), Compile / PB.protocOptions := Seq("--experimental_allow_proto3_optional") ) - .dependsOn(semanticdbShared) + .dependsOn(scipShared) lazy val mavenPlugin = project .in(file("maven-plugin")) @@ -201,7 +201,7 @@ lazy val cli = project (Compile / mainClass) := Some("com.sourcegraph.scip_java.ScipJava"), (run / baseDirectory) := (ThisBuild / baseDirectory).value, // ScipJava.main can call System.exit, so we always fork the JVM when - // sbt invokes it directly (e.g. from the semanticdb-kotlinc snapshots + // sbt invokes it directly (e.g. from the scip-kotlinc snapshots // task) so it cannot kill the surrounding sbt process. Compile / run / fork := true, buildInfoKeys := @@ -210,7 +210,7 @@ lazy val cli = project sbtVersion, scalaVersion, "javacModuleOptions" -> javacModuleOptions, - "semanticdbVersion" -> V.scalameta, + "scalametaVersion" -> V.scalameta, "scala213" -> V.scala213 ), buildInfoPackage := "com.sourcegraph.scip_java", @@ -238,12 +238,12 @@ lazy val cli = project addJar( (javacPlugin / Compile / Keys.`package`).value, - "semanticdb-plugin.jar" + "scip-plugin.jar" ) addJar((gradlePlugin / Compile / assembly).value, "gradle-plugin.jar") addJar( - (semanticdbKotlinc / Compile / Keys.`package`).value, - "semanticdb-kotlinc.jar" + (scipKotlinc / Compile / Keys.`package`).value, + "scip-kotlinc.jar" ) IO.copy( @@ -292,25 +292,25 @@ lazy val cli = project .enablePlugins(PackPlugin, DockerPlugin, BuildInfoPlugin) .dependsOn(scip) -// Task key for regenerating the SCIP/SemanticDB golden snapshots emitted by -// the semanticdb-kotlinc compiler plugin over the Kotlin minimized fixtures. +// Task key for regenerating the SCIP/SCIP golden snapshots emitted by +// the scip-kotlinc compiler plugin over the Kotlin minimized fixtures. // We deliberately do NOT call this `snapshots` to avoid colliding with the // existing top-level `snapshots` test project (`lazy val snapshots = project`). lazy val kotlincSnapshots = taskKey[Unit]( - "Run the SCIP snapshot generator over the semanticdb-kotlinc minimized project" + "Run the SCIP snapshot generator over the scip-kotlinc minimized project" ) -// The semanticdb-kotlinc compiler plugin. Built as a fat-jar that is later +// The scip-kotlinc compiler plugin. Built as a fat-jar that is later // embedded into the scip-java CLI distribution (see cli's resourceGenerators) -// so the runtime no longer needs to fetch a published semanticdb-kotlinc +// so the runtime no longer needs to fetch a published scip-kotlinc // artifact from Maven. -lazy val semanticdbKotlinc = project - .in(file("semanticdb-kotlinc")) +lazy val scipKotlinc = project + .in(file("scip-kotlinc")) .enablePlugins(KotlinPlugin) .settings( - name := "semanticdb-kotlinc", - moduleName := "semanticdb-kotlinc", - description := "A kotlinc plugin to emit SemanticDB information", + name := "scip-kotlinc", + moduleName := "scip-kotlinc", + description := "A kotlinc plugin to emit SCIP information", crossPaths := false, autoScalaLibrary := false, // Pin bytecode to major 55 so sbt-assembly's older ASM can shade it. @@ -327,7 +327,7 @@ lazy val semanticdbKotlinc = project // classpath via Provided so the assembled fat-jar does not bundle it. libraryDependencies += "org.jetbrains.kotlin" % "kotlin-stdlib" % V.kotlinVersion % Provided, - // SCIP message classes come from semanticdbShared (which depends on + // SCIP message classes come from scipShared (which depends on // scip-java-bindings); this adds the Kotlin DSL extensions on top. libraryDependencies += "org.scip-code" % "scip-kotlin-bindings" % V.scipBindings, @@ -403,16 +403,16 @@ lazy val semanticdbKotlinc = project Attributed.blank(dir) } ) - .dependsOn(semanticdbShared) + .dependsOn(scipShared) -// `semanticdbKotlincMinimized` mirrors the (still-present) Gradle build at -// semanticdb-kotlinc/minimized/build.gradle.kts. It compiles a small set of -// Kotlin and Java fixtures with the assembled `semanticdbKotlinc` plugin -// attached to kotlinc/javac, producing *.semanticdb files under -// target/semanticdb-targetroot/ which are then converted to SCIP and rendered +// `scipKotlincMinimized` mirrors the (still-present) Gradle build at +// scip-kotlinc/minimized/build.gradle.kts. It compiles a small set of +// Kotlin and Java fixtures with the assembled `scipKotlinc` plugin +// attached to kotlinc/javac, producing *.scip files under +// target/scip-targetroot/ which are then converted to SCIP and rendered // as the human-readable golden snapshots by the `snapshots` task. -lazy val semanticdbKotlincMinimized = project - .in(file("semanticdb-kotlinc/minimized")) +lazy val scipKotlincMinimized = project + .in(file("scip-kotlinc/minimized")) .enablePlugins(KotlinPlugin) .settings( publish / skip := true, @@ -422,11 +422,11 @@ lazy val semanticdbKotlincMinimized = project kotlincJvmTarget := "1.8", kotlinLib("stdlib"), // Force javac to fork. Two reasons: - // 1. JDK 9+ strongly encapsulates jdk.compiler internals; semanticdb-javac + // 1. JDK 9+ strongly encapsulates jdk.compiler internals; scip-javac // reflectively touches them and needs --add-exports flags. With a // forked javac we can pass `-J--add-exports=...` (mirrors scip-java). // 2. sbt's in-process javac receives `vf://` virtual-file URIs from the - // MappedFileConverter, which semanticdb-javac cannot resolve via + // MappedFileConverter, which scip-javac cannot resolve via // java.nio.file.Path.of. Forked javac is invoked with absolute file // paths instead, so the plugin sees real paths. // Setting javaHome to Some() flips @@ -442,32 +442,32 @@ lazy val semanticdbKotlincMinimized = project // don't have to predict the assembled jar's filename. The .value reference // also gives us the right task ordering — assembly runs before compile. Compile / unmanagedJars += - Attributed.blank((semanticdbKotlinc / Compile / packageBin).value), - // Wire the locally-built semanticdb-javac fat jar in place of fetching the - // published `com.sourcegraph:semanticdb-javac` artifact at compile time. + Attributed.blank((scipKotlinc / Compile / packageBin).value), + // Wire the locally-built scip-javac fat jar in place of fetching the + // published `com.sourcegraph:scip-javac` artifact at compile time. Compile / unmanagedJars += Attributed.blank((javacPlugin / Compile / Keys.`package`).value), Compile / kotlincPluginOptions ++= { val srcRoot = (ThisBuild / baseDirectory).value.getAbsolutePath - val tgtRoot = (target.value / "semanticdb-targetroot").getAbsolutePath + val tgtRoot = (target.value / "scip-targetroot").getAbsolutePath Seq( - s"plugin:semanticdb-kotlinc:sourceroot=$srcRoot", - s"plugin:semanticdb-kotlinc:targetroot=$tgtRoot" + s"plugin:scip-kotlinc:sourceroot=$srcRoot", + s"plugin:scip-kotlinc:targetroot=$tgtRoot" ) }, - // The semanticdb javac plugin parses its own argument string, so - // `-Xplugin:semanticdb -sourceroot:<...> -targetroot:<...>` MUST be passed + // The scip javac plugin parses its own argument string, so + // `-Xplugin:scip -sourceroot:<...> -targetroot:<...>` MUST be passed // as a single javac argument (matches the existing Gradle behavior). Compile / javacOptions += { val srcRoot = (ThisBuild / baseDirectory).value - val tgtRoot = target.value / "semanticdb-targetroot" - s"-Xplugin:semanticdb -sourceroot:${srcRoot.getAbsolutePath} " + + val tgtRoot = target.value / "scip-targetroot" + s"-Xplugin:scip -sourceroot:${srcRoot.getAbsolutePath} " + s"-targetroot:${tgtRoot.getAbsolutePath}" }, // ----- snapshots regeneration task ----- // Invokes `com.sourcegraph.scip_java.ScipJava.main` twice in the cli JVM // (forked — ScipJava.main calls System.exit on failure). First pass - // converts the *.semanticdb files under target/semanticdb-targetroot/ + // converts the *.scip files under target/scip-targetroot/ // into an index.scip; second pass renders that index as the human-readable // golden snapshots. // @@ -477,7 +477,7 @@ lazy val semanticdbKotlincMinimized = project Def .taskDyn { val srcRoot = (ThisBuild / baseDirectory).value.getAbsolutePath - val tgtRoot = (target.value / "semanticdb-targetroot").getAbsolutePath + val tgtRoot = (target.value / "scip-targetroot").getAbsolutePath val snapDir = (baseDirectory.value / "src" / "generatedSnapshots" / "resources") .getAbsolutePath @@ -486,7 +486,7 @@ lazy val semanticdbKotlincMinimized = project Def.sequential( Compile / compile, (cli / Compile / runMain).toTask( - s" $mainCls index-semanticdb --no-emit-inverse-relationships --cwd $srcRoot --output $scipOut $tgtRoot" + s" $mainCls index-scip --no-emit-inverse-relationships --cwd $srcRoot --output $scipOut $tgtRoot" ), (cli / Compile / runMain).toTask( s" $mainCls snapshot --cwd $srcRoot --output $snapDir $tgtRoot" @@ -507,12 +507,12 @@ lazy val minimizedSettings = List[Def.Setting[_]]( (Compile / unmanagedSourceDirectories) += minimizedSourceDirectory, libraryDependencies ++= List("org.projectlombok" % "lombok" % "1.18.22"), // Fork javac so it receives real file paths instead of sbt's `vf://` virtual-file URIs - // (see the comment on `semanticdbKotlincMinimized` for the long story). + // (see the comment on `scipKotlincMinimized` for the long story). javaHome := Some(file(System.getProperty("java.home"))), Compile / javacOptions ++= javacModuleOptions, javacOptions += List( - s"-Xplugin:semanticdb", + s"-Xplugin:scip", s"-text:on", s"-verbose", s"-sourceroot:${(ThisBuild / baseDirectory).value}", diff --git a/docs/design.md b/docs/design.md index af79ca5f..ef0469c3 100644 --- a/docs/design.md +++ b/docs/design.md @@ -6,8 +6,8 @@ title: Design This project is implemented as a [Java compiler plugin](https://docs.oracle.com/en/java/javase/11/docs/api/jdk.compiler/com/sun/source/util/Plugin.html) that generates one -[SemanticDB](https://scalameta.org/docs/semanticdb/specification.html) file for -every `*.java` source file. After compilation completes, the SemanticDB files +[SCIP](https://scalameta.org/docs/scip/specification.html) file for +every `*.java` source file. After compilation completes, the SCIP files are processed to produce SCIP. ### Why Java compiler plugin? @@ -25,22 +25,22 @@ There are several benefits to implementing scip-java as a compiler plugin: installed system dependencies, custom compiler options and custom annotation processors. -### Why SemanticDB? +### Why SCIP? -SemanticDB is Protobuf schema for information about symbols and types in Java -programs and other languages. There are several benefits to using SemanticDB as +SCIP is Protobuf schema for information about symbols and types in Java +programs and other languages. There are several benefits to using SCIP as an intermediary representation for SCIP: - **Simplicity**: It's easy to translate a single Java source file into a single - SemanticDB file inside a compiler plugin. It's more complicated to produce + SCIP file inside a compiler plugin. It's more complicated to produce SCIP because compiler plugins does not have access to a project-wide context, which is necessary to produce accurate definitions and hovers in multi-module projects with external library dependencies. -- **Performance**: SemanticDB is fast to write and read. Each compilation unit +- **Performance**: SCIP is fast to write and read. Each compilation unit can be processed independently to keep memory usage low. The final conversion - from SemanticDB to SCIP can be safely parallelized. + from SCIP to SCIP can be safely parallelized. - **Cross-repository**: Compiler plugins have access to both source code and the - classpath (compiled bytecode of upstream dependencies). SemanticDB has been + classpath (compiled bytecode of upstream dependencies). SCIP has been designed so that it's also possible to generate spec-compliant symbols from the classpath alone (no source code) and from the syntax tree of an individual source file (no classpath). This flexibility will be helpful for scip-java in diff --git a/docs/getting-started.md b/docs/getting-started.md index 93d896a0..401e0a29 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -340,21 +340,21 @@ source. configured `java_library` and `java_binary` targets to be indexed with scip-java. -Once configured, build the codebase with the SemanticDB compiler plugin. +Once configured, build the codebase with the SCIP compiler plugin. ```sh -bazel build //... --@scip_java//semanticdb-javac:enabled=true +bazel build //... --@scip_java//scip-javac:enabled=true ``` Next, run the following command to generate the SCIP index (`index.scip`). ``` -bazel run @scip_java//scip-semanticdb:bazel -- --sourceroot $PWD +bazel run @scip_java//scip-aggregator:bazel -- --sourceroot $PWD -# (optional) Validate that SemanticDB files were generated. +# (optional) Validate that SCIP files were generated. # The command below works for the `examples/bazel-example` directory in the sourcegraph/scip-java repository. -❯ jar tf bazel-bin/src/main/java/example/libexample.jar | grep semanticdb$ -META-INF/semanticdb/src/main/java/example/Example.java.semanticdb +❯ jar tf bazel-bin/src/main/java/example/libexample.jar | grep scip$ +META-INF/scip/src/main/java/example/Example.java.scip ``` Finally, run the following commands to upload the SCIP index to Sourcegraph. diff --git a/docs/manual-configuration.md b/docs/manual-configuration.md index 49e3597d..11e80e1f 100644 --- a/docs/manual-configuration.md +++ b/docs/manual-configuration.md @@ -12,36 +12,36 @@ fails. Indexing a codebase consists of two independent phases: -- Compile the codebase with the SemanticDB compiler plugin. -- Generate SCIP index from SemanticDB files. +- Compile the codebase with the SCIP compiler plugin. +- Generate SCIP index from SCIP files. -![A three stage pipeline that starts with a list of Java sources, creates a list of SemanticDB files that then become a single SCIP index.](assets/semanticdb-javac-pipeline.svg) +![A three stage pipeline that starts with a list of Java sources, creates a list of SCIP files that then become a single SCIP index.](assets/scip-javac-pipeline.svg) The first phase can be complicated to configure and it can take a while to run. The second phase is quite simple to configure and it usually runs very fast. -## Step 1: Add SemanticDB compiler plugin to the classpath +## Step 1: Add SCIP compiler plugin to the classpath -The SemanticDB compiler plugin is published to Maven Central as a +The SCIP compiler plugin is published to Maven Central as a zero-dependency Java library that you can install like any normal dependency. -[![](https://img.shields.io/maven-central/v/com.sourcegraph/semanticdb-javac)](https://repo1.maven.org/maven2/com/sourcegraph/semanticdb-javac/) +[![](https://img.shields.io/maven-central/v/com.sourcegraph/scip-javac)](https://repo1.maven.org/maven2/com/sourcegraph/scip-javac/) Use `curl` to download the compiler plugin jar file manually so that it can be added to the `javac -classpath` option. ```sh -curl -Lo semanticdb-javac.jar https://repo1.maven.org/maven2/com/sourcegraph/semanticdb-javac/@STABLE_VERSION@/semanticdb-javac-@STABLE_VERSION@.jar -javac -classpath semanticdb-javac.jar MyApplication.java +curl -Lo scip-javac.jar https://repo1.maven.org/maven2/com/sourcegraph/scip-javac/@STABLE_VERSION@/scip-javac-@STABLE_VERSION@.jar +javac -classpath scip-javac.jar MyApplication.java ``` If you're using Gradle. ```groovy // Option 1: if you are not using annotation processors -compileOnly 'com.sourcegraph:semanticdb-javac:@STABLE_VERSION@' +compileOnly 'com.sourcegraph:scip-javac:@STABLE_VERSION@' // Option 2: if you are using annotation processors -annotationProcessor 'com.sourcegraph:semanticdb-javac:@STABLE_VERSION@' +annotationProcessor 'com.sourcegraph:scip-javac:@STABLE_VERSION@' ``` If you're using Maven. @@ -49,21 +49,21 @@ If you're using Maven. ```xml com.sourcegraph - semanticdb-javac + scip-javac @STABLE_VERSION@ ``` -## Step 2: Enable `-Xplugin:semanticdb` compiler option +## Step 2: Enable `-Xplugin:scip` compiler option -Add `-Xplugin:semanticdb` to your compiler options to enable the SemanticDB +Add `-Xplugin:scip` to your compiler options to enable the SCIP compiler plugin. To do this you need to explicitly configure two directories: - `-sourceroot:PATH`: the absolute path to the root directory of your codebase. It's important that all of the source files that should be index live under this directory. - `-targetroot:PATH`: the absolute path to the directory where to generate - SemanticDB file. This directory can be anywhere on your file system. + SCIP file. This directory can be anywhere on your file system. Alternatively, pass in `-targetroot:javac-classes-directory` for the plugin to automatically use the `javac` output directory. @@ -72,8 +72,8 @@ If you're using Gradle. ```groovy tasks.withType(JavaCompile) { def sourceroot = rootProject.projectDir - def targetroot = new File(rootProject.buildDir, "semanticdb-targetroot") - options.compilerArgs << "-Xplugin:semanticdb -sourceroot:$sourceroot -targetroot:$targetroot" + def targetroot = new File(rootProject.buildDir, "scip-targetroot") + options.compilerArgs << "-Xplugin:scip -sourceroot:$sourceroot -targetroot:$targetroot" } ``` @@ -91,7 +91,7 @@ If you're using Maven. 3.8.1 -+ -Xplugin:semanticdb -sourceroot:${session.executionRootDirectory} -targetroot:${session.executionRootDirectory}/target/semanticdb-targetroot ++ -Xplugin:scip -sourceroot:${session.executionRootDirectory} -targetroot:${session.executionRootDirectory}/target/scip-targetroot @@ -112,13 +112,13 @@ examples: - Maven: `mvn clean verify -DskipTests` - Bazel: `bazel build //...` -If everything went well, you should have a lot of `*.semanticdb` files in the +If everything went well, you should have a lot of `*.scip` files in the targetroot directory. ``` ❯ find $TARGETROOT -type f -build/semanticdb-targetroot/META-INF/semanticdb/j11/src/test/java/example/ExampleTest.java.semanticdb -build/semanticdb-targetroot/META-INF/semanticdb/j11/src/main/java/example/Example.java.semanticdb +build/scip-targetroot/META-INF/scip/j11/src/test/java/example/ExampleTest.java.scip +build/scip-targetroot/META-INF/scip/j11/src/main/java/example/Example.java.scip ... ``` @@ -130,8 +130,8 @@ references" to show results from multiple repositories. By default, the `index.scip` file only enables navigation within the local repository. You can optionally enable cross-repository navigation by creating -one of the following files in the SemanticDB _targetroot_ directory (the path in -`-Xplugin:semanticdb -targeroot:PATH`). +one of the following files in the SCIP _targetroot_ directory (the path in +`-Xplugin:scip -targeroot:PATH`). - `javacopts.txt`: line-separated list of Java compiler options that got passed to the compiler. For example, @@ -198,16 +198,16 @@ Which allows you to invoke it by simply running `mvn sourcegraph:sourcegraphDepe Cross-repository navigation is a feature that allows "goto definition" and "find references" to show results from multiple repositories. -## Step 5: Generate SCIP index from SemanticDB files +## Step 5: Generate SCIP index from SCIP files First, install the `scip-java` command-line tool according to the instructions in the [getting started guide](getting-started.md). -Next, run the `scip-java index-semanticdb` command to convert SemanticDB files +Next, run the `scip-java index-scip` command to convert SCIP files into SCIP. ```sh -❯ scip-java index-semanticdb $TARGETROOT +❯ scip-java index-scip $TARGETROOT ❯ file index.scip index.scip: JSON data ``` diff --git a/examples/bazel-example/src/main/java/example/BUILD b/examples/bazel-example/src/main/java/example/BUILD index 50641093..c06cbf39 100644 --- a/examples/bazel-example/src/main/java/example/BUILD +++ b/examples/bazel-example/src/main/java/example/BUILD @@ -1,10 +1,10 @@ # We import the custom `java_library` implementation that automatically adds the -# SemanticDB compiler plugin based on the presence of the flag -# `--@scip_java//semanticdb-javac:enabled=true`. By default, this java_library +# SCIP compiler plugin based on the presence of the flag +# `--@scip_java//scip-javac:enabled=true`. By default, this java_library # rule works just like the official java_library rule. Feel free to copy-paste -# the `semanticdb:defs.bzl` file and adapt to your needs. This example is only +# the `scip:defs.bzl` file and adapt to your needs. This example is only # for demonstration purposes. -load("@scip_java//semanticdb-javac:defs.bzl", "java_library") +load("@scip_java//scip-javac:defs.bzl", "java_library") package( default_visibility = ["//visibility:public"], diff --git a/examples/bazel-example/src/main/java/source-generator-example/BUILD b/examples/bazel-example/src/main/java/source-generator-example/BUILD index c02d0062..99ae936e 100644 --- a/examples/bazel-example/src/main/java/source-generator-example/BUILD +++ b/examples/bazel-example/src/main/java/source-generator-example/BUILD @@ -1,4 +1,4 @@ -load("@scip_java//semanticdb-javac:defs.bzl", "java_library") +load("@scip_java//scip-javac:defs.bzl", "java_library") load("@rules_java//java:defs.bzl", "java_plugin") package( diff --git a/examples/maven-example/pom.xml b/examples/maven-example/pom.xml index e2934469..90340127 100644 --- a/examples/maven-example/pom.xml +++ b/examples/maven-example/pom.xml @@ -28,7 +28,7 @@ com.sourcegraph - semanticdb-javac + scip-javac ${scip-java.version} @@ -51,7 +51,7 @@ 3.8.0 - -Xplugin:semanticdb -sourceroot:${session.executionRootDirectory} -targetroot:${session.executionRootDirectory}/target/semanticdb-targetroot + -Xplugin:scip -sourceroot:${session.executionRootDirectory} -targetroot:${session.executionRootDirectory}/target/scip-targetroot diff --git a/maven-plugin/src/main/java/com/sourcegraph/maven/DependencyWriterMojo.java b/maven-plugin/src/main/java/com/sourcegraph/maven/DependencyWriterMojo.java index 2b1dbd6b..3b4e73a6 100644 --- a/maven-plugin/src/main/java/com/sourcegraph/maven/DependencyWriterMojo.java +++ b/maven-plugin/src/main/java/com/sourcegraph/maven/DependencyWriterMojo.java @@ -25,8 +25,8 @@ public class DependencyWriterMojo extends AbstractMojo { MavenProject project; @Parameter( - property = "semanticdb.targetRoot", - defaultValue = "${session.executionRootDirectory}/target/semanticdb-targetroot") + property = "scip.targetRoot", + defaultValue = "${session.executionRootDirectory}/target/scip-targetroot") private String targetRoot; public void execute() throws MojoExecutionException, MojoFailureException { diff --git a/maven-plugin/src/main/resources/META-INF/maven/plugin.template.xml b/maven-plugin/src/main/resources/META-INF/maven/plugin.template.xml index 11277768..43ad902c 100644 --- a/maven-plugin/src/main/resources/META-INF/maven/plugin.template.xml +++ b/maven-plugin/src/main/resources/META-INF/maven/plugin.template.xml @@ -42,12 +42,12 @@ java.lang.String false true - Location where `dependencies.txt` file will be written (should match the Semanticdb targetroot option) + Location where `dependencies.txt` file will be written (should match the Scip targetroot option) ${project} - ${session.executionRootDirectory}/target/semanticdb-targetroot + ${session.executionRootDirectory}/target/scip-targetroot diff --git a/scip-semanticdb/BUILD b/scip-aggregator/BUILD similarity index 84% rename from scip-semanticdb/BUILD rename to scip-aggregator/BUILD index 9cee3def..e4817518 100644 --- a/scip-semanticdb/BUILD +++ b/scip-aggregator/BUILD @@ -8,18 +8,18 @@ package( java_binary( name = "bazel", - main_class = "com.sourcegraph.scip_semanticdb.BazelBuildTool", + main_class = "com.sourcegraph.scip_aggregator.BazelBuildTool", runtime_deps = [ - ":scip-semanticdb", + ":scip-aggregator", ], ) java_library( - name = "scip-semanticdb", + name = "scip-aggregator", srcs = glob(["src/main/java/**/*.java"]), deps = [ ":all_java_proto", - "//semanticdb-shared", + "//scip-shared", "@maven//:com_google_code_findbugs_jsr305", "@maven//:com_google_protobuf_protobuf_java", "@maven//:com_google_protobuf_protobuf_java_util", diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelBuildTool.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelBuildTool.java similarity index 94% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelBuildTool.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelBuildTool.java index 0d6df55f..bf4925f8 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelBuildTool.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelBuildTool.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; import com.sourcegraph.scip_java.Bazelbuild; import org.scip_code.scip.ToolInfo; @@ -31,8 +31,8 @@ public static int runAndReturnExitCode(String[] args) throws IOException, Interr } List mavenPackages = mavenPackages(options); - ScipSemanticdbReporter reporter = - new ScipSemanticdbReporter() { + ScipAggregatorReporter reporter = + new ScipAggregatorReporter() { private boolean hasErrors = false; @Override @@ -43,7 +43,7 @@ public void error(Throwable e) { @Override public void error(String message) { - System.err.println("ERROR[scip-semanticdb]: " + message); + System.err.println("ERROR[scip-aggregator]: " + message); hasErrors = true; } @@ -52,8 +52,8 @@ public boolean hasErrors() { return this.hasErrors; } }; - ScipSemanticdbOptions scipOptions = - new ScipSemanticdbOptions( + ScipAggregatorOptions scipOptions = + new ScipAggregatorOptions( options.targetroots, options.output, options.sourceroot, @@ -65,7 +65,7 @@ public boolean hasErrors() { /* allowEmptyIndex */ true, /* indexDirectoryEntries */ false // because Bazel only compiles to jar files. ); - ScipSemanticdb.run(scipOptions); + ScipAggregator.run(scipOptions); if (!scipOptions.reporter.hasErrors()) { System.out.println("done: " + scipOptions.output); diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelOptions.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelOptions.java similarity index 95% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelOptions.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelOptions.java index 3321f750..9e539569 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelOptions.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelOptions.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; import java.io.IOException; import java.nio.file.*; @@ -16,7 +16,7 @@ public class BazelOptions { public boolean parallel = false; public static void printHelp() { - System.out.println("bazel run @scip_java//scip-semanticdb:bazel -- [..options]"); + System.out.println("bazel run @scip_java//scip-aggregator:bazel -- [..options]"); System.out.println(); System.out.println("Command-line tool to generate SCIP for Java targets in a Bazel build."); System.out.println( @@ -95,7 +95,7 @@ public static Optional parse(String[] args) throws IOException { if (options.sourceroot == null) { if (args.length == 0) { errors.add( - "missing required flag --sourceroot . To fix this problem, pass in the `--sourceroot` flag like this: bazel run @scip_java//scip-semanticdb:bazel -- --sourceroot \"$PWD\""); + "missing required flag --sourceroot . To fix this problem, pass in the `--sourceroot` flag like this: bazel run @scip_java//scip-aggregator:bazel -- --sourceroot \"$PWD\""); } else { errors.add("missing required flag --sourceroot "); } @@ -166,9 +166,9 @@ private static Path absolutePath(Path sourceroot, Path path) { public static void visitParamsFile(Path paramsFile, BazelOptions options) throws IOException { List lines = Files.readAllLines(paramsFile); - Optional semanticdbPlugin = - lines.stream().filter(line -> line.startsWith("-Xplugin:semanticdb")).findFirst(); - if (semanticdbPlugin.isPresent()) { + Optional scipPlugin = + lines.stream().filter(line -> line.startsWith("-Xplugin:scip")).findFirst(); + if (scipPlugin.isPresent()) { String jarFileName = paramsFile.getFileName().toString(); jarFileName = jarFileName.substring(0, jarFileName.length() - "-0.param".length() - 1); Path jarFile = paramsFile.resolveSibling(jarFileName); diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/InputStreamBytes.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/InputStreamBytes.java similarity index 93% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/InputStreamBytes.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/InputStreamBytes.java index 868eca59..0816cbfa 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/InputStreamBytes.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/InputStreamBytes.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/JdkPackage.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/JdkPackage.java similarity index 96% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/JdkPackage.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/JdkPackage.java index 93b1e3bb..320cad0d 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/JdkPackage.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/JdkPackage.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; public class JdkPackage extends Package { public final String version; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MavenPackage.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MavenPackage.java similarity index 96% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MavenPackage.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MavenPackage.java index 6a528f5d..bbb228ca 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MavenPackage.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MavenPackage.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; import java.nio.file.Path; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MessageOnlyException.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MessageOnlyException.java similarity index 90% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MessageOnlyException.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MessageOnlyException.java index 89e63fc4..2aeaf2cf 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/MessageOnlyException.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MessageOnlyException.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; /** * Exception that doesn't fill out the stack trace, it only prints out the message. diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/OperatingSystem.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/OperatingSystem.java similarity index 77% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/OperatingSystem.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/OperatingSystem.java index a04d82c8..946148ba 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/OperatingSystem.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/OperatingSystem.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; public class OperatingSystem { public static boolean isWindows() { diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Package.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/Package.java similarity index 93% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Package.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/Package.java index e4b5ef1f..f87b81ed 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/Package.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/Package.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; public abstract class Package { public static final Package EMPTY = diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/PackageTable.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/PackageTable.java similarity index 97% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/PackageTable.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/PackageTable.java index 0e2d3347..4d729f97 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/PackageTable.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/PackageTable.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; import java.io.IOException; import java.net.URL; @@ -25,7 +25,7 @@ public class PackageTable { private static final PathMatcher JAR_PATTERN = FileSystems.getDefault().getPathMatcher("glob:**.jar"); - public PackageTable(ScipSemanticdbOptions options) throws IOException { + public PackageTable(ScipAggregatorOptions options) throws IOException { this.jdkPackage = JdkPackage.forRuntime(); this.indexDirectoryEntries = options.allowExportingGlobalSymbolsFromDirectoryEntries; // NOTE: it's important that we index the JDK before maven packages. Some maven packages diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregator.java similarity index 95% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregator.java index 77ff6fe7..25a4713f 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregator.java @@ -1,7 +1,7 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; import com.google.protobuf.CodedInputStream; -import com.sourcegraph.semanticdb.SemanticdbSymbols; +import com.sourcegraph.scip.ScipSymbols; import java.io.IOException; import java.nio.file.FileSystems; import java.nio.file.FileVisitResult; @@ -42,23 +42,23 @@ *
  • emits a single {@link Index} with leading {@link Metadata}. * */ -public class ScipSemanticdb { +public class ScipAggregator { private static final PathMatcher JAR_PATTERN = FileSystems.getDefault().getPathMatcher("glob:**.jar"); private static final PathMatcher SCIP_PATTERN = FileSystems.getDefault().getPathMatcher("glob:**.scip"); private final ScipWriter writer; - private final ScipSemanticdbOptions options; + private final ScipAggregatorOptions options; - public ScipSemanticdb(ScipWriter writer, ScipSemanticdbOptions options) { + public ScipAggregator(ScipWriter writer, ScipAggregatorOptions options) { this.writer = writer; this.options = options; } - public static void run(ScipSemanticdbOptions options) throws IOException { + public static void run(ScipAggregatorOptions options) throws IOException { ScipWriter writer = new ScipWriter(options); - new ScipSemanticdb(writer, options).run(); + new ScipAggregator(writer, options).run(); } private void run() throws IOException { @@ -202,10 +202,10 @@ private Map> computeInverseReferences( for (Document doc : readShard(shard)) { for (SymbolInformation info : doc.getSymbolsList()) { if (!supportsReferenceRelationship(info)) continue; - if (info.getSymbol().isEmpty() || SemanticdbSymbols.isLocal(info.getSymbol())) continue; + if (info.getSymbol().isEmpty() || ScipSymbols.isLocal(info.getSymbol())) continue; for (Relationship rel : info.getRelationshipsList()) { if (!rel.getIsImplementation()) continue; - if (SemanticdbSymbols.isLocal(rel.getSymbol())) continue; + if (ScipSymbols.isLocal(rel.getSymbol())) continue; if (isIgnoredOverriddenSymbol(rel.getSymbol())) continue; result.computeIfAbsent(rel.getSymbol(), k -> new ArrayList<>()).add(info.getSymbol()); } diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbOptions.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorOptions.java similarity index 82% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbOptions.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorOptions.java index 28a5b73a..d5640805 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbOptions.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorOptions.java @@ -1,16 +1,16 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; import java.nio.file.Path; import java.util.List; import org.scip_code.scip.ToolInfo; -/** Configuration options to tweak the scip-semanticdb command. */ -public class ScipSemanticdbOptions { +/** Configuration options to tweak the scip-aggregator command. */ +public class ScipAggregatorOptions { public final List targetroots; public final Path output; public final Path sourceroot; - public final ScipSemanticdbReporter reporter; + public final ScipAggregatorReporter reporter; public final ToolInfo toolInfo; public final boolean parallel; public final List packages; @@ -18,11 +18,11 @@ public class ScipSemanticdbOptions { public final boolean allowEmptyIndex; public final boolean allowExportingGlobalSymbolsFromDirectoryEntries; - public ScipSemanticdbOptions( + public ScipAggregatorOptions( List targetroots, Path output, Path sourceroot, - ScipSemanticdbReporter reporter, + ScipAggregatorReporter reporter, ToolInfo toolInfo, boolean parallel, List packages, diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbReporter.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorReporter.java similarity index 65% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbReporter.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorReporter.java index 1887b083..77322dbe 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbReporter.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorReporter.java @@ -1,12 +1,12 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; /** - * API to hook into the event stream of the scip-semanticdb command. + * API to hook into the event stream of the scip-aggregator command. * - *

    The scip-semanticdb command doesn't fail fast on the first error. Clients are expected to + *

    The scip-aggregator command doesn't fail fast on the first error. Clients are expected to * handle errors through the error method. */ -public abstract class ScipSemanticdbReporter { +public abstract class ScipAggregatorReporter { public void error(Throwable e) {} public void error(String message) { diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputStream.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipOutputStream.java similarity index 95% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputStream.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipOutputStream.java index ef527d45..d80c2bb6 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputStream.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipOutputStream.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; import java.io.IOException; import java.io.OutputStream; diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipWriter.java similarity index 83% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipWriter.java index 325f2e69..0aba366c 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipWriter.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; import org.scip_code.scip.Index; @@ -14,15 +14,15 @@ public class ScipWriter implements AutoCloseable { private final Path tmp; private final ScipOutputStream output; - private final ScipSemanticdbOptions options; + private final ScipAggregatorOptions options; - public ScipWriter(ScipSemanticdbOptions options) throws IOException { + public ScipWriter(ScipAggregatorOptions options) throws IOException { if (OperatingSystem.isWindows()) { - this.tmp = Files.createTempFile("scip-semanticdb", "index.scip"); + this.tmp = Files.createTempFile("scip-aggregator", "index.scip"); } else { this.tmp = Files.createTempFile( - "scip-semanticdb", + "scip-aggregator", "index.scip", PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-r--r--"))); } diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolDescriptor.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolDescriptor.java similarity index 69% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolDescriptor.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolDescriptor.java index 146ecdf7..b6c660ba 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolDescriptor.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolDescriptor.java @@ -1,22 +1,21 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; -import com.sourcegraph.semanticdb.SemanticdbSymbols; -import com.sourcegraph.semanticdb.SemanticdbSymbols.Descriptor; -import com.sourcegraph.semanticdb.SemanticdbSymbols.Descriptor.Kind; +import com.sourcegraph.scip.ScipSymbols; +import com.sourcegraph.scip.ScipSymbols.Descriptor; +import com.sourcegraph.scip.ScipSymbols.Descriptor.Kind; import java.util.Optional; public class SymbolDescriptor { - public final SemanticdbSymbols.Descriptor descriptor; + public final ScipSymbols.Descriptor descriptor; public final String owner; - public SymbolDescriptor(SemanticdbSymbols.Descriptor descriptor, String owner) { + public SymbolDescriptor(ScipSymbols.Descriptor descriptor, String owner) { this.descriptor = descriptor; this.owner = owner; } - public static SymbolDescriptor NONE = - new SymbolDescriptor(Descriptor.NONE, SemanticdbSymbols.NONE); + public static SymbolDescriptor NONE = new SymbolDescriptor(Descriptor.NONE, ScipSymbols.NONE); public static SymbolDescriptor parseFromSymbol(String symbol) { return new Parser(symbol).entryPoint(); @@ -26,7 +25,7 @@ public static Optional toplevel(String symbol) { if (symbol == null || symbol.isEmpty()) { return Optional.empty(); } - if (SemanticdbSymbols.isLocal(symbol)) { + if (ScipSymbols.isLocal(symbol)) { return Optional.empty(); } SymbolDescriptor current = parseFromSymbol(symbol); @@ -56,16 +55,16 @@ public Parser(String symbol) { } public SymbolDescriptor entryPoint() { - if (SemanticdbSymbols.isLocal(symbol)) { - return new SymbolDescriptor(Descriptor.local(symbol), SemanticdbSymbols.NONE); + if (ScipSymbols.isLocal(symbol)) { + return new SymbolDescriptor(Descriptor.local(symbol), ScipSymbols.NONE); } - if (SemanticdbSymbols.NONE.equals(symbol)) { + if (ScipSymbols.NONE.equals(symbol)) { return SymbolDescriptor.NONE; } readChar(); - SemanticdbSymbols.Descriptor descriptor = parseDescriptor(); + ScipSymbols.Descriptor descriptor = parseDescriptor(); - String owner = i < 0 ? SemanticdbSymbols.ROOT_PACKAGE : symbol.substring(0, i + 1); + String owner = i < 0 ? ScipSymbols.ROOT_PACKAGE : symbol.substring(0, i + 1); return new SymbolDescriptor(descriptor, owner); } @@ -115,7 +114,7 @@ public String parseDisambiguator() { return symbol.substring(i + 1, end); } - public SemanticdbSymbols.Descriptor parseDescriptor() { + public ScipSymbols.Descriptor parseDescriptor() { String value; switch (currChar) { case '.': @@ -123,28 +122,28 @@ public SemanticdbSymbols.Descriptor parseDescriptor() { if (currChar == ')') { String disamiguator = parseDisambiguator(); value = parseValue(); - return new SemanticdbSymbols.Descriptor(Kind.Method, value, disamiguator); + return new ScipSymbols.Descriptor(Kind.Method, value, disamiguator); } else { - return new SemanticdbSymbols.Descriptor(Kind.Term, parseValue()); + return new ScipSymbols.Descriptor(Kind.Term, parseValue()); } case '#': readChar(); - return new SemanticdbSymbols.Descriptor(Kind.Type, parseValue()); + return new ScipSymbols.Descriptor(Kind.Type, parseValue()); case '/': readChar(); - return new SemanticdbSymbols.Descriptor(Kind.Package, parseValue()); + return new ScipSymbols.Descriptor(Kind.Package, parseValue()); case ')': readChar(); value = parseValue(); if (currChar != '(') throw fail(); readChar(); - return new SemanticdbSymbols.Descriptor(Kind.Parameter, value); + return new ScipSymbols.Descriptor(Kind.Parameter, value); case ']': readChar(); value = parseValue(); if (currChar != '[') throw fail(); readChar(); - return new SemanticdbSymbols.Descriptor(Kind.TypeParameter, value); + return new ScipSymbols.Descriptor(Kind.TypeParameter, value); default: throw fail(); } diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolRewriter.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolRewriter.java similarity index 76% rename from scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolRewriter.java rename to scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolRewriter.java index 4f03307a..a6addb6d 100644 --- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SymbolRewriter.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolRewriter.java @@ -1,10 +1,10 @@ -package com.sourcegraph.scip_semanticdb; +package com.sourcegraph.scip_aggregator; -import com.sourcegraph.semanticdb.SemanticdbSymbols; +import com.sourcegraph.scip.ScipSymbols; /** * Rewrites bare descriptor symbols emitted by the compiler plugins (e.g. {@code - * _root_/com/example/Foo#}) into fully-qualified SCIP symbols (e.g. {@code semanticdb maven + * _root_/com/example/Foo#}) into fully-qualified SCIP symbols (e.g. {@code scip maven * com.example:my-lib 1.0 _root_/com/example/Foo#}) by looking up the descriptor's owning package in * a {@link PackageTable}. * @@ -20,8 +20,8 @@ final class SymbolRewriter { /** Rewrites {@code symbol}, or returns {@code symbol} unchanged when no rewriting applies. */ String rewrite(String symbol) { if (symbol == null || symbol.isEmpty()) return symbol; - if (SemanticdbSymbols.isLocal(symbol)) return symbol; + if (ScipSymbols.isLocal(symbol)) return symbol; Package pkg = packages.packageForSymbol(symbol).orElse(Package.EMPTY); - return "semanticdb " + pkg.scipTypedEncoding() + " " + symbol; + return "scip-java " + pkg.scipTypedEncoding() + " " + symbol; } } diff --git a/scip-semanticdb/src/main/protobuf/bazelbuild.proto b/scip-aggregator/src/main/protobuf/bazelbuild.proto similarity index 100% rename from scip-semanticdb/src/main/protobuf/bazelbuild.proto rename to scip-aggregator/src/main/protobuf/bazelbuild.proto diff --git a/semanticdb-gradle-plugin/src/main/scala/SemanticdbGradlePlugin.scala b/scip-gradle-plugin/src/main/scala/ScipGradlePlugin.scala similarity index 91% rename from semanticdb-gradle-plugin/src/main/scala/SemanticdbGradlePlugin.scala rename to scip-gradle-plugin/src/main/scala/ScipGradlePlugin.scala index b9c531e8..f635abb2 100644 --- a/semanticdb-gradle-plugin/src/main/scala/SemanticdbGradlePlugin.scala +++ b/scip-gradle-plugin/src/main/scala/ScipGradlePlugin.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.gradle.semanticdb +package com.sourcegraph.gradle.scip import java.nio.file.Files import java.nio.file.Paths @@ -17,7 +17,7 @@ import org.gradle.api.tasks.SourceSetContainer import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.compile.JavaCompile -class SemanticdbGradlePlugin extends Plugin[Project] { +class ScipGradlePlugin extends Plugin[Project] { import Logging._ override def apply(project: Project): Unit = { @@ -31,7 +31,7 @@ class SemanticdbGradlePlugin extends Plugin[Project] { val targetRoot = extra .getProperties() .asScala - .getOrElse("semanticdbTarget", project.getBuildDir()) + .getOrElse("scipTarget", project.getBuildDir()) val javacPluginVersion = BuildInfo.version @@ -43,7 +43,7 @@ class SemanticdbGradlePlugin extends Plugin[Project] { .map[Object](jar => project.files(jar)) // we fallback to javac plugin published to maven if there is no jar specified // the JAR would usually be provided by auto-indexer - .getOrElse(s"com.sourcegraph:semanticdb-javac:${javacPluginVersion}") + .getOrElse(s"com.sourcegraph:scip-javac:${javacPluginVersion}") val sourceRoot = project.getRootDir() @@ -89,10 +89,10 @@ class SemanticdbGradlePlugin extends Plugin[Project] { // The `compileOnly` configuration has likely already been // resolved by another plugin or buildscript, so we can no longer // add new dependencies to it. The project will be skipped (no - // SemanticDB output) and the post-build check in + // SCIP output) and the post-build check in // `GradleBuildTool` will surface a clearer error. warn( - s"scip-java: failed to attach SemanticDB compiler plugin to project '${project + s"scip-java: failed to attach SCIP compiler plugin to project '${project .getName()}' (${exc.getClass().getSimpleName()}: ${exc .getMessage()}). This subproject will not be indexed." ) @@ -123,7 +123,7 @@ class SemanticdbGradlePlugin extends Plugin[Project] { // It's important we don't add the plugin configuration more than // once, as javac considers that an error - if (!args.asScala.exists(_.startsWith("-Xplugin:semanticdb"))) { + if (!args.asScala.exists(_.startsWith("-Xplugin:scip"))) { args.addAll( List( // We add this to ensure that the sources are _always_ @@ -131,7 +131,7 @@ class SemanticdbGradlePlugin extends Plugin[Project] { // TODO: before this plugin is published to Maven Central, // we will need to revert this change - as it can have detrimental // effect on people's builds - s"-Xplugin:semanticdb -targetroot:$targetRoot -sourceroot:$sourceRoot -randomtimestamp=${System + s"-Xplugin:scip -targetroot:$targetRoot -sourceroot:$sourceRoot -randomtimestamp=${System .nanoTime()}" ).asJava ) @@ -178,17 +178,17 @@ class SemanticdbGradlePlugin extends Plugin[Project] { }] .getKotlinOptions() - // The semanticdb-kotlinc compiler plugin is now built and shipped + // The scip-kotlinc compiler plugin is now built and shipped // together with the scip-java CLI. The CLI's init script writes // the absolute path of the embedded jar into the - // `semanticdbKotlincJar` extra property so we no longer need to + // `scipKotlincJar` extra property so we no longer need to // resolve a separately-published artifact at apply-time. - val semanticdbKotlinc = extraProperties - .get("semanticdbKotlincJar") + val scipKotlinc = extraProperties + .get("scipKotlincJar") .map(_.asInstanceOf[String]) .getOrElse { throw new IllegalStateException( - "semanticdbKotlincJar extra property must be set by the " + + "scipKotlincJar extra property must be set by the " + "scip-java init script when indexing Kotlin sources" ) } @@ -200,11 +200,11 @@ class SemanticdbGradlePlugin extends Plugin[Project] { newArgs.addAll(compilerArgs.getFreeCompilerArgs()) newArgs.addAll( List( - "-Xplugin=" + semanticdbKotlinc, + "-Xplugin=" + scipKotlinc, "-P", - s"plugin:semanticdb-kotlinc:sourceroot=$sourceRoot", + s"plugin:scip-kotlinc:sourceroot=$sourceRoot", "-P", - s"plugin:semanticdb-kotlinc:targetroot=$targetRoot" + s"plugin:scip-kotlinc:targetroot=$targetRoot" ).asJava ) diff --git a/scip-java/src/main/resources/scip-java/scip_java.bzl b/scip-java/src/main/resources/scip-java/scip_java.bzl index 2d69315b..6e377251 100644 --- a/scip-java/src/main/resources/scip-java/scip_java.bzl +++ b/scip-java/src/main/resources/scip-java/scip_java.bzl @@ -10,12 +10,12 @@ This aspect is needed for scip-java to inspect the structure of the Bazel build and register actions to index all java_library/java_test/java_binary targets. The result of running this aspect is that your bazel-bin/ directory will contain many *.scip (https://github.com/sourcegraph/scip) and -*.semanticdb (https://scalameta.org/docs/semanticdb/specification.html) files. +*.scip (https://scalameta.org/docs/scip/specification.html) files. These files encode information about which symbols are referenced from which locations in your source code. This aspect only works on Linux when using the `local` spawn strategy because -the `run_shell` action writes SemanticDB and SCIP files to the provided +the `run_shell` action writes SCIP and SCIP files to the provided --targetroot argument. It should be possible to avoid this requirement in the future if there's a strong desire to make the aspect work with the default (sandboxed) spawn strategy. @@ -128,7 +128,7 @@ def _scip_java(target, ctx): build_config_path = ctx.actions.declare_file(ctx.label.name + ".scip.json") scip_output = ctx.actions.declare_file(ctx.label.name + ".scip") - targetroot = ctx.actions.declare_directory(ctx.label.name + ".semanticdb") + targetroot = ctx.actions.declare_directory(ctx.label.name + ".scip") ctx.actions.write( output = build_config_path, content = json.encode(build_config), @@ -140,7 +140,7 @@ def _scip_java(target, ctx): # Prefix bazel-out paths with $PWD (the execroot) so they don't depend # on the workspace-level bazel-out convenience symlink, which doesn't # exist on a cold build. - command = "\"{}\" index --no-cleanup --index-semanticdb.allow-empty-index --cwd \"{}\" --targetroot \"$PWD/{}\" --scip-config \"$PWD/{}\" --output \"$PWD/{}\"".format( + command = "\"{}\" index --no-cleanup --index-scip.allow-empty-index --cwd \"{}\" --targetroot \"$PWD/{}\" --scip-config \"$PWD/{}\" --output \"$PWD/{}\"".format( ctx.var["scip_java_binary"], ctx.var["sourceroot"], targetroot.path, diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ConsolescipSemanticdbReporter.scala b/scip-java/src/main/scala/com/sourcegraph/scip_aggregator/ConsoleScipAggregatorReporter.scala similarity index 79% rename from scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ConsolescipSemanticdbReporter.scala rename to scip-java/src/main/scala/com/sourcegraph/scip_aggregator/ConsoleScipAggregatorReporter.scala index af6ef07d..d8abb9e7 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ConsolescipSemanticdbReporter.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_aggregator/ConsoleScipAggregatorReporter.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb +package com.sourcegraph.scip_aggregator import java.io.PrintWriter import java.nio.file.NoSuchFileException @@ -7,12 +7,12 @@ import moped.cli.Application import moped.progressbars.InteractiveProgressBar /** - * Console reporter for index-semanticdb command. + * Console reporter for index-scip command. */ -class ConsoleScipSemanticdbReporter(app: Application) - extends ScipSemanticdbReporter { +class ConsoleScipAggregatorReporter(app: Application) + extends ScipAggregatorReporter { - val renderer = new ScipSemanticdbProgressRenderer + val renderer = new ScipAggregatorProgressRenderer val progressbar = new InteractiveProgressBar( new PrintWriter(app.env.standardError), diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ScipSemanticdbProgressRenderer.scala b/scip-java/src/main/scala/com/sourcegraph/scip_aggregator/ScipAggregatorProgressRenderer.scala similarity index 83% rename from scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ScipSemanticdbProgressRenderer.scala rename to scip-java/src/main/scala/com/sourcegraph/scip_aggregator/ScipAggregatorProgressRenderer.scala index a06ee9d6..d93f0a07 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_semanticdb/ScipSemanticdbProgressRenderer.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_aggregator/ScipAggregatorProgressRenderer.scala @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_semanticdb +package com.sourcegraph.scip_aggregator import java.util.concurrent.atomic.AtomicInteger @@ -7,9 +7,9 @@ import moped.progressbars.ProgressStep import org.typelevel.paiges.Doc /** - * Progress bar for the scip-semanticdb command. + * Progress bar for the scip-aggregator command. */ -class ScipSemanticdbProgressRenderer() extends ProgressRenderer { +class ScipAggregatorProgressRenderer() extends ProgressRenderer { var totalSize = 0 val currentSize = new AtomicInteger() override def renderStep(): ProgressStep = { diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/Embedded.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/Embedded.scala index 9b8b931a..a58e500f 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/Embedded.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/Embedded.scala @@ -11,20 +11,14 @@ import os.CommandResult object Embedded { - def semanticdbJar(tmpDir: Path): Path = copyFile( - tmpDir, - "semanticdb-plugin.jar" - ) + def scipJar(tmpDir: Path): Path = copyFile(tmpDir, "scip-plugin.jar") def gradlePluginJar(tmpDir: Path): Path = copyFile( tmpDir, "gradle-plugin.jar" ) - def semanticdbKotlincJar(tmpDir: Path): Path = copyFile( - tmpDir, - "semanticdb-kotlinc.jar" - ) + def scipKotlincJar(tmpDir: Path): Path = copyFile(tmpDir, "scip-kotlinc.jar") private def javacErrorpath(tmp: Path) = tmp.resolve("errorpath.txt") @@ -32,7 +26,7 @@ object Embedded { val bin = tmp.resolve("bin") val javac = bin.resolve("javac") val java = bin.resolve("java") - val pluginpath = Embedded.semanticdbJar(tmp) + val pluginpath = Embedded.scipJar(tmp) val errorpath = javacErrorpath(tmp) val javacopts = targetroot.resolve("javacopts.txt") Files.createDirectories(targetroot) @@ -45,18 +39,18 @@ object Embedded { ) val newJavacopts = tmp.resolve("javac_newarguments") // --add-exports flags required to access internal javac APIs from our - // SemanticDB plugin. Always set; Java 11+ is the supported baseline. + // SCIP plugin. Always set; Java 11+ is the supported baseline. val javacModuleOptions = BuildInfo.javacModuleOptions.mkString(" ") - val injectSemanticdbArguments = List[String]( + val injectScipArguments = List[String]( "java", - s"-Dsemanticdb.errorpath=$errorpath", - s"-Dsemanticdb.pluginpath=$pluginpath", - s"-Dsemanticdb.sourceroot=$sourceroot", - s"-Dsemanticdb.targetroot=$targetroot", - s"-Dsemanticdb.output=$$NEW_JAVAC_OPTS", - s"-Dsemanticdb.old-output=$javacopts", + s"-Dscip.errorpath=$errorpath", + s"-Dscip.pluginpath=$pluginpath", + s"-Dscip.sourceroot=$sourceroot", + s"-Dscip.targetroot=$targetroot", + s"-Dscip.output=$$NEW_JAVAC_OPTS", + s"-Dscip.old-output=$javacopts", s"-classpath $pluginpath", - "com.sourcegraph.semanticdb_javac.InjectSemanticdbOptions", + "com.sourcegraph.scip_javac.InjectScipOptions", """"$@"""" ).mkString(" ") val script = @@ -69,7 +63,7 @@ object Embedded { | LAUNCHER_ARGS+=("$$arg") | fi |done - |$injectSemanticdbArguments + |$injectScipArguments |if [ $${#LAUNCHER_ARGS[@]} -eq 0 ]; then | javac $javacModuleOptions "@$$NEW_JAVAC_OPTS" |else diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala index b2e1618e..6274de58 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala @@ -3,7 +3,7 @@ package com.sourcegraph.scip_java import java.io.PrintStream import com.sourcegraph.scip_java.commands.IndexCommand -import com.sourcegraph.scip_java.commands.IndexSemanticdbCommand +import com.sourcegraph.scip_java.commands.IndexScipCommand import com.sourcegraph.scip_java.commands.SnapshotCommand import moped.cli.Application import moped.cli.CommandParser @@ -19,7 +19,7 @@ object ScipJava { CommandParser[HelpCommand], CommandParser[VersionCommand], CommandParser[IndexCommand], - CommandParser[IndexSemanticdbCommand], + CommandParser[IndexScipCommand], CommandParser[SnapshotCommand] ) ) diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipSymbol.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipSymbol.scala index d2cf98c7..d31bc452 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipSymbol.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipSymbol.scala @@ -1,7 +1,7 @@ package com.sourcegraph.scip_java -import com.sourcegraph.scip_semanticdb.SymbolDescriptor -import com.sourcegraph.semanticdb.SemanticdbSymbols +import com.sourcegraph.scip.ScipSymbols +import com.sourcegraph.scip_aggregator.SymbolDescriptor sealed abstract class ScipSymbol {} final case class LocalScipSymbol(identifier: String) extends ScipSymbol @@ -42,11 +42,9 @@ object ScipSymbol { } } - private def parseDescriptors( - semanticdbSymbol: String - ): List[SymbolDescriptor] = { - val descriptor = SymbolDescriptor.parseFromSymbol(semanticdbSymbol) - if (descriptor.owner == SemanticdbSymbols.ROOT_PACKAGE) + private def parseDescriptors(scipSymbol: String): List[SymbolDescriptor] = { + val descriptor = SymbolDescriptor.parseFromSymbol(scipSymbol) + if (descriptor.owner == ScipSymbols.ROOT_PACKAGE) Nil else descriptor :: parseDescriptors(descriptor.owner) diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala index d84d0a75..4c7661a3 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala @@ -79,7 +79,7 @@ class BazelBuildTool(index: IndexCommand) extends BuildTool("Bazel", index) { bazelExecutable, "build", "--noshow_progress", - // The local strategy is required for now because we write SemanticDB and SCIP files + // The local strategy is required for now because we write SCIP and SCIP files // to the provided targetroot directory. "--spawn_strategy=local", "--aspects", diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BuildTool.scala index 00a29a98..a2e86cc5 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BuildTool.scala @@ -41,19 +41,19 @@ object BuildTool { .mkString(", ") def generateScipFromTargetroot( - generateSemanticdbResult: CommandResult, + generateScipResult: CommandResult, targetroot: Path, index: IndexCommand ): Int = { if (!Files.isDirectory(targetroot)) { - generateSemanticdbResult.exitCode + generateScipResult.exitCode } else if (index.app.reporter.hasErrors()) { index.app.reporter.exitCode() - } else if (generateSemanticdbResult.exitCode != 0) { - generateSemanticdbResult.exitCode + } else if (generateScipResult.exitCode != 0) { + generateScipResult.exitCode } else { index - .indexSemanticdb + .indexScip .copy( output = index.finalOutput, targetroot = List(targetroot), diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ClasspathEntry.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ClasspathEntry.scala index 1fa1739d..87d1711f 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ClasspathEntry.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ClasspathEntry.scala @@ -9,7 +9,7 @@ import java.nio.file.Paths import scala.annotation.tailrec import scala.jdk.CollectionConverters._ -import com.sourcegraph.scip_semanticdb.MavenPackage +import com.sourcegraph.scip_aggregator.MavenPackage /** * Represents a single classpath entry on the classpath of a project, used to @@ -31,7 +31,7 @@ case class ClasspathEntry( object ClasspathEntry { /** - * Parses ClasspathEntry from the SemanticDB targetroot directory. + * Parses ClasspathEntry from the SCIP targetroot directory. * * Two separate formats are supported: * diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleBuildTool.scala index 765d609f..36e5346a 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleBuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleBuildTool.scala @@ -27,9 +27,9 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) { } override def generateScip(): Int = { - val gradleResult = generateSemanticdb() + val gradleResult = runBuild() if (gradleResult.exitCode == 0) { - reportMissingSemanticdbOutput() + reportMissingScipOutput() } BuildTool.generateScipFromTargetroot(gradleResult, targetroot, index) } @@ -40,7 +40,7 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) { * by a `-javaagent` fallback; now it surfaces as a clear error pointing at * the two known causes. */ - private def reportMissingSemanticdbOutput(): Unit = { + private def reportMissingScipOutput(): Unit = { if (containsFileWithSuffix(targetroot, ".scip")) return if (!containsFileWithSuffix(index.workingDirectory, ".class")) @@ -56,13 +56,13 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) { | | 1. The 'compileOnly' configuration was already resolved before our init script ran. | Check the Gradle output above for warnings of the form: - | "scip-java: failed to attach SemanticDB compiler plugin to project ''" - | Workaround: apply the SemanticDB plugin earlier (e.g. via a settings plugin), + | "scip-java: failed to attach SCIP compiler plugin to project ''" + | Workaround: apply the SCIP plugin earlier (e.g. via a settings plugin), | or restructure the build so that 'compileOnly' is not resolved at evaluation time. | | 2. Another Gradle plugin is replacing the compiler arguments we add (rather than appending). - | Verify with: ./gradlew compileJava --info | grep -- '-Xplugin:semanticdb' - | If '-Xplugin:semanticdb' is missing from the printed javac command, another plugin + | Verify with: ./gradlew compileJava --info | grep -- '-Xplugin:scip' + | If '-Xplugin:scip' is missing from the printed javac command, another plugin | is overwriting JavaCompile.options.compilerArgs. |""".stripMargin ) @@ -83,11 +83,8 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) { def targetroot: Path = index.finalTargetroot(defaultTargetroot) - private def defaultTargetroot: Path = Paths.get( - "build", - "semanticdb-targetroot" - ) - private def generateSemanticdb(): CommandResult = { + private def defaultTargetroot: Path = Paths.get("build", "scip-targetroot") + private def runBuild(): CommandResult = { val gradleWrapper: Path = index .workingDirectory .resolve( @@ -120,7 +117,7 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) { buildCommand += "--init-script" buildCommand += script buildCommand += "-Pkotlin.compiler.execution.strategy=in-process" - buildCommand += s"-Dsemanticdb.targetroot=$targetroot" + buildCommand += s"-Dscip.targetroot=$targetroot" buildCommand ++= index.finalBuildCommand( List("clean", "scipPrintDependencies", "scipCompileAll") @@ -136,9 +133,9 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) { private def scipJavaDependencies = "scipJavaDependencies" private def initScript(tmp: Path): Path = { - val pluginpath = Embedded.semanticdbJar(tmp) + val pluginpath = Embedded.scipJar(tmp) val gradlePluginPath = Embedded.gradlePluginJar(tmp) - val semanticdbKotlincPath = Embedded.semanticdbKotlincJar(tmp) + val scipKotlincPath = Embedded.scipKotlincJar(tmp) val dependenciesPath = targetroot.resolve("dependencies.txt") Files.deleteIfExists(dependenciesPath) @@ -150,14 +147,14 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) { | } | } | - | import com.sourcegraph.gradle.semanticdb.SemanticdbGradlePlugin + | import com.sourcegraph.gradle.scip.ScipGradlePlugin | | allprojects { - | project.ext["semanticdbTarget"] = "$targetroot" + | project.ext["scipTarget"] = "$targetroot" | project.ext["javacPluginJar"] = "$pluginpath" | project.ext["dependenciesOut"] = "$dependenciesPath" - | project.ext["semanticdbKotlincJar"] = "$semanticdbKotlincPath" - | apply plugin: SemanticdbGradlePlugin + | project.ext["scipKotlincJar"] = "$scipKotlincPath" + | apply plugin: ScipGradlePlugin | } """.stripMargin.trim diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MavenBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MavenBuildTool.scala index 4450ba99..2579d8c7 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MavenBuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MavenBuildTool.scala @@ -18,18 +18,15 @@ class MavenBuildTool(index: IndexCommand) extends BuildTool("Maven", index) { override def generateScip(): Int = { BuildTool.generateScipFromTargetroot( - generateSemanticdb(), + runBuild(), index.finalTargetroot(defaultTargetroot), index ) } - private def defaultTargetroot: Path = Paths.get( - "target", - "semanticdb-targetroot" - ) + private def defaultTargetroot: Path = Paths.get("target", "scip-targetroot") - private def generateSemanticdb(): CommandResult = { + private def runBuild(): CommandResult = { TemporaryFiles.withDirectory(index) { tmp => val mvnw = index.workingDirectory.resolve("mvnw") val mavenScript = diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala index 7656a8dd..764f07e4 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScipBuildTool.scala @@ -86,7 +86,7 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) { override def isHidden: Boolean = true override def generateScip(): Int = { BuildTool.generateScipFromTargetroot( - generateSemanticdb(), + runBuild(), index.finalTargetroot(defaultTargetroot), index ) @@ -99,7 +99,7 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) { ScipBuildTool .ConfigFileNames .map(name => index.workingDirectory.resolve(name)) - private def generateSemanticdb(): CommandResult = { + private def runBuild(): CommandResult = { parsedConfig match { case ValueResult(value) => if (index.cleanup) { @@ -145,8 +145,8 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) { } /** - * Shells out to "javac" to compile the sources with the SemanticDB compiler - * plugin enabled. + * Shells out to "javac" to compile the sources with the SCIP compiler plugin + * enabled. */ private def compile(config: Config): CommandResult = { if (config.dependencies.nonEmpty) { @@ -190,23 +190,19 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) { if (index.cleanup) { Files.walkFileTree(tmp, new DeleteVisitor) } - val isSemanticdbGenerated = Files.isDirectory( - targetroot.resolve("META-INF") - ) - if ( - errors.nonEmpty && (index.strictCompilation || !isSemanticdbGenerated) - ) { + val isScipGenerated = Files.isDirectory(targetroot.resolve("META-INF")) + if (errors.nonEmpty && (index.strictCompilation || !isScipGenerated)) { errors.foreach { error => index.app.reporter.log(Diagnostic.exception(error)) } CommandResult(Nil, 1, Nil) } else { - if (errors.nonEmpty && isSemanticdbGenerated) { + if (errors.nonEmpty && isScipGenerated) { index .app .reporter .info( - "Some SemanticDB files got generated even if there were compile errors. " + + "Some SCIP files got generated even if there were compile errors. " + "In most cases, this means that scip-java managed to index everything " + "except the locations that had compile errors and you can ignore the compile errors." ) @@ -227,11 +223,11 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) { return Success() val filesPaths = allKotlinFiles.map(_.toString) - // The semanticdb-kotlinc compiler plugin is now built and shipped together + // The scip-kotlinc compiler plugin is now built and shipped together // with the scip-java CLI as an embedded resource (see Embedded.scala and // the cli/resourceGenerators task in build.sbt), so we no longer need to // resolve a separately-published artifact from Maven Central. - val plugin = Embedded.semanticdbKotlincJar(tmp) + val plugin = Embedded.scipKotlincJar(tmp) val classpath = config .classpath @@ -256,9 +252,9 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) { "-Xallow-kotlin-package", s"-Xplugin=$plugin", "-P", - s"plugin:semanticdb-kotlinc:sourceroot=$sourceroot", + s"plugin:scip-kotlinc:sourceroot=$sourceroot", "-P", - s"plugin:semanticdb-kotlinc:targetroot=$targetroot", + s"plugin:scip-kotlinc:targetroot=$targetroot", "-classpath", classpath ) @@ -318,9 +314,9 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) { ) if (javaFiles.isEmpty) return Success(()) - val semanticdbJar = Embedded.semanticdbJar(tmp) + val scipJar = Embedded.scipJar(tmp) val actualClasspath = ArrayBuffer.empty[String] - actualClasspath += semanticdbJar.toString + actualClasspath += scipJar.toString actualClasspath ++= config .classpath @@ -343,11 +339,11 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) { arguments += actualClasspath.mkString(File.pathSeparator) } arguments += - s"-Xplugin:semanticdb -targetroot:$targetroot -sourceroot:$sourceroot" + s"-Xplugin:scip -targetroot:$targetroot -sourceroot:$sourceroot" if (config.processorpath.nonEmpty) { arguments += "-processorpath" val processorpath = - semanticdbJar.toString :: + scipJar.toString :: config .processorpath .flatMap(path => guessBazelJar(path, index.workingDirectory)) @@ -415,7 +411,7 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) { case option :: rest => val isIgnored = option.startsWith("-Xep") || // ErrorProne flag, which fails the build - option.startsWith("-Xplugin:semanticdb") || // Redundant SemanticDB + option.startsWith("-Xplugin:scip") || // Redundant SCIP option.startsWith("-XD") || // unsure what this one does index // User-provided flag .scipIgnoredJavacOptionPrefixes diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala index 0d8128d9..a5ebabe7 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala @@ -29,9 +29,9 @@ case class IndexCommand( @Description("The path where to generate the SCIP index.") output: Path = Paths.get("index.scip"), @Description( - "The directory where to generate SemanticDB files. " + + "The directory where to generate SCIP files. " + "Defaults to a build-specific path. " + - "For example, the default value for Gradle is 'build/semanticdb-targetroot' and for Maven it's 'target/semanticdb-targetroot'" + "For example, the default value for Gradle is 'build/scip-targetroot' and for Maven it's 'target/scip-targetroot'" ) targetroot: Option[Path] = None, @Description( @@ -87,7 +87,7 @@ case class IndexCommand( @TrailingArguments() buildCommand: List[String] = Nil, @Hidden - indexSemanticdb: IndexSemanticdbCommand = IndexSemanticdbCommand(), + indexScip: IndexScipCommand = IndexScipCommand(), @Inline app: Application = Application.default ) extends Command { diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexSemanticdbCommand.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexScipCommand.scala similarity index 83% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexSemanticdbCommand.scala rename to scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexScipCommand.scala index dd66c1f4..55b634f8 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexSemanticdbCommand.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexScipCommand.scala @@ -6,11 +6,11 @@ import java.nio.file.Paths import scala.jdk.CollectionConverters._ import com.sourcegraph.io.AbsolutePath +import com.sourcegraph.scip_aggregator.ConsoleScipAggregatorReporter +import com.sourcegraph.scip_aggregator.ScipAggregator +import com.sourcegraph.scip_aggregator.ScipAggregatorOptions import com.sourcegraph.scip_java.BuildInfo import com.sourcegraph.scip_java.buildtools.ClasspathEntry -import com.sourcegraph.scip_semanticdb.ConsoleScipSemanticdbReporter -import com.sourcegraph.scip_semanticdb.ScipSemanticdb -import com.sourcegraph.scip_semanticdb.ScipSemanticdbOptions import moped.annotations._ import moped.cli.Application import moped.cli.Command @@ -18,12 +18,12 @@ import moped.cli.CommandParser import org.scip_code.scip.ToolInfo @Description("Aggregates per-source SCIP shards into a single SCIP index file.") -@Usage("scip-java index-semanticdb [OPTIONS ...] [POSITIONAL ARGUMENTS ...]") +@Usage("scip-java index-scip [OPTIONS ...] [POSITIONAL ARGUMENTS ...]") @ExampleUsage( - "scip-java index-semanticdb --out=myindex.scip my/targetroot1 my/targetroot2" + "scip-java index-scip --out=myindex.scip my/targetroot1 my/targetroot2" ) -@CommandName("index-semanticdb") -final case class IndexSemanticdbCommand( +@CommandName("index-scip") +final case class IndexScipCommand( @Description("The name of the output file.") output: Path = Paths.get("index.scip"), @Description("Whether to process the SCIP shards in parallel") @@ -60,7 +60,7 @@ final case class IndexSemanticdbCommand( targetroot.map(AbsolutePath.of(_, sourceroot)) def run(): Int = { - val reporter = new ConsoleScipSemanticdbReporter(app) + val reporter = new ConsoleScipAggregatorReporter(app) val packages = absoluteTargetroots .iterator @@ -70,7 +70,7 @@ final case class IndexSemanticdbCommand( .distinct .toList val options = - new ScipSemanticdbOptions( + new ScipAggregatorOptions( absoluteTargetroots.asJava, AbsolutePath.of(output, sourceroot), sourceroot, @@ -86,7 +86,7 @@ final case class IndexSemanticdbCommand( allowEmptyIndex, allowExportingGlobalSymbolsFromDirectoryEntries ) - ScipSemanticdb.run(options) + ScipAggregator.run(options) if (!app.reporter.hasErrors()) { app.info(options.output.toString) } @@ -94,7 +94,7 @@ final case class IndexSemanticdbCommand( } } -object IndexSemanticdbCommand { - val default = IndexSemanticdbCommand() +object IndexScipCommand { + val default = IndexScipCommand() implicit val parser = CommandParser.derive(default) } diff --git a/semanticdb-javac/BUILD b/scip-javac/BUILD similarity index 87% rename from semanticdb-javac/BUILD rename to scip-javac/BUILD index b243e7e6..d2f80bd8 100644 --- a/semanticdb-javac/BUILD +++ b/scip-javac/BUILD @@ -22,15 +22,15 @@ string_flag( java_plugin( name = "plugin", deps = [ - ":semanticdb-javac", + ":scip-javac", ], ) java_library( - name = "semanticdb-javac", + name = "scip-javac", srcs = glob(["src/main/java/**/*.java"]), resources = ["src/main/resources/META-INF/services/com.sun.source.util.Plugin"], deps = [ - "//semanticdb-shared", + "//scip-shared", ], ) diff --git a/semanticdb-javac/defs.bzl b/scip-javac/defs.bzl similarity index 68% rename from semanticdb-javac/defs.bzl rename to scip-javac/defs.bzl index 1323219b..97d2c0f4 100644 --- a/semanticdb-javac/defs.bzl +++ b/scip-javac/defs.bzl @@ -1,4 +1,4 @@ -"""Java rules that automatically register the SemanticDB compiler plugin based on the presence of a string flag.""" +"""Java rules that automatically register the SCIP compiler plugin based on the presence of a string flag.""" load("@rules_java//java:defs.bzl", native_java_binary = "java_binary", native_java_library = "java_library") @@ -18,12 +18,12 @@ def java_binary(javacopts = [], plugins = [], **kwargs): def _actual_javacopts(javacopts): return select({ - "@scip_java//semanticdb-javac:is_enabled": ["'-Xplugin:semanticdb -build-tool:bazel'"] + javacopts, + "@scip_java//scip-javac:is_enabled": ["'-Xplugin:scip -build-tool:bazel'"] + javacopts, "//conditions:default": javacopts, }) def _actual_plugins(plugins): return select({ - "@scip_java//semanticdb-javac:is_enabled": ["@scip_java//semanticdb-javac:plugin"] + plugins, + "@scip_java//scip-javac:is_enabled": ["@scip_java//scip-javac:plugin"] + plugins, "//conditions:default": plugins, }) diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilationUnitException.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilationUnitException.java similarity index 85% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilationUnitException.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilationUnitException.java index e6d6d376..97818fd5 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilationUnitException.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilationUnitException.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; public class CompilationUnitException extends Throwable { public CompilationUnitException(String compilationUnit, Throwable cause) { diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilerRange.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilerRange.java similarity index 71% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilerRange.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilerRange.java index d5ce770b..ae5468ef 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilerRange.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilerRange.java @@ -1,7 +1,7 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; /** - * Describes how to convert a compiler position into SemanticDB Range. + * Describes how to convert a compiler position into SCIP Range. * *

    A Java compiler position has tree parts: "start", "point" and "end". * @@ -12,39 +12,39 @@ * ^ end * * - * A SemanticDB range has four parts: "startLine", "startCharacter", "endLine", "endCharacter". + * A SCIP range has four parts: "startLine", "startCharacter", "endLine", "endCharacter". */ public enum CompilerRange { - /** Map the compiler start/end positions to SemanticDB start/end positions. */ + /** Map the compiler start/end positions to SCIP start/end positions. */ FROM_START_TO_END, /** - * Map the compiler point position to SemanticDB end and use (point - symbol name length) for the - * SemanticDB start position. + * Map the compiler point position to SCIP end and use (point - symbol name length) for the SCIP + * start position. */ FROM_END_TO_SYMBOL_NAME, /** - * Map the compiler point position to SemanticDB start and use (point + symbol name length) for - * the SemanticDB end position. + * Map the compiler point position to SCIP start and use (point + symbol name length) for the SCIP + * end position. */ FROM_POINT_TO_SYMBOL_NAME, /** - * Map the compiler (point + 1) position to SemanticDB start and use (point + symbol name length + - * 1) for the SemanticDB end position. + * Map the compiler (point + 1) position to SCIP start and use (point + symbol name length + 1) + * for the SCIP end position. */ FROM_POINT_TO_SYMBOL_NAME_PLUS_ONE, /** * Use text search to find the start of the symbol name and use (found start + symbol name length) - * for the SemanticDB end position. + * for the SCIP end position. */ FROM_TEXT_SEARCH, /** * Use text search to find the start of the symbol name, using the point position as the starting - * search offset and using (found start + symbol name length) for the SemanticDB end position. + * search offset and using (found start + symbol name length) for the SCIP end position. */ FROM_POINT_WITH_TEXT_SEARCH, diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Debugging.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/Debugging.java similarity index 89% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Debugging.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/Debugging.java index 18f68b16..62f54ac3 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Debugging.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/Debugging.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; /** Utility methods for debugging purposes. */ public final class Debugging { diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/GlobalSymbolsCache.java similarity index 68% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/GlobalSymbolsCache.java index 9776f533..367da68b 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/GlobalSymbolsCache.java @@ -1,7 +1,7 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; -import com.sourcegraph.semanticdb.LocalSymbolsCache; -import com.sourcegraph.semanticdb.SemanticdbSymbols; +import com.sourcegraph.scip.LocalSymbolsCache; +import com.sourcegraph.scip.ScipSymbols; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; @@ -14,15 +14,15 @@ import java.util.IdentityHashMap; import java.util.ArrayList; -import static com.sourcegraph.semanticdb_javac.Debugging.pprint; +import static com.sourcegraph.scip_javac.Debugging.pprint; -/** Cache of SemanticDB symbols that can be referenced between files. */ +/** Cache of SCIP symbols that can be referenced between files. */ public final class GlobalSymbolsCache { private final IdentityHashMap globals = new IdentityHashMap<>(); - private final SemanticdbJavacOptions options; + private final ScipJavacOptions options; - public GlobalSymbolsCache(SemanticdbJavacOptions options) { + public GlobalSymbolsCache(ScipJavacOptions options) { this.options = options; } @@ -32,17 +32,17 @@ public String symbol(Element sym, LocalSymbolsCache locals) { String localResult = locals.get(sym); if (localResult != null) return localResult; result = uncachedSymbol(sym, locals); - if (SemanticdbSymbols.isGlobal(result)) { + if (ScipSymbols.isGlobal(result)) { globals.put(sym, result); } return result; } private String uncachedSymbol(Element sym, LocalSymbolsCache locals) { - if (sym == null) return SemanticdbSymbols.ROOT_PACKAGE; + if (sym == null) return ScipSymbols.ROOT_PACKAGE; if (sym instanceof PackageElement) { - if (((PackageElement) sym).isUnnamed()) return SemanticdbSymbols.ROOT_PACKAGE; + if (((PackageElement) sym).isUnnamed()) return ScipSymbols.ROOT_PACKAGE; StringBuilder sb = new StringBuilder(); String qualifiedName = ((PackageElement) sym).getQualifiedName().toString(); @@ -51,8 +51,8 @@ private String uncachedSymbol(Element sym, LocalSymbolsCache lo while (j < qualifiedName.length()) { if (i == qualifiedName.length() || qualifiedName.charAt(i) == '.') { final String name = qualifiedName.substring(j, i); - SemanticdbSymbols.Descriptor desc = - new SemanticdbSymbols.Descriptor(SemanticdbSymbols.Descriptor.Kind.Package, name); + ScipSymbols.Descriptor desc = + new ScipSymbols.Descriptor(ScipSymbols.Descriptor.Kind.Package, name); sb.append(desc.encode()); j = i + 1; } @@ -62,15 +62,15 @@ private String uncachedSymbol(Element sym, LocalSymbolsCache lo return sb.toString(); } else // check for Module without referring to Module as it doesn't exist < JDK 9 - if (sym.asType() instanceof NoType) return SemanticdbSymbols.ROOT_PACKAGE; + if (sym.asType() instanceof NoType) return ScipSymbols.ROOT_PACKAGE; if (isAnonymousClass(sym) || isLocalVariable(sym)) return locals.put(sym); String owner = symbol(sym.getEnclosingElement(), locals); - if (SemanticdbSymbols.isLocal(owner)) return locals.put(sym); + if (ScipSymbols.isLocal(owner)) return locals.put(sym); - SemanticdbSymbols.Descriptor desc = semanticdbDescriptor(sym); - if (options.verboseEnabled && desc.kind == SemanticdbSymbols.Descriptor.Kind.None) { + ScipSymbols.Descriptor desc = scipDescriptor(sym); + if (options.verboseEnabled && desc.kind == ScipSymbols.Descriptor.Kind.None) { if (sym instanceof QualifiedNameable) pprint(((QualifiedNameable) sym).getQualifiedName().toString()); else pprint(sym.getSimpleName().toString()); @@ -78,7 +78,7 @@ private String uncachedSymbol(Element sym, LocalSymbolsCache lo String.format( "sym: %s (%s - superclass %s)", sym, sym.getClass(), sym.getClass().getSuperclass())); } - return SemanticdbSymbols.global(owner, desc); + return ScipSymbols.global(owner, desc); } private boolean isLocalVariable(Element sym) { @@ -96,28 +96,28 @@ private boolean isAnonymousClass(Element sym) { return sym instanceof TypeElement && sym.getSimpleName().length() == 0; } - private SemanticdbSymbols.Descriptor semanticdbDescriptor(Element sym) { + private ScipSymbols.Descriptor scipDescriptor(Element sym) { if (sym instanceof TypeElement) { - return new SemanticdbSymbols.Descriptor( - SemanticdbSymbols.Descriptor.Kind.Type, sym.getSimpleName().toString()); + return new ScipSymbols.Descriptor( + ScipSymbols.Descriptor.Kind.Type, sym.getSimpleName().toString()); } else if (sym instanceof ExecutableElement) { - return new SemanticdbSymbols.Descriptor( - SemanticdbSymbols.Descriptor.Kind.Method, + return new ScipSymbols.Descriptor( + ScipSymbols.Descriptor.Kind.Method, sym.getSimpleName().toString(), methodDisambiguator((ExecutableElement) sym)); } else if (sym instanceof TypeParameterElement) { - return new SemanticdbSymbols.Descriptor( - SemanticdbSymbols.Descriptor.Kind.TypeParameter, sym.getSimpleName().toString()); + return new ScipSymbols.Descriptor( + ScipSymbols.Descriptor.Kind.TypeParameter, sym.getSimpleName().toString()); } else if (sym instanceof VariableElement) { - return new SemanticdbSymbols.Descriptor( - SemanticdbSymbols.Descriptor.Kind.Term, sym.getSimpleName().toString()); + return new ScipSymbols.Descriptor( + ScipSymbols.Descriptor.Kind.Term, sym.getSimpleName().toString()); } else { - return SemanticdbSymbols.Descriptor.NONE; + return ScipSymbols.Descriptor.NONE; } } /** - * Computes the method "disambiguator" according to the SemanticDB spec. + * Computes the method "disambiguator" according to the SCIP spec. * *

    Concatenation of a left parenthesis ("("), a tag and a right parenthesis (")"). If * the definition is not overloaded, the tag is empty. If the definition is overloaded, the tag is @@ -131,8 +131,7 @@ private SemanticdbSymbols.Descriptor semanticdbDescriptor(Element sym) { * * * - *

    Link to - * SemanticDB spec. + *

    Link to SCIP spec. */ private String methodDisambiguator(ExecutableElement sym) { Iterable elements = sym.getEnclosingElement().getEnclosedElements(); @@ -144,7 +143,7 @@ private String methodDisambiguator(ExecutableElement sym) { } // NOTE(olafur): sort static methods last, according to the spec. Historical note: this // requirement is - // part of the SemanticDB spec because static methods and non-static methods have a different + // part of the SCIP spec because static methods and non-static methods have a different // "owner" symbol. // There is no way to recover the definition order for a mix of static nnon-static method // definitions. diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/InjectSemanticdbOptions.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/InjectScipOptions.java similarity index 60% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/InjectSemanticdbOptions.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/InjectScipOptions.java index c27c7534..1fd9e7cf 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/InjectSemanticdbOptions.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/InjectScipOptions.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; import java.io.IOException; import java.io.OutputStream; @@ -8,30 +8,30 @@ import java.nio.file.Paths; import java.util.List; -public class InjectSemanticdbOptions { +public class InjectScipOptions { /** - * Updates a list of Java compiler arguments to include -Xplugin:semanticdb. + * Updates a list of Java compiler arguments to include -Xplugin:scip. * *

    This main method should be used by a `javac` wrapper script like this: * * 

        *     NEW_OPTIONS_PATH=$(mktemp)
-   *     java -cp semanticdb.jar \
-   *         -Dsemanticdb.output=NEW_OPTIONS_PATH \
-   *         com.sourcegraph.semanticdb_javac.InjectSemanticdbOptions $@
+   *     java -cp scip.jar \
+   *         -Dscip.output=NEW_OPTIONS_PATH \
+   *         com.sourcegraph.scip_javac.InjectScipOptions $@
    *     javac @$NEW_OPTIONS_PATH
    *
    * *

    Requires the following system properties: * *

      - *
    • -Dsemanticdb.output=PATH: the file to write the updated compiler options - *
    • -Dsemanticdb.old-output=PATH: the file to write the original compiler options. Only used - * for debugging purposes. - *
    • -Dsemanticdb.pluginpath=PATH: the path to the SemanticDB compiler plugin jar - *
    • -Dsemanticdb.sourceroot=PATH: the path to use in -Xplugin:semanticdb -sourceroot:PATH - *
    • -Dsemanticdb.targetroot=PATH: the path to use in -Xplugin:semanticdb -targetroot:PATH + *
    • -Dscip.output=PATH: the file to write the updated compiler options + *
    • -Dscip.old-output=PATH: the file to write the original compiler options. Only used for + * debugging purposes. + *
    • -Dscip.pluginpath=PATH: the path to the SCIP compiler plugin jar + *
    • -Dscip.sourceroot=PATH: the path to use in -Xplugin:scip -sourceroot:PATH + *
    • -Dscip.targetroot=PATH: the path to use in -Xplugin:scip -targetroot:PATH *
    * * @param args the Java compiler arguments to update. @@ -40,9 +40,9 @@ public static void main(String[] args) { try { runMain(args); } catch (IOException e) { - if (!SemanticdbOptionBuilder.ERRORPATH.isEmpty()) { + if (!ScipOptionBuilder.ERRORPATH.isEmpty()) { try { - Path path = Paths.get(SemanticdbOptionBuilder.ERRORPATH); + Path path = Paths.get(ScipOptionBuilder.ERRORPATH); Files.createDirectories(path.getParent()); try (OutputStream out = Files.newOutputStream(path)) { e.printStackTrace(new PrintStream(out)); @@ -54,7 +54,7 @@ public static void main(String[] args) { } public static void runMain(String[] args) throws IOException { - SemanticdbOptionBuilder newArgs = new SemanticdbOptionBuilder(); + ScipOptionBuilder newArgs = new ScipOptionBuilder(); for (String arg : args) { if (arg.startsWith("@")) { String filepath = arg.substring(1); diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/RangeFinder.java similarity index 98% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/RangeFinder.java index 27a325ce..56d38a09 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/RangeFinder.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; import javax.tools.Diagnostic; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Result.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/Result.java similarity index 97% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Result.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/Result.java index 03597bc3..4d53c8fd 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/Result.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/Result.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; import java.util.NoSuchElementException; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/ScipJavaSignatureFormatter.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavaSignatureFormatter.java similarity index 99% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/ScipJavaSignatureFormatter.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavaSignatureFormatter.java index 85c057bd..6324c625 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/ScipJavaSignatureFormatter.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavaSignatureFormatter.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; import com.sun.source.tree.AnnotationTree; import com.sun.source.tree.AssignmentTree; @@ -48,8 +48,8 @@ * *

    This is the Java-language path of the old {@code SignatureFormatter}, ported onto javac's * element / type / tree API so the compiler plugin no longer has to first marshal everything into - * SemanticDB proto messages. Output is intentionally byte-identical with the previous output so - * existing golden snapshots continue to match. + * SCIP proto messages. Output is intentionally byte-identical with the previous output so existing + * golden snapshots continue to match. */ final class ScipJavaSignatureFormatter { private static final String UNRESOLVED = "unresolved_type"; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavacOptions.java similarity index 83% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavacOptions.java index e16ad980..3d7f4205 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavacOptions.java @@ -1,8 +1,8 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; -import com.sourcegraph.semanticdb.NoRelativePathMode; -import com.sourcegraph.semanticdb.SemanticdbOptions; -import com.sourcegraph.semanticdb.UriScheme; +import com.sourcegraph.scip.NoRelativePathMode; +import com.sourcegraph.scip.ScipOptions; +import com.sourcegraph.scip.UriScheme; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -20,7 +20,7 @@ import static javax.tools.StandardLocation.SOURCE_OUTPUT; /** Settings that can be configured alongside the -Xplugin compiler option. */ -public class SemanticdbJavacOptions extends SemanticdbOptions { +public class ScipJavacOptions extends ScipOptions { public boolean verboseEnabled = false; public final ArrayList errors = new ArrayList<>(); @@ -30,14 +30,14 @@ public class SemanticdbJavacOptions extends SemanticdbOptions { public static String missingRequiredDirectoryOption(String option) { return String.format( "missing argument '-%s'. To fix this problem, update the Java compiler option " - + "'-Xplugin:semanticdb -%s:DIRECTORY' where DIRECTORY is the path to a valid directory.", + + "'-Xplugin:scip -%s:DIRECTORY' where DIRECTORY is the path to a valid directory.", option, option); } public static String JAVAC_CLASSES_DIR_ARG = "javac-classes-directory"; - public static SemanticdbJavacOptions parse(String[] args, JavacTask task) { - SemanticdbJavacOptions result = new SemanticdbJavacOptions(); + public static ScipJavacOptions parse(String[] args, JavacTask task) { + ScipJavacOptions result = new ScipJavacOptions(); boolean useJavacClassesDir = false; for (String arg : args) { @@ -100,7 +100,7 @@ public static SemanticdbJavacOptions parse(String[] args, JavacTask task) { // When using -build-tool:bazel, the sourceroot is automatically inferred from // the first // compilation unit. - // See `SemanticdbTaskListener.inferBazelSourceroot()` for the method that + // See `ScipTaskListener.inferBazelSourceroot()` for the method that // infers the // sourceroot. result.errors.add(missingRequiredDirectoryOption("sourceroot")); @@ -108,7 +108,7 @@ public static SemanticdbJavacOptions parse(String[] args, JavacTask task) { return result; } - private static boolean isSourcerootDefined(SemanticdbJavacOptions options) { + private static boolean isSourcerootDefined(ScipJavacOptions options) { if (options.uriScheme == UriScheme.BAZEL) { return true; // The sourceroot is automatically inferred for Bazel. } @@ -117,7 +117,7 @@ private static boolean isSourcerootDefined(SemanticdbJavacOptions options) { // warning - use of internal API // requires --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED - private static TargetPaths getJavacClassesDir(SemanticdbJavacOptions result, JavacTask task) { + private static TargetPaths getJavacClassesDir(ScipJavacOptions result, JavacTask task) { // both Context and BasicJavacTask are internal JDK classes so not exported // under >= JDK 17 // com.sun.tools.javac.util.Context ctx = @@ -133,10 +133,10 @@ private static TargetPaths getJavacClassesDir(SemanticdbJavacOptions result, Jav JavaFileManager fm = (JavaFileManager) get.invoke(context, JavaFileManager.class); FileObject sourceOutputDirStub = fm.getJavaFileForOutput( - SOURCE_OUTPUT, SemanticdbPlugin.stubClassName, JavaFileObject.Kind.SOURCE, null); + SOURCE_OUTPUT, ScipPlugin.stubClassName, JavaFileObject.Kind.SOURCE, null); FileObject clasSOutputDirStub = fm.getJavaFileForOutput( - CLASS_OUTPUT, SemanticdbPlugin.stubClassName, JavaFileObject.Kind.CLASS, null); + CLASS_OUTPUT, ScipPlugin.stubClassName, JavaFileObject.Kind.CLASS, null); classOutputDir = Paths.get(clasSOutputDirStub.toUri()).toAbsolutePath().getParent(); sourceOutputDir = Paths.get(sourceOutputDirStub.toUri()).toAbsolutePath().getParent(); } catch (Exception e) { @@ -144,7 +144,7 @@ private static TargetPaths getJavacClassesDir(SemanticdbJavacOptions result, Jav e.printStackTrace(new PrintStream(out)); String errorMsg = String.format( - "exception while processing SemanticDB option '-targetroot:%s'\n%s", + "exception while processing SCIP option '-targetroot:%s'\n%s", JAVAC_CLASSES_DIR_ARG, out.toString()); result.errors.add(errorMsg); } diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbOptionBuilder.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipOptionBuilder.java similarity index 84% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbOptionBuilder.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipOptionBuilder.java index 9a2b1598..e67e8158 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbOptionBuilder.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipOptionBuilder.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; import java.io.File; import java.io.IOException; @@ -11,18 +11,18 @@ import java.util.ArrayList; import java.util.List; -public class SemanticdbOptionBuilder { +public class ScipOptionBuilder { private String previousArg = ""; private final ArrayList oldArgs = new ArrayList<>(); private final ArrayList result = new ArrayList<>(); private boolean isClasspathUpdated = false; - public static final String ERRORPATH = System.getProperty("semanticdb.errorpath", ""); - private static final String PLUGINPATH = System.getProperty("semanticdb.pluginpath", ""); - private static final String SOURCEROOT = System.getProperty("semanticdb.sourceroot", ""); - private static final String TARGETROOT = System.getProperty("semanticdb.targetroot", ""); - private static final String OUTPUT = System.getProperty("semanticdb.output", ""); - private static final String OLD_OUTPUT = System.getProperty("semanticdb.old-output", ""); + public static final String ERRORPATH = System.getProperty("scip.errorpath", ""); + private static final String PLUGINPATH = System.getProperty("scip.pluginpath", ""); + private static final String SOURCEROOT = System.getProperty("scip.sourceroot", ""); + private static final String TARGETROOT = System.getProperty("scip.targetroot", ""); + private static final String OUTPUT = System.getProperty("scip.output", ""); + private static final String OLD_OUTPUT = System.getProperty("scip.old-output", ""); public void processArgument(String arg) { oldArgs.add(arg); @@ -62,8 +62,7 @@ private String wrapQuote(String arg) { } private String xpluginOption() { - return String.format( - "\"-Xplugin:semanticdb -sourceroot:%s -targetroot:%s\"", SOURCEROOT, TARGETROOT); + return String.format("\"-Xplugin:scip -sourceroot:%s -targetroot:%s\"", SOURCEROOT, TARGETROOT); } public ArrayList finalResult() { diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipPlugin.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipPlugin.java new file mode 100644 index 00000000..8d6eeb1c --- /dev/null +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipPlugin.java @@ -0,0 +1,25 @@ +package com.sourcegraph.scip_javac; + +import com.sun.source.util.Plugin; +import com.sun.source.util.JavacTask; +import com.sun.source.util.Trees; + +/** Entrypoint of the scip-javac compiler plugin. */ +public class ScipPlugin implements Plugin { + + public static String stubClassName = "META-INF-scip-stub"; + + @Override + public String getName() { + return "scip"; + } + + @Override + public void init(JavacTask task, String... args) { + Trees trees = Trees.instance(task); + ScipReporter reporter = new ScipReporter(trees); + ScipJavacOptions options = ScipJavacOptions.parse(args, task); + GlobalSymbolsCache globals = new GlobalSymbolsCache(options); + task.addTaskListener(new ScipTaskListener(options, task, trees, globals, reporter)); + } +} diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbReporter.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipReporter.java similarity index 82% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbReporter.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipReporter.java index e083b2ee..e193e3fb 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbReporter.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipReporter.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.Tree; @@ -15,10 +15,10 @@ *

    NOTE(olafur): this class exists because I couldn't find compiler APIs to report diagnostics. * This class can be removed if the Java compiler has APIs to report info/warning/error messages. */ -public class SemanticdbReporter { +public class ScipReporter { private final Trees trees; - public SemanticdbReporter(Trees trees) { + public ScipReporter(Trees trees) { this.trees = trees; } @@ -27,7 +27,7 @@ public void exception(Throwable e, Tree tree, CompilationUnitTree root) { PrintWriter writer = new PrintWriter(baos); e.printStackTrace(writer); writer.println( - "Please report a bug to https://github.com/sourcegraph/semanticdb-java with the stack trace above."); + "Please report a bug to https://github.com/sourcegraph/scip-java with the stack trace above."); trees.printMessage(Diagnostic.Kind.ERROR, baos.toString(), tree, root); } @@ -38,7 +38,7 @@ public void exception(Throwable e, TaskEvent task) { public void info(String message, TaskEvent e) { trees.printMessage( Diagnostic.Kind.NOTE, - "semanticdb-javac: " + message, + "scip-javac: " + message, e.getCompilationUnit(), e.getCompilationUnit()); } @@ -46,7 +46,7 @@ public void info(String message, TaskEvent e) { public void error(String message, TaskEvent e) { trees.printMessage( Diagnostic.Kind.ERROR, - "semanticdb-javac: " + message, + "scip-javac: " + message, e.getCompilationUnit(), e.getCompilationUnit()); } @@ -56,7 +56,6 @@ public void error(String message, Tree tree, CompilationUnitTree root) { // diagnostic, but I dind't // find // the reporter API so the message goes to stderr instead for now. - trees.printMessage( - Diagnostic.Kind.ERROR, String.format("semanticdb-javac: %s", message), tree, root); + trees.printMessage(Diagnostic.Kind.ERROR, String.format("scip-javac: %s", message), tree, root); } } diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipTaskListener.java similarity index 91% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipTaskListener.java index c6a6fff2..0ffd7446 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipTaskListener.java @@ -1,12 +1,12 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; -import com.sourcegraph.semanticdb.LocalSymbolsCache; -import com.sourcegraph.semanticdb.NoRelativePathMode; -import com.sourcegraph.semanticdb.ScipDocumentBuilder; -import com.sourcegraph.semanticdb.ScipShardPaths; -import com.sourcegraph.semanticdb.ScipShardWriter; -import com.sourcegraph.semanticdb.SemanticdbSymbols; -import com.sourcegraph.semanticdb.UriScheme; +import com.sourcegraph.scip.LocalSymbolsCache; +import com.sourcegraph.scip.NoRelativePathMode; +import com.sourcegraph.scip.ScipDocumentBuilder; +import com.sourcegraph.scip.ScipShardPaths; +import com.sourcegraph.scip.ScipShardWriter; +import com.sourcegraph.scip.ScipSymbols; +import com.sourcegraph.scip.UriScheme; import com.sun.source.util.JavacTask; import com.sun.source.util.TaskEvent; import com.sun.source.util.TaskListener; @@ -32,10 +32,10 @@ * Callback hook that emits a per-source SCIP shard once the compiler has finished typechecking a * Java compilation unit. Shards are merged into the final SCIP index by the aggregator. */ -public final class SemanticdbTaskListener implements TaskListener { - private final SemanticdbJavacOptions options; +public final class ScipTaskListener implements TaskListener { + private final ScipJavacOptions options; private final GlobalSymbolsCache globals; - private final SemanticdbReporter reporter; + private final ScipReporter reporter; private final Types types; private final Trees trees; private final Elements elements; @@ -43,12 +43,12 @@ public final class SemanticdbTaskListener implements TaskListener { private final Map perSourceState = new HashMap<>(); private int noRelativePathCounter = 0; - public SemanticdbTaskListener( - SemanticdbJavacOptions options, + public ScipTaskListener( + ScipJavacOptions options, JavacTask task, Trees trees, GlobalSymbolsCache globals, - SemanticdbReporter reporter) { + ScipReporter reporter) { this.options = options; this.globals = globals; this.reporter = reporter; @@ -151,10 +151,10 @@ private void writeShard(TaskEvent event, Path output, Document document) { private static final class PerSourceState { final ScipDocumentBuilder documentBuilder = new ScipDocumentBuilder(); final LocalSymbolsCache locals = - new LocalSymbolsCache<>(new IdentityHashMap<>(), SemanticdbSymbols::local); + new LocalSymbolsCache<>(new IdentityHashMap<>(), ScipSymbols::local); } - public static Path absolutePathFromUri(SemanticdbJavacOptions options, JavaFileObject file) { + public static Path absolutePathFromUri(ScipJavacOptions options, JavaFileObject file) { URI uri = file.toUri(); if (options.uriScheme == UriScheme.BAZEL) { String toString = file.toString().replace(":", "/"); diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/ScipVisitor.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipVisitor.java similarity index 97% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/ScipVisitor.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipVisitor.java index 61e3af5b..c776b207 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/ScipVisitor.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipVisitor.java @@ -1,8 +1,8 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; -import com.sourcegraph.semanticdb.LocalSymbolsCache; -import com.sourcegraph.semanticdb.ScipDocumentBuilder; -import com.sourcegraph.semanticdb.SemanticdbSymbols; +import com.sourcegraph.scip.LocalSymbolsCache; +import com.sourcegraph.scip.ScipDocumentBuilder; +import com.sourcegraph.scip.ScipSymbols; import com.sun.source.tree.AnnotatedTypeTree; import com.sun.source.tree.ClassTree; import com.sun.source.tree.CompilationUnitTree; @@ -53,10 +53,10 @@ * Walks a typechecked compilation unit and feeds SCIP {@link Occurrence}/{@link SymbolInformation} * messages into a {@link ScipDocumentBuilder}. * - *

    Replaces the old {@code SemanticdbVisitor} + {@code SemanticdbSignatures} + {@code - * SemanticdbTrees} chain that first produced SemanticDB protos and then converted them to SCIP. - * Symbols are emitted in their bare form (e.g. {@code _root_/com/example/Foo#bar().}); the - * aggregator prefixes them with the resolved package coordinates at index time. + *

    Replaces the old {@code ScipVisitor} + {@code ScipSignatures} + {@code ScipTrees} chain that + * first produced SCIP protos and then converted them to SCIP. Symbols are emitted in their + * bare form (e.g. {@code _root_/com/example/Foo#bar().}); the aggregator prefixes them + * with the resolved package coordinates at index time. */ final class ScipVisitor extends TreePathScanner { private final GlobalSymbolsCache globals; @@ -294,7 +294,7 @@ private void emitSymbolInformation(Element sym, Tree tree) { builder.addDocumentation(documentation); } - if (SemanticdbSymbols.isLocal(symbol)) { + if (ScipSymbols.isLocal(symbol)) { String enclosingSymbol = scipSymbol(sym.getEnclosingElement()); if (!enclosingSymbol.isEmpty()) builder.setEnclosingSymbol(enclosingSymbol); } diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/TargetPaths.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/TargetPaths.java similarity index 83% rename from semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/TargetPaths.java rename to scip-javac/src/main/java/com/sourcegraph/scip_javac/TargetPaths.java index c523e353..297685c1 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/TargetPaths.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/TargetPaths.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_javac; +package com.sourcegraph.scip_javac; import java.nio.file.Path; diff --git a/scip-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin b/scip-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin new file mode 100644 index 00000000..5e18e862 --- /dev/null +++ b/scip-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin @@ -0,0 +1 @@ +com.sourcegraph.scip_javac.ScipPlugin \ No newline at end of file diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java new file mode 100644 index 00000000..b50629be --- /dev/null +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java @@ -0,0 +1,28 @@ + package snapshots; + +//⌄ enclosing_range_start scip-java maven . . snapshots/ClassConsumer# + public class ClassConsumer { +// ^^^^^^^^^^^^^ definition scip-java maven . . snapshots/ClassConsumer# +// display_name ClassConsumer +// signature_documentation java public class ClassConsumer +// kind Class +// ^^^^^^^^^^^^^ definition scip-java maven . . snapshots/ClassConsumer#``(). +// display_name +// signature_documentation java public ClassConsumer() +// kind Constructor +// ⌄ enclosing_range_start scip-java maven . . snapshots/ClassConsumer#run(). + public static void run() { +// ^^^ definition scip-java maven . . snapshots/ClassConsumer#run(). +// display_name run +// signature_documentation java public static void run() +// kind StaticMethod + System.out.println(new Class().getAsdf()); +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+9). +// ^^^^^ reference scip-java maven . . snapshots/Class#``(+1). +// ^^^^^^^ reference scip-java maven . . snapshots/Class#getAsdf(). + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/ClassConsumer#run(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/ClassConsumer# diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java new file mode 100644 index 00000000..962c6bbc --- /dev/null +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java @@ -0,0 +1,25 @@ + package snapshots; + +//⌄ enclosing_range_start scip-java maven . . snapshots/CompanionConsumer# + public class CompanionConsumer { +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionConsumer# +// display_name CompanionConsumer +// signature_documentation java public class CompanionConsumer +// kind Class +// ⌄ enclosing_range_start scip-java maven . . snapshots/CompanionConsumer#``(). + CompanionConsumer() { +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionConsumer#``(). +// display_name +// signature_documentation java CompanionConsumer() +// kind Constructor + CompanionOwner.Companion.create(); +// ^^^^^^^^^^^^^^ reference scip-java maven . . snapshots/CompanionOwner# +// ^^^^^^^^^ reference scip-java maven . . snapshots/CompanionOwner#Companion. +// ^^^^^^ reference scip-java maven . . snapshots/CompanionOwner#Companion#create(). + new CompanionOwner().create(); +// ^^^^^^^^^^^^^^ reference scip-java maven . . snapshots/CompanionOwner#``(). +// ^^^^^^ reference scip-java maven . . snapshots/CompanionOwner#create(). + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/CompanionConsumer#``(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/CompanionConsumer# diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java new file mode 100644 index 00000000..77785c36 --- /dev/null +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java @@ -0,0 +1,45 @@ + package snapshots; + +//⌄ enclosing_range_start scip-java maven . . snapshots/KotlinClass# + public class KotlinClass { +// ^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinClass# +// display_name KotlinClass +// signature_documentation java public class KotlinClass +// kind Class +// ⌄ enclosing_range_start scip-java maven . . snapshots/KotlinClass#``(). + KotlinClass() throws Class { +// ^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinClass#``(). +// display_name +// signature_documentation java KotlinClass() throws Class +// kind Constructor +// ^^^^^ reference scip-java maven . . snapshots/Class# + throw new Class(); +// ^^^^^ reference scip-java maven . . snapshots/Class#``(+1). + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/KotlinClass#``(). + +// ⌄ enclosing_range_start scip-java maven . . snapshots/KotlinClass#test(). + void test() throws Class { +// ^^^^ definition scip-java maven . . snapshots/KotlinClass#test(). +// display_name test +// signature_documentation java void test() throws Class +// kind Method +// ^^^^^ reference scip-java maven . . snapshots/Class# + throw new Class(1, ""); +// ^^^^^ reference scip-java maven . . snapshots/Class#``(). + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/KotlinClass#test(). + +// ⌄ enclosing_range_start scip-java maven . . snapshots/KotlinClass#other(). + void other() throws Class { +// ^^^^^ definition scip-java maven . . snapshots/KotlinClass#other(). +// display_name other +// signature_documentation java void other() throws Class +// kind Method +// ^^^^^ reference scip-java maven . . snapshots/Class# + throw new Class(1); +// ^^^^^ reference scip-java maven . . snapshots/Class#``(+2). + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/KotlinClass#other(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/KotlinClass# diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java new file mode 100644 index 00000000..b952e169 --- /dev/null +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java @@ -0,0 +1,43 @@ + package snapshots; + + import kotlin.collections.CollectionsKt; +// ^^^^^^ reference scip-java maven . . kotlin/ +// ^^^^^^^^^^^ reference scip-java maven . . kotlin/collections/ +// ^^^^^^^^^^^^^ reference scip-java maven . . kotlin/collections/CollectionsKt# + import kotlin.text.StringsKt; +// ^^^^^^ reference scip-java maven . . kotlin/ +// ^^^^ reference scip-java maven . . kotlin/text/ +// ^^^^^^^^^ reference scip-java maven . . kotlin/text/StringsKt# + +//⌄ enclosing_range_start scip-java maven . . snapshots/KotlinLambdas# + public class KotlinLambdas { +// ^^^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinLambdas# +// display_name KotlinLambdas +// signature_documentation java public class KotlinLambdas +// kind Class +// ^^^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinLambdas#``(). +// display_name +// signature_documentation java public KotlinLambdas() +// kind Constructor +// ⌄ enclosing_range_start scip-java maven . . snapshots/KotlinLambdas#test(). + public void test() { +// ^^^^ definition scip-java maven . . snapshots/KotlinLambdas#test(). +// display_name test +// signature_documentation java public void test() +// kind Method + LambdasKt.getX(); // TODO figure out emit getX on kotlin side +// ^^^^^^^^^ reference scip-java maven . . snapshots/LambdasKt# +// ^^^^ reference scip-java maven . . snapshots/LambdasKt#getX(). + + kotlin.collections.CollectionsKt.listOf(); +// ^^^^^^ reference scip-java maven . . kotlin/ +// ^^^^^^^^^^^ reference scip-java maven . . kotlin/collections/ +// ^^^^^^^^^^^^^ reference scip-java maven . . kotlin/collections/CollectionsKt# +// ^^^^^^ reference scip-java maven . . kotlin/collections/CollectionsKt__CollectionsKt#listOf(). + FunctionsKt.sampleText(""); +// ^^^^^^^^^^^ reference scip-java maven . . snapshots/FunctionsKt# +// ^^^^^^^^^^ reference scip-java maven . . snapshots/FunctionsKt#sampleText(). + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/KotlinLambdas#test(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/KotlinLambdas# diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java new file mode 100644 index 00000000..a9c03cef --- /dev/null +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java @@ -0,0 +1,26 @@ + package snapshots; + +//⌄ enclosing_range_start scip-java maven . . snapshots/ObjectKtConsumer# + public class ObjectKtConsumer { +// ^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/ObjectKtConsumer# +// display_name ObjectKtConsumer +// signature_documentation java public class ObjectKtConsumer +// kind Class +// ^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/ObjectKtConsumer#``(). +// display_name +// signature_documentation java public ObjectKtConsumer() +// kind Constructor +// ⌄ enclosing_range_start scip-java maven . . snapshots/ObjectKtConsumer#run(). + public static void run() { +// ^^^ definition scip-java maven . . snapshots/ObjectKtConsumer#run(). +// display_name run +// signature_documentation java public static void run() +// kind StaticMethod + ObjectKt.INSTANCE.fail("boom"); +// ^^^^^^^^ reference scip-java maven . . snapshots/ObjectKt# +// ^^^^^^^^ reference scip-java maven . . snapshots/ObjectKt#INSTANCE. +// ^^^^ reference scip-java maven . . snapshots/ObjectKt#fail(). + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/ObjectKtConsumer#run(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/ObjectKtConsumer# diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt new file mode 100644 index 00000000..a36b57b7 --- /dev/null +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt @@ -0,0 +1,129 @@ + package snapshots +// ^^^^^^^^^ reference scip-java maven . . snapshots/ + +//⌄ enclosing_range_start scip-java maven . . snapshots/Class# +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#``(). +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#``().(banana) +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#banana. +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#getBanana(). +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#setBanana(). +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#setBanana().(value) +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#``().(apple) + class Class constructor(private var banana: Int, apple: String) : +// ^^^^^ definition scip-java maven . . snapshots/Class# +// display_name Class +// signature_documentation kotlin public final class Class : Throwable +// relationship is_implementation scip-java maven . . kotlin/Throwable# +// ^^^^^^^^^^^ definition scip-java maven . . snapshots/Class#``(). +// display_name Class +// signature_documentation kotlin public constructor(banana: Int, apple: String): Class +// ^^^^^^ definition scip-java maven . . snapshots/Class#``().(banana) +// display_name banana +// signature_documentation kotlin banana: Int +// ^^^^^^ reference scip-java maven . . snapshots/Class#``().(banana) +// ^^^^^^ definition scip-java maven . . snapshots/Class#banana. +// display_name banana +// signature_documentation kotlin private final var banana: Int +// ^^^^^^ definition scip-java maven . . snapshots/Class#getBanana(). +// display_name banana +// signature_documentation kotlin private get(): Int +// ^^^^^^ definition scip-java maven . . snapshots/Class#setBanana(). +// display_name banana +// signature_documentation kotlin private set(value: Int): Unit +// ^^^^^^ definition scip-java maven . . snapshots/Class#setBanana().(value) +// display_name value +// signature_documentation kotlin value: Int +// ^^^ reference scip-java maven . . kotlin/Int# +// ^^^^^ definition scip-java maven . . snapshots/Class#``().(apple) +// display_name apple +// signature_documentation kotlin apple: String +// ^^^^^^ reference scip-java maven . . kotlin/String# +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#``().(banana) +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#banana. +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#getBanana(). +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#setBanana(). +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#setBanana().(value) +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#``().(apple) +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#``(). + Throwable(banana.toString() + apple) { +// ^^^^^^^^^ reference scip-java maven . . kotlin/Throwable# +// ^^^^^^ reference scip-java maven . . snapshots/Class#``().(banana) +// ^^^^^^^^ reference scip-java maven . . kotlin/Int#toString(). +// ^ reference scip-java maven . . kotlin/String#plus(). +// ^^^^^ reference scip-java maven . . snapshots/Class#``().(apple) + init { + println("") +// ^^^^^^^ reference scip-java maven . . kotlin/io/println(). + } + +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#asdf. +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#getAsdf(). + val asdf = +// ^^^^ definition scip-java maven . . snapshots/Class#asdf. +// display_name asdf +// signature_documentation kotlin public final val asdf: Any +// ^^^^ definition scip-java maven . . snapshots/Class#getAsdf(). +// display_name asdf +// signature_documentation kotlin public get(): Any +// ⌄ enclosing_range_start scip-java maven . . snapshots/``# +// ⌄ enclosing_range_start scip-java maven . . snapshots/``#``(). + object { +// ^^^^^^ definition scip-java maven . . snapshots/``# +// display_name +// signature_documentation kotlin object : Any +// ^^^^^^ definition scip-java maven . . snapshots/``#``(). +// display_name +// signature_documentation kotlin private constructor(): +// ⌄ enclosing_range_start scip-java maven . . snapshots/``#doStuff(). + fun doStuff() = Unit +// ^^^^^^^ definition scip-java maven . . snapshots/``#doStuff(). +// display_name doStuff +// signature_documentation kotlin public final fun doStuff(): Unit +// ⌃ enclosing_range_end scip-java maven . . snapshots/``#doStuff(). + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#asdf. +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#getAsdf(). +// ⌃ enclosing_range_end scip-java maven . . snapshots/``# +// ⌃ enclosing_range_end scip-java maven . . snapshots/``#``(). + +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#``(+1). + constructor() : this(1, "") +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/Class#``(+1). +// display_name Class +// signature_documentation kotlin public constructor(): Class +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#``(+1). + +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#``(+2). +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#``(+2).(banana) + constructor(banana: Int) : this(banana, "") +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/Class#``(+2). +// display_name Class +// signature_documentation kotlin public constructor(banana: Int): Class +// ^^^^^^ definition scip-java maven . . snapshots/Class#``(+2).(banana) +// display_name banana +// signature_documentation kotlin banana: Int +// ^^^ reference scip-java maven . . kotlin/Int# +// ^^^^^^ reference scip-java maven . . snapshots/Class#``(+2).(banana) +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#``(+2).(banana) +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#``(+2). + +// ⌄ enclosing_range_start scip-java maven . . snapshots/Class#run(). + fun run() { +// ^^^ definition scip-java maven . . snapshots/Class#run(). +// display_name run +// signature_documentation kotlin public final fun run(): Unit + println(Class::class) +// ^^^^^^^ reference scip-java maven . . kotlin/io/println(). + println("I eat $banana for lunch") +// ^^^^^^^ reference scip-java maven . . kotlin/io/println(). +// ^^^^^^ reference scip-java maven . . snapshots/Class#banana. +// ^^^^^^ reference scip-java maven . . snapshots/Class#getBanana(). +// ^^^^^^ reference scip-java maven . . snapshots/Class#setBanana(). + banana = 42 +// ^^^^^^ reference scip-java maven . . snapshots/Class#banana. +// ^^^^^^ reference scip-java maven . . snapshots/Class#getBanana(). +// ^^^^^^ reference scip-java maven . . snapshots/Class#setBanana(). + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/Class#run(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/Class# diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt new file mode 100644 index 00000000..8d7e3490 --- /dev/null +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt @@ -0,0 +1,44 @@ + package snapshots +// ^^^^^^^^^ reference scip-java maven . . snapshots/ + +//⌄ enclosing_range_start scip-java maven . . snapshots/CompanionOwner# +//⌄ enclosing_range_start scip-java maven . . snapshots/CompanionOwner#``(). + class CompanionOwner { +// ^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionOwner# +// display_name CompanionOwner +// signature_documentation kotlin public final class CompanionOwner : Any +// ^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionOwner#``(). +// display_name CompanionOwner +// signature_documentation kotlin public constructor(): CompanionOwner +// ⌄ enclosing_range_start scip-java maven . . snapshots/CompanionOwner#Companion# +// ⌄ enclosing_range_start scip-java maven . . snapshots/CompanionOwner#Companion#``(). + companion object { +// ^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionOwner#Companion# 2:3 +// display_name Companion +// signature_documentation kotlin public final companion object Companion : Any +// ^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionOwner#Companion#``(). 2:3 +// display_name Companion +// signature_documentation kotlin private constructor(): CompanionOwner.Companion +// ⌄ enclosing_range_start scip-java maven . . snapshots/CompanionOwner#Companion#create(). + fun create(): CompanionOwner = CompanionOwner() +// ^^^^^^ definition scip-java maven . . snapshots/CompanionOwner#Companion#create(). +// display_name create +// signature_documentation kotlin public final fun create(): CompanionOwner +// ^^^^^^^^^^^^^^ reference scip-java maven . . snapshots/CompanionOwner# +// ^^^^^^^^^^^^^^ reference scip-java maven . . snapshots/CompanionOwner#``(). +// ⌃ enclosing_range_end scip-java maven . . snapshots/CompanionOwner#Companion#create(). + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/CompanionOwner#Companion# +// ⌃ enclosing_range_end scip-java maven . . snapshots/CompanionOwner#Companion#``(). +// ⌄ enclosing_range_start scip-java maven . . snapshots/CompanionOwner#create(). + fun create(): Int = CompanionOwner.create().hashCode() +// ^^^^^^ definition scip-java maven . . snapshots/CompanionOwner#create(). +// display_name create +// signature_documentation kotlin public final fun create(): Int +// ^^^ reference scip-java maven . . kotlin/Int# +// ^^^^^^ reference scip-java maven . . snapshots/CompanionOwner#Companion#create(). +// ^^^^^^^^ reference scip-java maven . . kotlin/Any#hashCode(). +// ⌃ enclosing_range_end scip-java maven . . snapshots/CompanionOwner#create(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/CompanionOwner# +//⌃ enclosing_range_end scip-java maven . . snapshots/CompanionOwner#``(). diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt new file mode 100644 index 00000000..3261f8c1 --- /dev/null +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt @@ -0,0 +1,47 @@ + package snapshots +// ^^^^^^^^^ reference scip-java maven . . snapshots/ + + import java.io.Serializable +// ^^^^ reference scip-java maven . . java/ +// ^^ reference scip-java maven . . java/io/ +// ^^^^^^^^^^^^ reference scip-java maven jdk 11 java/io/Serializable# + +//⌄ enclosing_range_start scip-java maven . . snapshots/DocstringSuperclass# +//⌄ enclosing_range_start scip-java maven . . snapshots/DocstringSuperclass#``(). + abstract class DocstringSuperclass +// ^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/DocstringSuperclass# +// display_name DocstringSuperclass +// signature_documentation kotlin public abstract class DocstringSuperclass : Any +// ^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/DocstringSuperclass#``(). +// display_name DocstringSuperclass +// signature_documentation kotlin public constructor(): DocstringSuperclass +// ⌃ enclosing_range_end scip-java maven . . snapshots/DocstringSuperclass# +// ⌃ enclosing_range_end scip-java maven . . snapshots/DocstringSuperclass#``(). +//⌄ enclosing_range_start scip-java maven . . snapshots/Docstrings# +//⌄ enclosing_range_start scip-java maven . . snapshots/Docstrings#``(). + /** Example class docstring. */ + class Docstrings : DocstringSuperclass(), Serializable { +// ^^^^^^^^^^ definition scip-java maven . . snapshots/Docstrings# +// display_name Docstrings +// signature_documentation kotlin public final class Docstrings : DocstringSuperclass, Serializable +// documentation Example class docstring. +// relationship is_implementation scip-java maven . . snapshots/DocstringSuperclass# +// relationship is_implementation scip-java maven jdk 11 java/io/Serializable# +// ^^^^^^^^^^ definition scip-java maven . . snapshots/Docstrings#``(). +// display_name Docstrings +// signature_documentation kotlin public constructor(): Docstrings +// documentation Example class docstring. +// ^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . snapshots/DocstringSuperclass# +// ^^^^^^^^^^^^ reference scip-java maven jdk 11 java/io/Serializable# + } +//⌃ enclosing_range_end scip-java maven . . snapshots/Docstrings# +//⌃ enclosing_range_end scip-java maven . . snapshots/Docstrings#``(). + +//⌄ enclosing_range_start scip-java maven . . snapshots/docstrings(). + /** Example method docstring. */ + fun docstrings() { } +// ^^^^^^^^^^ definition scip-java maven . . snapshots/docstrings(). +// display_name docstrings +// signature_documentation kotlin public final fun docstrings(): Unit +// documentation Example method docstring. +// ⌃ enclosing_range_end scip-java maven . . snapshots/docstrings(). diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt new file mode 100644 index 00000000..d2cf4c23 --- /dev/null +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt @@ -0,0 +1,19 @@ + package snapshots +// ^^^^^^^^^ reference scip-java maven . . snapshots/ + +//⌄ enclosing_range_start scip-java maven . . snapshots/sampleText(). +// ⌄ enclosing_range_start scip-java maven . . snapshots/sampleText().(x) + fun sampleText(x: String = "") { +// ^^^^^^^^^^ definition scip-java maven . . snapshots/sampleText(). +// display_name sampleText +// signature_documentation kotlin public final fun sampleText(x: String = ...): Unit +// ^ definition scip-java maven . . snapshots/sampleText().(x) +// display_name x +// signature_documentation kotlin x: String = ... +// ^^^^^^ reference scip-java maven . . kotlin/String# +// ⌃ enclosing_range_end scip-java maven . . snapshots/sampleText().(x) + println(x) +// ^^^^^^^ reference scip-java maven . . kotlin/io/println(). +// ^ reference scip-java maven . . snapshots/sampleText().(x) + } +//⌃ enclosing_range_end scip-java maven . . snapshots/sampleText(). diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt new file mode 100644 index 00000000..8de9f10f --- /dev/null +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt @@ -0,0 +1,129 @@ + package snapshots +// ^^^^^^^^^ reference scip-java maven . . snapshots/ + +//⌄ enclosing_range_start scip-java maven . . snapshots/Overrides# +//⌄ enclosing_range_start scip-java maven . . snapshots/Overrides#``(). + class Overrides : AutoCloseable { +// ^^^^^^^^^ definition scip-java maven . . snapshots/Overrides# +// display_name Overrides +// signature_documentation kotlin public final class Overrides : {kotlin/AutoCloseable=} AutoCloseable +// relationship is_implementation scip-java maven jdk 11 java/lang/AutoCloseable# +// ^^^^^^^^^ definition scip-java maven . . snapshots/Overrides#``(). +// display_name Overrides +// signature_documentation kotlin public constructor(): Overrides +// ^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/AutoCloseable# +// ⌄ enclosing_range_start scip-java maven . . snapshots/Overrides#close(). + override fun close() { +// ^^^^^ definition scip-java maven . . snapshots/Overrides#close(). +// display_name close +// signature_documentation kotlin public open override fun close(): Unit +// relationship is_implementation scip-java maven jdk 11 java/lang/AutoCloseable#close(). + TODO("Not yet implemented") +// ^^^^ reference scip-java maven . . kotlin/TODO(+1). + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/Overrides#close(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/Overrides# +//⌃ enclosing_range_end scip-java maven . . snapshots/Overrides#``(). + +//⌄ enclosing_range_start scip-java maven . . snapshots/Animal# + interface Animal { +// ^^^^^^ definition scip-java maven . . snapshots/Animal# +// display_name Animal +// signature_documentation kotlin public abstract interface Animal : Any +// ⌄ enclosing_range_start scip-java maven . . snapshots/Animal#favoriteNumber. +// ⌄ enclosing_range_start scip-java maven . . snapshots/Animal#getFavoriteNumber(). + val favoriteNumber: Int +// ^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/Animal#favoriteNumber. +// display_name favoriteNumber +// signature_documentation kotlin public abstract val favoriteNumber: Int +// ^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/Animal#getFavoriteNumber(). +// display_name favoriteNumber +// signature_documentation kotlin public get(): Int +// ^^^ reference scip-java maven . . kotlin/Int# +// ⌃ enclosing_range_end scip-java maven . . snapshots/Animal#favoriteNumber. +// ⌃ enclosing_range_end scip-java maven . . snapshots/Animal#getFavoriteNumber(). +// ⌄ enclosing_range_start scip-java maven . . snapshots/Animal#sound(). + fun sound(): String +// ^^^^^ definition scip-java maven . . snapshots/Animal#sound(). +// display_name sound +// signature_documentation kotlin public abstract fun sound(): String\n +// ^^^^^^ reference scip-java maven . . kotlin/String# +// ⌃ enclosing_range_end scip-java maven . . snapshots/Animal#sound(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/Animal# +//⌄ enclosing_range_start scip-java maven . . snapshots/Bird# +//⌄ enclosing_range_start scip-java maven . . snapshots/Bird#``(). + open class Bird : Animal { +// ^^^^ definition scip-java maven . . snapshots/Bird# +// display_name Bird +// signature_documentation kotlin public open class Bird : Animal +// relationship is_implementation scip-java maven . . snapshots/Animal# +// ^^^^ definition scip-java maven . . snapshots/Bird#``(). +// display_name Bird +// signature_documentation kotlin public constructor(): Bird +// ^^^^^^ reference scip-java maven . . snapshots/Animal# +// ⌄ enclosing_range_start scip-java maven . . snapshots/Bird#favoriteNumber. + override val favoriteNumber: Int +// ^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/Bird#favoriteNumber. +// display_name favoriteNumber +// signature_documentation kotlin public open override val favoriteNumber: Int +// ^^^ reference scip-java maven . . kotlin/Int# +// ⌄ enclosing_range_start scip-java maven . . snapshots/Bird#getFavoriteNumber(). + get() = 42 +// ^^^ definition scip-java maven . . snapshots/Bird#getFavoriteNumber(). +// display_name favoriteNumber +// signature_documentation kotlin public get(): Int +// ⌃ enclosing_range_end scip-java maven . . snapshots/Bird#favoriteNumber. +// ⌃ enclosing_range_end scip-java maven . . snapshots/Bird#getFavoriteNumber(). + +// ⌄ enclosing_range_start scip-java maven . . snapshots/Bird#sound(). + override fun sound(): String { +// ^^^^^ definition scip-java maven . . snapshots/Bird#sound(). +// display_name sound +// signature_documentation kotlin public open override fun sound(): String +// relationship is_implementation scip-java maven . . snapshots/Animal#sound(). +// ^^^^^^ reference scip-java maven . . kotlin/String# + return "tweet" + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/Bird#sound(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/Bird# +//⌃ enclosing_range_end scip-java maven . . snapshots/Bird#``(). +//⌄ enclosing_range_start scip-java maven . . snapshots/Seagull# +//⌄ enclosing_range_start scip-java maven . . snapshots/Seagull#``(). + class Seagull : Bird() { +// ^^^^^^^ definition scip-java maven . . snapshots/Seagull# +// display_name Seagull +// signature_documentation kotlin public final class Seagull : Bird +// relationship is_implementation scip-java maven . . snapshots/Bird# +// ^^^^^^^ definition scip-java maven . . snapshots/Seagull#``(). +// display_name Seagull +// signature_documentation kotlin public constructor(): Seagull +// ^^^^ reference scip-java maven . . snapshots/Bird# +// ⌄ enclosing_range_start scip-java maven . . snapshots/Seagull#favoriteNumber. + override val favoriteNumber: Int +// ^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/Seagull#favoriteNumber. +// display_name favoriteNumber +// signature_documentation kotlin public open override val favoriteNumber: Int +// ^^^ reference scip-java maven . . kotlin/Int# +// ⌄ enclosing_range_start scip-java maven . . snapshots/Seagull#getFavoriteNumber(). + get() = 1337 +// ^^^ definition scip-java maven . . snapshots/Seagull#getFavoriteNumber(). +// display_name favoriteNumber +// signature_documentation kotlin public get(): Int +// ⌃ enclosing_range_end scip-java maven . . snapshots/Seagull#favoriteNumber. +// ⌃ enclosing_range_end scip-java maven . . snapshots/Seagull#getFavoriteNumber(). +// ⌄ enclosing_range_start scip-java maven . . snapshots/Seagull#sound(). + override fun sound(): String { +// ^^^^^ definition scip-java maven . . snapshots/Seagull#sound(). +// display_name sound +// signature_documentation kotlin public open override fun sound(): String +// relationship is_implementation scip-java maven . . snapshots/Bird#sound(). +// ^^^^^^ reference scip-java maven . . kotlin/String# + return "squawk" + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/Seagull#sound(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/Seagull# +//⌃ enclosing_range_end scip-java maven . . snapshots/Seagull#``(). diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt similarity index 54% rename from semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt rename to scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt index 7d477b82..65909152 100644 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt @@ -1,66 +1,66 @@ package snapshots -// ^^^^^^^^^ reference semanticdb maven . . snapshots/ +// ^^^^^^^^^ reference scip-java maven . . snapshots/ -//⌄ enclosing_range_start semanticdb maven . . snapshots/x. -//⌄ enclosing_range_start semanticdb maven . . snapshots/getX(). +//⌄ enclosing_range_start scip-java maven . . snapshots/x. +//⌄ enclosing_range_start scip-java maven . . snapshots/getX(). // ⌄ enclosing_range_start local 0 // ⌄ enclosing_range_start local 1 val x = arrayListOf().forEachIndexed { i, s -> println("$i $s") } -// ^ definition semanticdb maven . . snapshots/getX(). +// ^ definition scip-java maven . . snapshots/getX(). // display_name x // signature_documentation kotlin public get(): Unit -// ^ definition semanticdb maven . . snapshots/x. +// ^ definition scip-java maven . . snapshots/x. // display_name x // signature_documentation kotlin public final val x: Unit -// ^^^^^^^^^^^ reference semanticdb maven . . kotlin/collections/arrayListOf(). -// ^^^^^^^^^^^^^^ reference semanticdb maven . . kotlin/collections/forEachIndexed(+9). +// ^^^^^^^^^^^ reference scip-java maven . . kotlin/collections/arrayListOf(). +// ^^^^^^^^^^^^^^ reference scip-java maven . . kotlin/collections/forEachIndexed(+9). // ^ definition local 0 // display_name i // signature_documentation kotlin i: Int // ^ definition local 1 // display_name s // signature_documentation kotlin s: String -// ^^^^^^^ reference semanticdb maven . . kotlin/io/println(). +// ^^^^^^^ reference scip-java maven . . kotlin/io/println(). // ^ reference local 0 // ^ reference local 1 // ⌃ enclosing_range_end local 0 // ⌃ enclosing_range_end local 1 -// ⌃ enclosing_range_end semanticdb maven . . snapshots/x. -// ⌃ enclosing_range_end semanticdb maven . . snapshots/getX(). +// ⌃ enclosing_range_end scip-java maven . . snapshots/x. +// ⌃ enclosing_range_end scip-java maven . . snapshots/getX(). -//⌄ enclosing_range_start semanticdb maven . . snapshots/y. -//⌄ enclosing_range_start semanticdb maven . . snapshots/getY(). +//⌄ enclosing_range_start scip-java maven . . snapshots/y. +//⌄ enclosing_range_start scip-java maven . . snapshots/getY(). val y = "fdsa".run { this.toByteArray() } -// ^ definition semanticdb maven . . snapshots/getY(). +// ^ definition scip-java maven . . snapshots/getY(). // display_name y // signature_documentation kotlin public get(): ByteArray -// ^ definition semanticdb maven . . snapshots/y. +// ^ definition scip-java maven . . snapshots/y. // display_name y // signature_documentation kotlin public final val y: ByteArray -// ^^^ reference semanticdb maven . . kotlin/run(+1). -// ^^^^^^^^^^^ reference semanticdb maven . . kotlin/text/toByteArray(). -// ⌃ enclosing_range_end semanticdb maven . . snapshots/y. -// ⌃ enclosing_range_end semanticdb maven . . snapshots/getY(). +// ^^^ reference scip-java maven . . kotlin/run(+1). +// ^^^^^^^^^^^ reference scip-java maven . . kotlin/text/toByteArray(). +// ⌃ enclosing_range_end scip-java maven . . snapshots/y. +// ⌃ enclosing_range_end scip-java maven . . snapshots/getY(). -//⌄ enclosing_range_start semanticdb maven . . snapshots/z. -//⌄ enclosing_range_start semanticdb maven . . snapshots/getZ(). +//⌄ enclosing_range_start scip-java maven . . snapshots/z. +//⌄ enclosing_range_start scip-java maven . . snapshots/getZ(). // ⌄ enclosing_range_start local 2 val z = y.let { it.size } -// ^ definition semanticdb maven . . snapshots/getZ(). +// ^ definition scip-java maven . . snapshots/getZ(). // display_name z // signature_documentation kotlin public get(): Int -// ^ definition semanticdb maven . . snapshots/z. +// ^ definition scip-java maven . . snapshots/z. // display_name z // signature_documentation kotlin public final val z: Int -// ^ reference semanticdb maven . . snapshots/getY(). -// ^ reference semanticdb maven . . snapshots/y. -// ^^^ reference semanticdb maven . . kotlin/let(). +// ^ reference scip-java maven . . snapshots/getY(). +// ^ reference scip-java maven . . snapshots/y. +// ^^^ reference scip-java maven . . kotlin/let(). // ^^^^^^^^^^^ definition local 2 // display_name it // signature_documentation kotlin it: ByteArray // ^^ reference local 2 -// ^^^^ reference semanticdb maven . . kotlin/ByteArray#getSize(). -// ^^^^ reference semanticdb maven . . kotlin/ByteArray#size. -// ⌃ enclosing_range_end semanticdb maven . . snapshots/z. -// ⌃ enclosing_range_end semanticdb maven . . snapshots/getZ(). +// ^^^^ reference scip-java maven . . kotlin/ByteArray#getSize(). +// ^^^^ reference scip-java maven . . kotlin/ByteArray#size. +// ⌃ enclosing_range_end scip-java maven . . snapshots/z. +// ⌃ enclosing_range_end scip-java maven . . snapshots/getZ(). // ⌃ enclosing_range_end local 2 diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt new file mode 100644 index 00000000..914e3253 --- /dev/null +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt @@ -0,0 +1,37 @@ + package snapshots +// ^^^^^^^^^ reference scip-java maven . . snapshots/ + + import java.lang.RuntimeException +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/lang/ +// ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/RuntimeException# + +//⌄ enclosing_range_start scip-java maven . . snapshots/ObjectKt# +//⌄ enclosing_range_start scip-java maven . . snapshots/ObjectKt#``(). + object ObjectKt { +// ^^^^^^^^ definition scip-java maven . . snapshots/ObjectKt# +// display_name ObjectKt +// signature_documentation kotlin public final object ObjectKt : Any +// ^^^^^^^^ definition scip-java maven . . snapshots/ObjectKt#``(). +// display_name ObjectKt +// signature_documentation kotlin private constructor(): ObjectKt +// ⌄ enclosing_range_start scip-java maven . . snapshots/ObjectKt#fail(). +// ⌄ enclosing_range_start scip-java maven . . snapshots/ObjectKt#fail().(message) + fun fail(message: String?): Nothing { +// ^^^^ definition scip-java maven . . snapshots/ObjectKt#fail(). +// display_name fail +// signature_documentation kotlin public final fun fail(message: String?): Nothing +// ^^^^^^^ definition scip-java maven . . snapshots/ObjectKt#fail().(message) +// display_name message +// signature_documentation kotlin message: String? +// ^^^^^^^ reference scip-java maven . . kotlin/String# +// ^^^^^^^ reference scip-java maven . . kotlin/Nothing# +// ⌃ enclosing_range_end scip-java maven . . snapshots/ObjectKt#fail().(message) + throw RuntimeException(message) +// ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/RuntimeException#``(). +// ^^^^^^^ reference scip-java maven . . snapshots/ObjectKt#fail().(message) + } +// ⌃ enclosing_range_end scip-java maven . . snapshots/ObjectKt#fail(). + } +//⌃ enclosing_range_end scip-java maven . . snapshots/ObjectKt# +//⌃ enclosing_range_end scip-java maven . . snapshots/ObjectKt#``(). diff --git a/semanticdb-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java b/scip-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java rename to scip-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java diff --git a/semanticdb-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java b/scip-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java rename to scip-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java diff --git a/semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java b/scip-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java rename to scip-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java diff --git a/semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java b/scip-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java rename to scip-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java diff --git a/semanticdb-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java b/scip-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java rename to scip-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java diff --git a/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt b/scip-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt rename to scip-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt diff --git a/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt b/scip-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt rename to scip-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt diff --git a/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt b/scip-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt rename to scip-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt diff --git a/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt b/scip-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt rename to scip-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt diff --git a/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt b/scip-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt rename to scip-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt diff --git a/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt b/scip-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt rename to scip-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt diff --git a/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt b/scip-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt similarity index 100% rename from semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt rename to scip-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerCheckers.kt b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCheckers.kt similarity index 98% rename from semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerCheckers.kt rename to scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCheckers.kt index dde0c0bb..1d45adcd 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerCheckers.kt +++ b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCheckers.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_kotlinc +package com.sourcegraph.scip_kotlinc import java.nio.file.Path import org.jetbrains.kotlin.* @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.name.FqName open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtension(session) { companion object { - val visitors: MutableMap = mutableMapOf() + val visitors: MutableMap = mutableMapOf() private fun getIdentifier(element: KtSourceElement): KtSourceElement = element @@ -83,7 +83,7 @@ open class AnalyzerCheckers(session: FirSession) : FirAdditionalCheckersExtensio override fun check(declaration: FirFile) { val ktFile = declaration.sourceFile ?: return val lineMap = LineMap(declaration) - val visitor = SemanticdbVisitor(sourceroot, ktFile, lineMap, globals) + val visitor = ScipVisitor(sourceroot, ktFile, lineMap, globals) visitors[ktFile] = visitor } } diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerCommandLineProcessor.kt b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCommandLineProcessor.kt similarity index 92% rename from semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerCommandLineProcessor.kt rename to scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCommandLineProcessor.kt index 4c67ac78..5b0d0b44 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerCommandLineProcessor.kt +++ b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCommandLineProcessor.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_kotlinc +package com.sourcegraph.scip_kotlinc import java.nio.file.Path import java.nio.file.Paths @@ -17,7 +17,7 @@ val KEY_TARGET = CompilerConfigurationKey(VAL_TARGET) @OptIn(ExperimentalCompilerApi::class) class AnalyzerCommandLineProcessor : CommandLineProcessor { - override val pluginId: String = "semanticdb-kotlinc" + override val pluginId: String = "scip-kotlinc" override val pluginOptions: Collection = listOf( CliOption( @@ -28,7 +28,7 @@ class AnalyzerCommandLineProcessor : CommandLineProcessor { CliOption( VAL_TARGET, "", - "the absolute path to the directory where to generate SemanticDB files.", + "the absolute path to the directory where to generate SCIP files.", required = true)) override fun processOption( diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerFirExtensionRegistrar.kt b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerFirExtensionRegistrar.kt similarity index 67% rename from semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerFirExtensionRegistrar.kt rename to scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerFirExtensionRegistrar.kt index b31a10aa..ed045ad1 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerFirExtensionRegistrar.kt +++ b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerFirExtensionRegistrar.kt @@ -1,10 +1,10 @@ -package com.sourcegraph.semanticdb_kotlinc +package com.sourcegraph.scip_kotlinc -import com.sourcegraph.semanticdb.SemanticdbOptions +import com.sourcegraph.scip.ScipOptions import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar class AnalyzerFirExtensionRegistrar( - private val options: SemanticdbOptions, + private val options: ScipOptions, ) : FirExtensionRegistrar() { override fun ExtensionRegistrarContext.configurePlugin() { +AnalyzerParamsProvider.getFactory(options) diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerParamsProvider.kt b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerParamsProvider.kt similarity index 75% rename from semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerParamsProvider.kt rename to scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerParamsProvider.kt index d0e539bd..214fcb01 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerParamsProvider.kt +++ b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerParamsProvider.kt @@ -1,6 +1,6 @@ -package com.sourcegraph.semanticdb_kotlinc +package com.sourcegraph.scip_kotlinc -import com.sourcegraph.semanticdb.SemanticdbOptions +import com.sourcegraph.scip.ScipOptions import java.nio.file.Path import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.extensions.FirExtensionSessionComponent @@ -8,12 +8,12 @@ import org.jetbrains.kotlin.fir.extensions.FirExtensionSessionComponent.Factory open class AnalyzerParamsProvider( session: FirSession, - val options: SemanticdbOptions, + val options: ScipOptions, ) : FirExtensionSessionComponent(session) { val sourceroot: Path get() = options.sourceroot companion object { - fun getFactory(options: SemanticdbOptions): Factory { + fun getFactory(options: ScipOptions): Factory { return Factory { AnalyzerParamsProvider(it, options) } } } diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerRegistrar.kt b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerRegistrar.kt similarity index 89% rename from semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerRegistrar.kt rename to scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerRegistrar.kt index 6d1152c5..9161f05d 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/AnalyzerRegistrar.kt +++ b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerRegistrar.kt @@ -1,6 +1,6 @@ -package com.sourcegraph.semanticdb_kotlinc +package com.sourcegraph.scip_kotlinc -import com.sourcegraph.semanticdb.SemanticdbOptions +import com.sourcegraph.scip.ScipOptions import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi @@ -13,7 +13,7 @@ class AnalyzerRegistrar(private val callback: (Document) -> Unit = {}) : CompilerPluginRegistrar() { override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) { val options = - SemanticdbOptions().apply { + ScipOptions().apply { sourceroot = configuration[KEY_SOURCES]!! targetroot = configuration[KEY_TARGET]!! } diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/LineMap.kt b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/LineMap.kt similarity index 97% rename from semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/LineMap.kt rename to scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/LineMap.kt index 80444a9a..1482a984 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/LineMap.kt +++ b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/LineMap.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_kotlinc +package com.sourcegraph.scip_kotlinc import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.com.intellij.navigation.NavigationItem diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/PostAnalysisExtension.kt b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/PostAnalysisExtension.kt similarity index 91% rename from semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/PostAnalysisExtension.kt rename to scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/PostAnalysisExtension.kt index ec341d0b..9628300d 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/PostAnalysisExtension.kt +++ b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/PostAnalysisExtension.kt @@ -1,7 +1,7 @@ -package com.sourcegraph.semanticdb_kotlinc +package com.sourcegraph.scip_kotlinc -import com.sourcegraph.semanticdb.ScipShardPaths -import com.sourcegraph.semanticdb.ScipShardWriter +import com.sourcegraph.scip.ScipShardPaths +import com.sourcegraph.scip.ScipShardWriter import java.io.PrintWriter import java.io.Writer import java.nio.file.Path @@ -20,7 +20,7 @@ import org.scip_code.scip.Document /** * Writes per-source SCIP shards once the FIR checkers have finished and the IR phase begins. * - *

    For each source file [AnalyzerCheckers] registered a [SemanticdbVisitor] for, this builds the + *

    For each source file [AnalyzerCheckers] registered a [ScipVisitor] for, this builds the * file's [Document] and serializes it under `/META-INF/scip/.scip`. * Files outside the source root are skipped with a stderr warning. */ @@ -78,7 +78,7 @@ class PostAnalysisExtension( } }, false) - writer.println("Exception in semanticdb-kotlin compiler plugin:") + writer.println("Exception in scip-kotlin compiler plugin:") e.printStackTrace(writer) writer.println( "Please report a bug to https://github.com/sourcegraph/scip-kotlin with the stack trace above.") diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbSymbols.kt b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipSymbols.kt similarity index 85% rename from semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbSymbols.kt rename to scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipSymbols.kt index 74d7fc51..cbc73a75 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbSymbols.kt +++ b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipSymbols.kt @@ -1,6 +1,6 @@ -package com.sourcegraph.semanticdb_kotlinc +package com.sourcegraph.scip_kotlinc -import com.sourcegraph.semanticdb.SemanticdbSymbols as SharedSymbols +import com.sourcegraph.scip.ScipSymbols as SharedSymbols @JvmInline value class Symbol(private val symbol: String) { @@ -12,9 +12,9 @@ value class Symbol(private val symbol: String) { // `desc == NONE` — Java returns `NONE`, Kotlin returns the owner. // SymbolsCache relies on this behavior; do not delegate without first // updating those call sites. - fun createGlobal(owner: Symbol, desc: SemanticdbSymbolDescriptor): Symbol = + fun createGlobal(owner: Symbol, desc: ScipSymbolDescriptor): Symbol = when { - desc == SemanticdbSymbolDescriptor.NONE -> owner + desc == ScipSymbolDescriptor.NONE -> owner owner != ROOT_PACKAGE -> Symbol(owner.symbol + desc.encode().symbol) else -> desc.encode() } @@ -31,7 +31,7 @@ value class Symbol(private val symbol: String) { fun String.symbol(): Symbol = Symbol(this) -data class SemanticdbSymbolDescriptor( +data class ScipSymbolDescriptor( val kind: Kind, val name: String, // Default differs from `SharedSymbols.Descriptor` (which is "") because @@ -40,7 +40,7 @@ data class SemanticdbSymbolDescriptor( val disambiguator: String = "()" ) { companion object { - val NONE = SemanticdbSymbolDescriptor(Kind.NONE, "") + val NONE = ScipSymbolDescriptor(Kind.NONE, "") } enum class Kind { diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbTextDocumentBuilder.kt b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipTextDocumentBuilder.kt similarity index 97% rename from semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbTextDocumentBuilder.kt rename to scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipTextDocumentBuilder.kt index 9e30d40b..fb118b4b 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbTextDocumentBuilder.kt +++ b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipTextDocumentBuilder.kt @@ -1,7 +1,7 @@ -package com.sourcegraph.semanticdb_kotlinc +package com.sourcegraph.scip_kotlinc -import com.sourcegraph.semanticdb.ScipDocumentBuilder -import com.sourcegraph.semanticdb.ScipShardPaths +import com.sourcegraph.scip.ScipDocumentBuilder +import com.sourcegraph.scip.ScipShardPaths import java.nio.file.Path import java.nio.file.Paths import org.jetbrains.kotlin.KtSourceElement @@ -28,7 +28,7 @@ import org.scip_code.scip.signature import org.scip_code.scip.symbolInformation /** Builds a SCIP [Document] for a single Kotlin source file. */ -class SemanticdbTextDocumentBuilder( +class ScipTextDocumentBuilder( private val sourceroot: Path, private val file: KtSourceFile, private val lineMap: LineMap, @@ -40,7 +40,7 @@ class SemanticdbTextDocumentBuilder( fun build(): Document = documentBuilder.build("kotlin", relativePath(), fileText) - fun emitSemanticdbData( + fun emitScipData( firBasedSymbol: FirBasedSymbol<*>?, symbol: Symbol, element: KtSourceElement, diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbVisitor.kt b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipVisitor.kt similarity index 94% rename from semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbVisitor.kt rename to scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipVisitor.kt index e9ae2c60..be88d433 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbVisitor.kt +++ b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipVisitor.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_kotlinc +package com.sourcegraph.scip_kotlinc import java.nio.file.Path import org.jetbrains.kotlin.KtSourceElement @@ -17,7 +17,7 @@ import org.scip_code.scip.Document * [AnalyzerCheckers] call into this and the resulting [Document] is written as a * `.scip` shard at the end of compilation. */ -class SemanticdbVisitor( +class ScipVisitor( sourceroot: Path, file: KtSourceFile, lineMap: LineMap, @@ -25,7 +25,7 @@ class SemanticdbVisitor( locals: LocalSymbolsCache = LocalSymbolsCache() ) { private val cache = SymbolsCache(globals, locals) - private val documentBuilder = SemanticdbTextDocumentBuilder(sourceroot, file, lineMap, cache) + private val documentBuilder = ScipTextDocumentBuilder(sourceroot, file, lineMap, cache) private data class SymbolDescriptorPair( val firBasedSymbol: FirBasedSymbol<*>?, @@ -41,7 +41,7 @@ class SemanticdbVisitor( enclosingSource: KtSourceElement? = null, ): List? = this?.onEach { (firBasedSymbol, symbol) -> - documentBuilder.emitSemanticdbData(firBasedSymbol, symbol, element, isDefinition, context, enclosingSource) + documentBuilder.emitScipData(firBasedSymbol, symbol, element, isDefinition, context, enclosingSource) } ?.map { it.symbol } ?.toList() diff --git a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/SymbolsCache.kt similarity index 86% rename from semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt rename to scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/SymbolsCache.kt index f9778369..c502954a 100644 --- a/semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SymbolsCache.kt +++ b/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/SymbolsCache.kt @@ -1,7 +1,7 @@ -package com.sourcegraph.semanticdb_kotlinc +package com.sourcegraph.scip_kotlinc -import com.sourcegraph.semanticdb.LocalSymbolsCache as SharedLocalSymbolsCache -import com.sourcegraph.semanticdb_kotlinc.SemanticdbSymbolDescriptor.Kind +import com.sourcegraph.scip.LocalSymbolsCache as SharedLocalSymbolsCache +import com.sourcegraph.scip_kotlinc.ScipSymbolDescriptor.Kind import java.lang.System.err import org.jetbrains.kotlin.fir.analysis.checkers.declaration.isLocalMember import org.jetbrains.kotlin.fir.analysis.checkers.getContainingSymbol @@ -90,9 +90,9 @@ class GlobalSymbolsCache(testing: Boolean = false) : Iterable { if (owner.isLocal() || owner == Symbol.NONE) return locals + symbol - val semanticdbDescriptor = semanticdbDescriptor(symbol) + val scipDescriptor = scipDescriptor(symbol) - return Symbol.createGlobal(owner, semanticdbDescriptor) + return Symbol.createGlobal(owner, scipDescriptor) } private fun uncachedSymbol(symbol: FqName): Symbol { @@ -100,7 +100,7 @@ class GlobalSymbolsCache(testing: Boolean = false) : Iterable { val owner = this.getSymbol(symbol.parent()) return Symbol.createGlobal( - owner, SemanticdbSymbolDescriptor(Kind.PACKAGE, symbol.shortName().asString())) + owner, ScipSymbolDescriptor(Kind.PACKAGE, symbol.shortName().asString())) } /** @@ -134,36 +134,36 @@ class GlobalSymbolsCache(testing: Boolean = false) : Iterable { } @OptIn(SymbolInternals::class) - private fun semanticdbDescriptor(symbol: FirBasedSymbol<*>): SemanticdbSymbolDescriptor { + private fun scipDescriptor(symbol: FirBasedSymbol<*>): ScipSymbolDescriptor { return when { symbol is FirAnonymousObjectSymbol -> symbol.source?.let { source -> - SemanticdbSymbolDescriptor(Kind.TYPE, "") - } ?: SemanticdbSymbolDescriptor.NONE + ScipSymbolDescriptor(Kind.TYPE, "") + } ?: ScipSymbolDescriptor.NONE symbol is FirClassLikeSymbol -> - SemanticdbSymbolDescriptor(Kind.TYPE, symbol.classId.shortClassName.asString()) + ScipSymbolDescriptor(Kind.TYPE, symbol.classId.shortClassName.asString()) symbol is FirPropertyAccessorSymbol && symbol.isSetter -> - SemanticdbSymbolDescriptor( + ScipSymbolDescriptor( Kind.METHOD, "set" + symbol.propertySymbol.fir.name.toString().capitalizeAsciiOnly()) symbol is FirPropertyAccessorSymbol && symbol.isGetter -> - SemanticdbSymbolDescriptor( + ScipSymbolDescriptor( Kind.METHOD, "get" + symbol.propertySymbol.fir.name.toString().capitalizeAsciiOnly()) symbol is FirConstructorSymbol -> - SemanticdbSymbolDescriptor(Kind.METHOD, "", methodDisambiguator(symbol)) + ScipSymbolDescriptor(Kind.METHOD, "", methodDisambiguator(symbol)) symbol is FirFunctionSymbol -> - SemanticdbSymbolDescriptor( + ScipSymbolDescriptor( Kind.METHOD, symbol.name.toString(), methodDisambiguator(symbol)) symbol is FirTypeParameterSymbol -> - SemanticdbSymbolDescriptor(Kind.TYPE_PARAMETER, symbol.name.toString()) + ScipSymbolDescriptor(Kind.TYPE_PARAMETER, symbol.name.toString()) symbol is FirValueParameterSymbol -> - SemanticdbSymbolDescriptor(Kind.PARAMETER, symbol.name.toString()) + ScipSymbolDescriptor(Kind.PARAMETER, symbol.name.toString()) symbol is FirVariableSymbol -> - SemanticdbSymbolDescriptor(Kind.TERM, symbol.name.toString()) + ScipSymbolDescriptor(Kind.TERM, symbol.name.toString()) else -> { err.println("unknown symbol kind ${symbol.javaClass.simpleName}") - SemanticdbSymbolDescriptor.NONE + ScipSymbolDescriptor.NONE } } } diff --git a/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor b/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor new file mode 100644 index 00000000..3f4c9962 --- /dev/null +++ b/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor @@ -0,0 +1 @@ +com.sourcegraph.scip_kotlinc.AnalyzerCommandLineProcessor diff --git a/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar b/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar new file mode 100644 index 00000000..b55fc313 --- /dev/null +++ b/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar @@ -0,0 +1 @@ +com.sourcegraph.scip_kotlinc.AnalyzerRegistrar \ No newline at end of file diff --git a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/AnalyzerTest.kt b/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/AnalyzerTest.kt similarity index 97% rename from semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/AnalyzerTest.kt rename to scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/AnalyzerTest.kt index 69ea85a3..952069fb 100644 --- a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/AnalyzerTest.kt +++ b/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/AnalyzerTest.kt @@ -1,6 +1,6 @@ -package com.sourcegraph.semanticdb_kotlinc.test +package com.sourcegraph.scip_kotlinc.test -import com.sourcegraph.semanticdb_kotlinc.* +import com.sourcegraph.scip_kotlinc.* import com.tschuchort.compiletesting.KotlinCompilation import com.tschuchort.compiletesting.PluginOption import com.tschuchort.compiletesting.SourceFile @@ -24,7 +24,7 @@ import org.scip_code.scip.SymbolInformation @OptIn(ExperimentalCompilerApi::class) class AnalyzerTest { - fun compileSemanticdb(path: Path, @Language("kotlin") code: String): Document { + fun compileScip(path: Path, @Language("kotlin") code: String): Document { val buildPath = File(path.resolve("build").toString()).apply { mkdir() } val source = SourceFile.testKt(code) lateinit var document: Document @@ -37,8 +37,8 @@ class AnalyzerTest { verbose = false pluginOptions = listOf( - PluginOption("semanticdb-kotlinc", "sourceroot", path.toString()), - PluginOption("semanticdb-kotlinc", "targetroot", buildPath.toString()) + PluginOption("scip-kotlinc", "sourceroot", path.toString()), + PluginOption("scip-kotlinc", "targetroot", buildPath.toString()) ) commandLineProcessors = listOf(AnalyzerCommandLineProcessor()) workingDir = path.toFile() @@ -53,7 +53,7 @@ class AnalyzerTest { @Test fun `basic test`(@TempDir path: Path) { val document = - compileSemanticdb( + compileScip( path, """ package sample @@ -127,7 +127,7 @@ class AnalyzerTest { @Test fun imports(@TempDir path: Path) { val document = - compileSemanticdb( + compileScip( path, """ package sample @@ -198,7 +198,7 @@ class AnalyzerTest { @Test fun `local classes`(@TempDir path: Path) { val document = - compileSemanticdb( + compileScip( path, """ package sample @@ -313,7 +313,7 @@ class AnalyzerTest { @Test fun overrides(@TempDir path: Path) { val document = - compileSemanticdb( + compileScip( path, """ package sample @@ -448,7 +448,7 @@ class AnalyzerTest { @Test fun `anonymous object`(@TempDir path: Path) { val document = - compileSemanticdb( + compileScip( path, """ package sample @@ -670,7 +670,7 @@ class AnalyzerTest { @Test fun `function return type`(@TempDir path: Path) { val document = - compileSemanticdb( + compileScip( path, """ package sample @@ -741,7 +741,7 @@ class AnalyzerTest { @Test fun `type operators`(@TempDir path: Path) { val document = - compileSemanticdb( + compileScip( path, """ package sample @@ -794,8 +794,8 @@ class AnalyzerTest { verbose = false pluginOptions = listOf( - PluginOption("semanticdb-kotlinc", "sourceroot", path.toString()), - PluginOption("semanticdb-kotlinc", "targetroot", buildPath.toString()) + PluginOption("scip-kotlinc", "sourceroot", path.toString()), + PluginOption("scip-kotlinc", "targetroot", buildPath.toString()) ) commandLineProcessors = listOf(AnalyzerCommandLineProcessor()) workingDir = path.toFile() @@ -1233,8 +1233,8 @@ class AnalyzerTest { verbose = false pluginOptions = listOf( - PluginOption("semanticdb-kotlinc", "sourceroot", path.toString()), - PluginOption("semanticdb-kotlinc", "targetroot", buildPath.toString()) + PluginOption("scip-kotlinc", "sourceroot", path.toString()), + PluginOption("scip-kotlinc", "targetroot", buildPath.toString()) ) commandLineProcessors = listOf(AnalyzerCommandLineProcessor()) workingDir = path.toFile() @@ -1248,7 +1248,7 @@ class AnalyzerTest { @Test fun `compound package name semicolon test`(@TempDir path: Path) { val document = - compileSemanticdb( + compileScip( path, """ package hello.sample; class Apple @@ -1328,7 +1328,7 @@ class AnalyzerTest { @Test fun `simple package name semicolon test`(@TempDir path: Path) { val document = - compileSemanticdb( + compileScip( path, """ package sample; @@ -1418,7 +1418,7 @@ class AnalyzerTest { @Test fun documentation(@TempDir path: Path) { val document = - compileSemanticdb( + compileScip( path, """ package sample diff --git a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/ScipBuilders.kt b/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipBuilders.kt similarity index 96% rename from semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/ScipBuilders.kt rename to scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipBuilders.kt index 0b5fea89..55755d7d 100644 --- a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/ScipBuilders.kt +++ b/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipBuilders.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb_kotlinc.test +package com.sourcegraph.scip_kotlinc.test import org.scip_code.scip.Occurrence import org.scip_code.scip.SymbolInformation @@ -10,7 +10,7 @@ import org.scip_code.scip.symbolInformation /** * Tiny DSL for building SCIP [Occurrence] / [SymbolInformation] test fixtures with the same shape - * as the original SemanticDB-based one used by the Kotlin tests. + * as the original SCIP-based one used by the Kotlin tests. * *

    Example: * ``` @@ -82,7 +82,7 @@ class ScipSymbolInformationBuilder { } /** - * Appends an `is_implementation` [Relationship]. Mirrors the old SemanticDB-flavored + * Appends an `is_implementation` [Relationship]. Mirrors the old SCIP-flavored * `addOverriddenSymbols` so existing test fixtures port over with minimal diff. */ fun addOverriddenSymbols(vararg symbols: String) { diff --git a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/SemanticdbSymbolsTest.kt b/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipSymbolsTest.kt similarity index 99% rename from semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/SemanticdbSymbolsTest.kt rename to scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipSymbolsTest.kt index afea0b39..8ef20aad 100644 --- a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/SemanticdbSymbolsTest.kt +++ b/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipSymbolsTest.kt @@ -1,8 +1,8 @@ -package com.sourcegraph.semanticdb_kotlinc.test +package com.sourcegraph.scip_kotlinc.test -import com.sourcegraph.semanticdb_kotlinc.* -import com.sourcegraph.semanticdb_kotlinc.test.ExpectedSymbols.ScipData -import com.sourcegraph.semanticdb_kotlinc.test.ExpectedSymbols.SymbolCacheData +import com.sourcegraph.scip_kotlinc.* +import com.sourcegraph.scip_kotlinc.test.ExpectedSymbols.ScipData +import com.sourcegraph.scip_kotlinc.test.ExpectedSymbols.SymbolCacheData import com.tschuchort.compiletesting.SourceFile import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi import org.junit.jupiter.api.TestFactory @@ -10,7 +10,7 @@ import org.scip_code.scip.Occurrence import org.scip_code.scip.SymbolInformation @ExperimentalCompilerApi -class SemanticdbSymbolsTest { +class ScipSymbolsTest { @TestFactory fun `method disambiguator`() = listOf( diff --git a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/Utils.kt b/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/Utils.kt similarity index 93% rename from semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/Utils.kt rename to scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/Utils.kt index 6173c089..57bc98db 100644 --- a/semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/Utils.kt +++ b/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/Utils.kt @@ -1,8 +1,8 @@ -package com.sourcegraph.semanticdb_kotlinc.test +package com.sourcegraph.scip_kotlinc.test -import com.sourcegraph.semanticdb.SemanticdbOptions -import com.sourcegraph.semanticdb_kotlinc.* -import com.sourcegraph.semanticdb_kotlinc.AnalyzerCheckers.Companion.visitors +import com.sourcegraph.scip.ScipOptions +import com.sourcegraph.scip_kotlinc.* +import com.sourcegraph.scip_kotlinc.AnalyzerCheckers.Companion.visitors import com.tschuchort.compiletesting.KotlinCompilation import com.tschuchort.compiletesting.SourceFile import io.kotest.assertions.assertSoftly @@ -118,7 +118,7 @@ private fun configureTestCompiler( verbose = false } - val analyzer = semanticdbVisitorAnalyzer(globals, locals, compilation.workingDir.toPath(), hook) + val analyzer = scipVisitorAnalyzer(globals, locals, compilation.workingDir.toPath(), hook) compilation.apply { compilerPluginRegistrars = listOf(analyzer) } return compilation } @@ -135,7 +135,7 @@ private class TestAnalyzerDeclarationCheckers( override fun check(declaration: FirFile) { val ktFile = declaration.sourceFile ?: return val lineMap = LineMap(declaration) - val visitor = SemanticdbVisitor(sourceRoot, ktFile, lineMap, globals, locals) + val visitor = ScipVisitor(sourceRoot, ktFile, lineMap, globals, locals) visitors[ktFile] = visitor } }, @@ -157,7 +157,7 @@ class TestAnalyzerParamsProvider( var globals: GlobalSymbolsCache, var locals: LocalSymbolsCache, sourceroot: Path, -) : AnalyzerParamsProvider(session, SemanticdbOptions().apply { this.sourceroot = sourceroot }) { +) : AnalyzerParamsProvider(session, ScipOptions().apply { this.sourceroot = sourceroot }) { companion object { fun getFactory( globals: GlobalSymbolsCache, @@ -173,7 +173,7 @@ val FirSession.testAnalyzerParamsProvider: TestAnalyzerParamsProvider by FirSess .sessionComponentAccessor() @OptIn(ExperimentalCompilerApi::class) -fun semanticdbVisitorAnalyzer( +fun scipVisitorAnalyzer( globals: GlobalSymbolsCache, locals: LocalSymbolsCache, sourceroot: Path, diff --git a/semanticdb-shared/BUILD b/scip-shared/BUILD similarity index 91% rename from semanticdb-shared/BUILD rename to scip-shared/BUILD index 58c22abe..7e53ed32 100644 --- a/semanticdb-shared/BUILD +++ b/scip-shared/BUILD @@ -5,7 +5,7 @@ package( ) java_library( - name = "semanticdb-shared", + name = "scip-shared", srcs = glob(["src/main/java/**/*.java"]), exports = [ "@maven//:org_scip_code_scip_java_bindings", diff --git a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/LocalSymbolsCache.java b/scip-shared/src/main/java/com/sourcegraph/scip/LocalSymbolsCache.java similarity index 90% rename from semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/LocalSymbolsCache.java rename to scip-shared/src/main/java/com/sourcegraph/scip/LocalSymbolsCache.java index ee958752..2fb37693 100644 --- a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/LocalSymbolsCache.java +++ b/scip-shared/src/main/java/com/sourcegraph/scip/LocalSymbolsCache.java @@ -1,9 +1,9 @@ -package com.sourcegraph.semanticdb; +package com.sourcegraph.scip; import java.util.Map; import java.util.function.IntFunction; -/** Per-file cache mapping compiler symbols to monotonically numbered SemanticDB local symbols. */ +/** Per-file cache mapping compiler symbols to monotonically numbered SCIP local symbols. */ public final class LocalSymbolsCache { private final Map symbols; private final IntFunction factory; diff --git a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/NoRelativePathMode.java b/scip-shared/src/main/java/com/sourcegraph/scip/NoRelativePathMode.java similarity index 73% rename from semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/NoRelativePathMode.java rename to scip-shared/src/main/java/com/sourcegraph/scip/NoRelativePathMode.java index 4e6341be..a92e95fe 100644 --- a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/NoRelativePathMode.java +++ b/scip-shared/src/main/java/com/sourcegraph/scip/NoRelativePathMode.java @@ -1,21 +1,21 @@ -package com.sourcegraph.semanticdb; +package com.sourcegraph.scip; import java.util.Arrays; import java.util.stream.Collectors; /** - * Configuration options to determine how semanticdb-javac should handle files that have no good - * relative paths. + * Configuration options to determine how scip-javac should handle files that have no good relative + * paths. * - *

    When indexing a file at an absolute path /project/src/main/example/Foo.java, SemanticDB needs - * to know the "sourceroot" path /project in order to relativize the path of the source file into + *

    When indexing a file at an absolute path /project/src/main/example/Foo.java, SCIP needs to + * know the "sourceroot" path /project in order to relativize the path of the source file into * src/main/example/Foo.java. This configuration option determines what the compiler plugin should * do when it's not able to find a good relative path. */ public enum NoRelativePathMode { /** - * Come up with a unique relative path for the SemanticDB path with no guarantee that this path + * Come up with a unique relative path for the SCIP path with no guarantee that this path * corresponds to the original path of the generated source file. */ INDEX_ANYWAY, diff --git a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/ScipDocumentBuilder.java b/scip-shared/src/main/java/com/sourcegraph/scip/ScipDocumentBuilder.java similarity index 98% rename from semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/ScipDocumentBuilder.java rename to scip-shared/src/main/java/com/sourcegraph/scip/ScipDocumentBuilder.java index fc88024f..e20d9d7c 100644 --- a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/ScipDocumentBuilder.java +++ b/scip-shared/src/main/java/com/sourcegraph/scip/ScipDocumentBuilder.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb; +package com.sourcegraph.scip; import java.util.ArrayList; import java.util.Collections; diff --git a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/SemanticdbOptions.java b/scip-shared/src/main/java/com/sourcegraph/scip/ScipOptions.java similarity index 63% rename from semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/SemanticdbOptions.java rename to scip-shared/src/main/java/com/sourcegraph/scip/ScipOptions.java index a59aa978..1d82b9a5 100644 --- a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/SemanticdbOptions.java +++ b/scip-shared/src/main/java/com/sourcegraph/scip/ScipOptions.java @@ -1,9 +1,9 @@ -package com.sourcegraph.semanticdb; +package com.sourcegraph.scip; import java.nio.file.Path; -/** Settings shared between all SemanticDB-emitting compiler plugins. */ -public class SemanticdbOptions { +/** Settings shared between all SCIP-emitting compiler plugins. */ +public class ScipOptions { public Path sourceroot; public Path targetroot; public boolean includeText = false; diff --git a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/ScipShardPaths.java b/scip-shared/src/main/java/com/sourcegraph/scip/ScipShardPaths.java similarity index 94% rename from semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/ScipShardPaths.java rename to scip-shared/src/main/java/com/sourcegraph/scip/ScipShardPaths.java index 6b11fb12..bf8742e0 100644 --- a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/ScipShardPaths.java +++ b/scip-shared/src/main/java/com/sourcegraph/scip/ScipShardPaths.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb; +package com.sourcegraph.scip; import java.nio.file.Path; import java.util.Iterator; @@ -9,8 +9,8 @@ * *

    Every compiler plugin writes one SCIP shard per source file under {@code * /META-INF/scip/.scip} and labels documents with a unix-style - * {@code }. Both {@code semanticdb-javac} and {@code semanticdb-kotlinc} - * share this layout. + * {@code }. Both {@code scip-javac} and {@code scip-kotlinc} share this + * layout. * *

    Plugin-specific behavior for files that are not under the sourceroot (e.g. javac's * {@code NoRelativePathMode} fallbacks or kotlinc's "skip with warning") stays in the plugins; this diff --git a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/ScipShardWriter.java b/scip-shared/src/main/java/com/sourcegraph/scip/ScipShardWriter.java similarity index 95% rename from semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/ScipShardWriter.java rename to scip-shared/src/main/java/com/sourcegraph/scip/ScipShardWriter.java index c258a38f..47c4ffee 100644 --- a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/ScipShardWriter.java +++ b/scip-shared/src/main/java/com/sourcegraph/scip/ScipShardWriter.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb; +package com.sourcegraph.scip; import java.io.IOException; import java.nio.file.Files; diff --git a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/SemanticdbSymbols.java b/scip-shared/src/main/java/com/sourcegraph/scip/ScipSymbols.java similarity index 92% rename from semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/SemanticdbSymbols.java rename to scip-shared/src/main/java/com/sourcegraph/scip/ScipSymbols.java index c88d5932..1cf3bd55 100644 --- a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/SemanticdbSymbols.java +++ b/scip-shared/src/main/java/com/sourcegraph/scip/ScipSymbols.java @@ -1,22 +1,22 @@ -package com.sourcegraph.semanticdb; +package com.sourcegraph.scip; import java.util.Objects; /** - * Utilities to construct SemanticDB symbols. + * Utilities to construct SCIP symbols. * *

    Most parts of this file have been adapted from the companion Scala implementation: * *

    https://github.com/scalameta/scalameta/blob/cf796cf2436b40494baf2bdc266623dc65264ad5/semanticdb/semanticdb/src/main/scala/scala/meta/internal/semanticdb/Scala.scala */ -public final class SemanticdbSymbols { +public final class ScipSymbols { public static String NONE = ""; public static String ROOT_PACKAGE = "_root_/"; - /** Creates a new global SemanticDB symbol. */ + /** Creates a new global SCIP symbol. */ public static String global(String owner, Descriptor desc) { - if (desc == Descriptor.NONE) return SemanticdbSymbols.NONE; + if (desc == Descriptor.NONE) return ScipSymbols.NONE; else if (!ROOT_PACKAGE.equals(owner)) return owner + desc.encode(); else return desc.encode(); } @@ -42,7 +42,7 @@ public static boolean isMethodOrField(String symbol) { } /** - * A SemanticDB symbol is composed from a list of "descriptors". + * A SCIP symbol is composed from a list of "descriptors". * *

    For example, the symbol "com/example/Class#method()." is composed of * @@ -143,7 +143,7 @@ public String encode() { } } - /** Wraps non-alphanumeric identifiers in backticks, according to the SemanticDB spec. */ + /** Wraps non-alphanumeric identifiers in backticks, according to the SCIP spec. */ private static String encodeName(String name) { if (name == null || name.isEmpty()) return "``"; boolean isStartOk = Character.isJavaIdentifierStart(name.charAt(0)); diff --git a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/UriScheme.java b/scip-shared/src/main/java/com/sourcegraph/scip/UriScheme.java similarity index 56% rename from semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/UriScheme.java rename to scip-shared/src/main/java/com/sourcegraph/scip/UriScheme.java index 992e227f..ad1fb1e3 100644 --- a/semanticdb-shared/src/main/java/com/sourcegraph/semanticdb/UriScheme.java +++ b/scip-shared/src/main/java/com/sourcegraph/scip/UriScheme.java @@ -1,4 +1,4 @@ -package com.sourcegraph.semanticdb; +package com.sourcegraph.scip; public enum UriScheme { DEFAULT, 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 deleted file mode 100644 index 4aa782bd..00000000 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.sourcegraph.semanticdb_javac; - -import com.sun.source.util.Plugin; -import com.sun.source.util.JavacTask; -import com.sun.source.util.Trees; - -/** 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"; - } - - @Override - public void init(JavacTask task, String... args) { - Trees trees = Trees.instance(task); - SemanticdbReporter reporter = new SemanticdbReporter(trees); - SemanticdbJavacOptions options = SemanticdbJavacOptions.parse(args, task); - GlobalSymbolsCache globals = new GlobalSymbolsCache(options); - task.addTaskListener(new SemanticdbTaskListener(options, task, trees, globals, reporter)); - } -} diff --git a/semanticdb-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin b/semanticdb-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin deleted file mode 100644 index c1db4d58..00000000 --- a/semanticdb-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin +++ /dev/null @@ -1 +0,0 @@ -com.sourcegraph.semanticdb_javac.SemanticdbPlugin \ No newline at end of file diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java b/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java deleted file mode 100644 index 299966fd..00000000 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/ClassConsumer.java +++ /dev/null @@ -1,28 +0,0 @@ - package snapshots; - -//⌄ enclosing_range_start semanticdb maven . . snapshots/ClassConsumer# - public class ClassConsumer { -// ^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/ClassConsumer# -// display_name ClassConsumer -// signature_documentation java public class ClassConsumer -// kind Class -// ^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/ClassConsumer#``(). -// display_name -// signature_documentation java public ClassConsumer() -// kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . snapshots/ClassConsumer#run(). - public static void run() { -// ^^^ definition semanticdb maven . . snapshots/ClassConsumer#run(). -// display_name run -// signature_documentation java public static void run() -// kind StaticMethod - System.out.println(new Class().getAsdf()); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+9). -// ^^^^^ reference semanticdb maven . . snapshots/Class#``(+1). -// ^^^^^^^ reference semanticdb maven . . snapshots/Class#getAsdf(). - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/ClassConsumer#run(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/ClassConsumer# diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java b/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java deleted file mode 100644 index 6708477b..00000000 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java +++ /dev/null @@ -1,25 +0,0 @@ - package snapshots; - -//⌄ enclosing_range_start semanticdb maven . . snapshots/CompanionConsumer# - public class CompanionConsumer { -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/CompanionConsumer# -// display_name CompanionConsumer -// signature_documentation java public class CompanionConsumer -// kind Class -// ⌄ enclosing_range_start semanticdb maven . . snapshots/CompanionConsumer#``(). - CompanionConsumer() { -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/CompanionConsumer#``(). -// display_name -// signature_documentation java CompanionConsumer() -// kind Constructor - CompanionOwner.Companion.create(); -// ^^^^^^^^^^^^^^ reference semanticdb maven . . snapshots/CompanionOwner# -// ^^^^^^^^^ reference semanticdb maven . . snapshots/CompanionOwner#Companion. -// ^^^^^^ reference semanticdb maven . . snapshots/CompanionOwner#Companion#create(). - new CompanionOwner().create(); -// ^^^^^^^^^^^^^^ reference semanticdb maven . . snapshots/CompanionOwner#``(). -// ^^^^^^ reference semanticdb maven . . snapshots/CompanionOwner#create(). - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/CompanionConsumer#``(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/CompanionConsumer# diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java b/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java deleted file mode 100644 index 82ea72ed..00000000 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java +++ /dev/null @@ -1,45 +0,0 @@ - package snapshots; - -//⌄ enclosing_range_start semanticdb maven . . snapshots/KotlinClass# - public class KotlinClass { -// ^^^^^^^^^^^ definition semanticdb maven . . snapshots/KotlinClass# -// display_name KotlinClass -// signature_documentation java public class KotlinClass -// kind Class -// ⌄ enclosing_range_start semanticdb maven . . snapshots/KotlinClass#``(). - KotlinClass() throws Class { -// ^^^^^^^^^^^ definition semanticdb maven . . snapshots/KotlinClass#``(). -// display_name -// signature_documentation java KotlinClass() throws Class -// kind Constructor -// ^^^^^ reference semanticdb maven . . snapshots/Class# - throw new Class(); -// ^^^^^ reference semanticdb maven . . snapshots/Class#``(+1). - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/KotlinClass#``(). - -// ⌄ enclosing_range_start semanticdb maven . . snapshots/KotlinClass#test(). - void test() throws Class { -// ^^^^ definition semanticdb maven . . snapshots/KotlinClass#test(). -// display_name test -// signature_documentation java void test() throws Class -// kind Method -// ^^^^^ reference semanticdb maven . . snapshots/Class# - throw new Class(1, ""); -// ^^^^^ reference semanticdb maven . . snapshots/Class#``(). - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/KotlinClass#test(). - -// ⌄ enclosing_range_start semanticdb maven . . snapshots/KotlinClass#other(). - void other() throws Class { -// ^^^^^ definition semanticdb maven . . snapshots/KotlinClass#other(). -// display_name other -// signature_documentation java void other() throws Class -// kind Method -// ^^^^^ reference semanticdb maven . . snapshots/Class# - throw new Class(1); -// ^^^^^ reference semanticdb maven . . snapshots/Class#``(+2). - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/KotlinClass#other(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/KotlinClass# diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java b/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java deleted file mode 100644 index 4a57bc1d..00000000 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java +++ /dev/null @@ -1,43 +0,0 @@ - package snapshots; - - import kotlin.collections.CollectionsKt; -// ^^^^^^ reference semanticdb maven . . kotlin/ -// ^^^^^^^^^^^ reference semanticdb maven . . kotlin/collections/ -// ^^^^^^^^^^^^^ reference semanticdb maven . . kotlin/collections/CollectionsKt# - import kotlin.text.StringsKt; -// ^^^^^^ reference semanticdb maven . . kotlin/ -// ^^^^ reference semanticdb maven . . kotlin/text/ -// ^^^^^^^^^ reference semanticdb maven . . kotlin/text/StringsKt# - -//⌄ enclosing_range_start semanticdb maven . . snapshots/KotlinLambdas# - public class KotlinLambdas { -// ^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/KotlinLambdas# -// display_name KotlinLambdas -// signature_documentation java public class KotlinLambdas -// kind Class -// ^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/KotlinLambdas#``(). -// display_name -// signature_documentation java public KotlinLambdas() -// kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . snapshots/KotlinLambdas#test(). - public void test() { -// ^^^^ definition semanticdb maven . . snapshots/KotlinLambdas#test(). -// display_name test -// signature_documentation java public void test() -// kind Method - LambdasKt.getX(); // TODO figure out emit getX on kotlin side -// ^^^^^^^^^ reference semanticdb maven . . snapshots/LambdasKt# -// ^^^^ reference semanticdb maven . . snapshots/LambdasKt#getX(). - - kotlin.collections.CollectionsKt.listOf(); -// ^^^^^^ reference semanticdb maven . . kotlin/ -// ^^^^^^^^^^^ reference semanticdb maven . . kotlin/collections/ -// ^^^^^^^^^^^^^ reference semanticdb maven . . kotlin/collections/CollectionsKt# -// ^^^^^^ reference semanticdb maven . . kotlin/collections/CollectionsKt__CollectionsKt#listOf(). - FunctionsKt.sampleText(""); -// ^^^^^^^^^^^ reference semanticdb maven . . snapshots/FunctionsKt# -// ^^^^^^^^^^ reference semanticdb maven . . snapshots/FunctionsKt#sampleText(). - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/KotlinLambdas#test(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/KotlinLambdas# diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java b/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java deleted file mode 100644 index 8bbb5460..00000000 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java +++ /dev/null @@ -1,26 +0,0 @@ - package snapshots; - -//⌄ enclosing_range_start semanticdb maven . . snapshots/ObjectKtConsumer# - public class ObjectKtConsumer { -// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/ObjectKtConsumer# -// display_name ObjectKtConsumer -// signature_documentation java public class ObjectKtConsumer -// kind Class -// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/ObjectKtConsumer#``(). -// display_name -// signature_documentation java public ObjectKtConsumer() -// kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . snapshots/ObjectKtConsumer#run(). - public static void run() { -// ^^^ definition semanticdb maven . . snapshots/ObjectKtConsumer#run(). -// display_name run -// signature_documentation java public static void run() -// kind StaticMethod - ObjectKt.INSTANCE.fail("boom"); -// ^^^^^^^^ reference semanticdb maven . . snapshots/ObjectKt# -// ^^^^^^^^ reference semanticdb maven . . snapshots/ObjectKt#INSTANCE. -// ^^^^ reference semanticdb maven . . snapshots/ObjectKt#fail(). - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/ObjectKtConsumer#run(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/ObjectKtConsumer# diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt b/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt deleted file mode 100644 index ee0428e9..00000000 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Class.kt +++ /dev/null @@ -1,129 +0,0 @@ - package snapshots -// ^^^^^^^^^ reference semanticdb maven . . snapshots/ - -//⌄ enclosing_range_start semanticdb maven . . snapshots/Class# -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#``(). -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#``().(banana) -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#banana. -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#getBanana(). -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#setBanana(). -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#setBanana().(value) -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#``().(apple) - class Class constructor(private var banana: Int, apple: String) : -// ^^^^^ definition semanticdb maven . . snapshots/Class# -// display_name Class -// signature_documentation kotlin public final class Class : Throwable -// relationship is_implementation semanticdb maven . . kotlin/Throwable# -// ^^^^^^^^^^^ definition semanticdb maven . . snapshots/Class#``(). -// display_name Class -// signature_documentation kotlin public constructor(banana: Int, apple: String): Class -// ^^^^^^ definition semanticdb maven . . snapshots/Class#``().(banana) -// display_name banana -// signature_documentation kotlin banana: Int -// ^^^^^^ reference semanticdb maven . . snapshots/Class#``().(banana) -// ^^^^^^ definition semanticdb maven . . snapshots/Class#banana. -// display_name banana -// signature_documentation kotlin private final var banana: Int -// ^^^^^^ definition semanticdb maven . . snapshots/Class#getBanana(). -// display_name banana -// signature_documentation kotlin private get(): Int -// ^^^^^^ definition semanticdb maven . . snapshots/Class#setBanana(). -// display_name banana -// signature_documentation kotlin private set(value: Int): Unit -// ^^^^^^ definition semanticdb maven . . snapshots/Class#setBanana().(value) -// display_name value -// signature_documentation kotlin value: Int -// ^^^ reference semanticdb maven . . kotlin/Int# -// ^^^^^ definition semanticdb maven . . snapshots/Class#``().(apple) -// display_name apple -// signature_documentation kotlin apple: String -// ^^^^^^ reference semanticdb maven . . kotlin/String# -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#``().(banana) -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#banana. -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#getBanana(). -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#setBanana(). -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#setBanana().(value) -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#``().(apple) -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#``(). - Throwable(banana.toString() + apple) { -// ^^^^^^^^^ reference semanticdb maven . . kotlin/Throwable# -// ^^^^^^ reference semanticdb maven . . snapshots/Class#``().(banana) -// ^^^^^^^^ reference semanticdb maven . . kotlin/Int#toString(). -// ^ reference semanticdb maven . . kotlin/String#plus(). -// ^^^^^ reference semanticdb maven . . snapshots/Class#``().(apple) - init { - println("") -// ^^^^^^^ reference semanticdb maven . . kotlin/io/println(). - } - -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#asdf. -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#getAsdf(). - val asdf = -// ^^^^ definition semanticdb maven . . snapshots/Class#asdf. -// display_name asdf -// signature_documentation kotlin public final val asdf: Any -// ^^^^ definition semanticdb maven . . snapshots/Class#getAsdf(). -// display_name asdf -// signature_documentation kotlin public get(): Any -// ⌄ enclosing_range_start semanticdb maven . . snapshots/``# -// ⌄ enclosing_range_start semanticdb maven . . snapshots/``#``(). - object { -// ^^^^^^ definition semanticdb maven . . snapshots/``# -// display_name -// signature_documentation kotlin object : Any -// ^^^^^^ definition semanticdb maven . . snapshots/``#``(). -// display_name -// signature_documentation kotlin private constructor(): -// ⌄ enclosing_range_start semanticdb maven . . snapshots/``#doStuff(). - fun doStuff() = Unit -// ^^^^^^^ definition semanticdb maven . . snapshots/``#doStuff(). -// display_name doStuff -// signature_documentation kotlin public final fun doStuff(): Unit -// ⌃ enclosing_range_end semanticdb maven . . snapshots/``#doStuff(). - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#asdf. -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#getAsdf(). -// ⌃ enclosing_range_end semanticdb maven . . snapshots/``# -// ⌃ enclosing_range_end semanticdb maven . . snapshots/``#``(). - -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#``(+1). - constructor() : this(1, "") -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/Class#``(+1). -// display_name Class -// signature_documentation kotlin public constructor(): Class -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#``(+1). - -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#``(+2). -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#``(+2).(banana) - constructor(banana: Int) : this(banana, "") -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/Class#``(+2). -// display_name Class -// signature_documentation kotlin public constructor(banana: Int): Class -// ^^^^^^ definition semanticdb maven . . snapshots/Class#``(+2).(banana) -// display_name banana -// signature_documentation kotlin banana: Int -// ^^^ reference semanticdb maven . . kotlin/Int# -// ^^^^^^ reference semanticdb maven . . snapshots/Class#``(+2).(banana) -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#``(+2).(banana) -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#``(+2). - -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Class#run(). - fun run() { -// ^^^ definition semanticdb maven . . snapshots/Class#run(). -// display_name run -// signature_documentation kotlin public final fun run(): Unit - println(Class::class) -// ^^^^^^^ reference semanticdb maven . . kotlin/io/println(). - println("I eat $banana for lunch") -// ^^^^^^^ reference semanticdb maven . . kotlin/io/println(). -// ^^^^^^ reference semanticdb maven . . snapshots/Class#banana. -// ^^^^^^ reference semanticdb maven . . snapshots/Class#getBanana(). -// ^^^^^^ reference semanticdb maven . . snapshots/Class#setBanana(). - banana = 42 -// ^^^^^^ reference semanticdb maven . . snapshots/Class#banana. -// ^^^^^^ reference semanticdb maven . . snapshots/Class#getBanana(). -// ^^^^^^ reference semanticdb maven . . snapshots/Class#setBanana(). - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Class#run(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/Class# diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt b/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt deleted file mode 100644 index 2d68d463..00000000 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/CompanionOwner.kt +++ /dev/null @@ -1,44 +0,0 @@ - package snapshots -// ^^^^^^^^^ reference semanticdb maven . . snapshots/ - -//⌄ enclosing_range_start semanticdb maven . . snapshots/CompanionOwner# -//⌄ enclosing_range_start semanticdb maven . . snapshots/CompanionOwner#``(). - class CompanionOwner { -// ^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/CompanionOwner# -// display_name CompanionOwner -// signature_documentation kotlin public final class CompanionOwner : Any -// ^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/CompanionOwner#``(). -// display_name CompanionOwner -// signature_documentation kotlin public constructor(): CompanionOwner -// ⌄ enclosing_range_start semanticdb maven . . snapshots/CompanionOwner#Companion# -// ⌄ enclosing_range_start semanticdb maven . . snapshots/CompanionOwner#Companion#``(). - companion object { -// ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/CompanionOwner#Companion# 2:3 -// display_name Companion -// signature_documentation kotlin public final companion object Companion : Any -// ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/CompanionOwner#Companion#``(). 2:3 -// display_name Companion -// signature_documentation kotlin private constructor(): CompanionOwner.Companion -// ⌄ enclosing_range_start semanticdb maven . . snapshots/CompanionOwner#Companion#create(). - fun create(): CompanionOwner = CompanionOwner() -// ^^^^^^ definition semanticdb maven . . snapshots/CompanionOwner#Companion#create(). -// display_name create -// signature_documentation kotlin public final fun create(): CompanionOwner -// ^^^^^^^^^^^^^^ reference semanticdb maven . . snapshots/CompanionOwner# -// ^^^^^^^^^^^^^^ reference semanticdb maven . . snapshots/CompanionOwner#``(). -// ⌃ enclosing_range_end semanticdb maven . . snapshots/CompanionOwner#Companion#create(). - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/CompanionOwner#Companion# -// ⌃ enclosing_range_end semanticdb maven . . snapshots/CompanionOwner#Companion#``(). -// ⌄ enclosing_range_start semanticdb maven . . snapshots/CompanionOwner#create(). - fun create(): Int = CompanionOwner.create().hashCode() -// ^^^^^^ definition semanticdb maven . . snapshots/CompanionOwner#create(). -// display_name create -// signature_documentation kotlin public final fun create(): Int -// ^^^ reference semanticdb maven . . kotlin/Int# -// ^^^^^^ reference semanticdb maven . . snapshots/CompanionOwner#Companion#create(). -// ^^^^^^^^ reference semanticdb maven . . kotlin/Any#hashCode(). -// ⌃ enclosing_range_end semanticdb maven . . snapshots/CompanionOwner#create(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/CompanionOwner# -//⌃ enclosing_range_end semanticdb maven . . snapshots/CompanionOwner#``(). diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt b/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt deleted file mode 100644 index 12facbd3..00000000 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Docstrings.kt +++ /dev/null @@ -1,47 +0,0 @@ - package snapshots -// ^^^^^^^^^ reference semanticdb maven . . snapshots/ - - import java.io.Serializable -// ^^^^ reference semanticdb maven . . java/ -// ^^ reference semanticdb maven . . java/io/ -// ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/Serializable# - -//⌄ enclosing_range_start semanticdb maven . . snapshots/DocstringSuperclass# -//⌄ enclosing_range_start semanticdb maven . . snapshots/DocstringSuperclass#``(). - abstract class DocstringSuperclass -// ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/DocstringSuperclass# -// display_name DocstringSuperclass -// signature_documentation kotlin public abstract class DocstringSuperclass : Any -// ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/DocstringSuperclass#``(). -// display_name DocstringSuperclass -// signature_documentation kotlin public constructor(): DocstringSuperclass -// ⌃ enclosing_range_end semanticdb maven . . snapshots/DocstringSuperclass# -// ⌃ enclosing_range_end semanticdb maven . . snapshots/DocstringSuperclass#``(). -//⌄ enclosing_range_start semanticdb maven . . snapshots/Docstrings# -//⌄ enclosing_range_start semanticdb maven . . snapshots/Docstrings#``(). - /** Example class docstring. */ - class Docstrings : DocstringSuperclass(), Serializable { -// ^^^^^^^^^^ definition semanticdb maven . . snapshots/Docstrings# -// display_name Docstrings -// signature_documentation kotlin public final class Docstrings : DocstringSuperclass, Serializable -// documentation Example class docstring. -// relationship is_implementation semanticdb maven . . snapshots/DocstringSuperclass# -// relationship is_implementation semanticdb maven jdk 11 java/io/Serializable# -// ^^^^^^^^^^ definition semanticdb maven . . snapshots/Docstrings#``(). -// display_name Docstrings -// signature_documentation kotlin public constructor(): Docstrings -// documentation Example class docstring. -// ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . snapshots/DocstringSuperclass# -// ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/Serializable# - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/Docstrings# -//⌃ enclosing_range_end semanticdb maven . . snapshots/Docstrings#``(). - -//⌄ enclosing_range_start semanticdb maven . . snapshots/docstrings(). - /** Example method docstring. */ - fun docstrings() { } -// ^^^^^^^^^^ definition semanticdb maven . . snapshots/docstrings(). -// display_name docstrings -// signature_documentation kotlin public final fun docstrings(): Unit -// documentation Example method docstring. -// ⌃ enclosing_range_end semanticdb maven . . snapshots/docstrings(). diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt b/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt deleted file mode 100644 index 85e5fb67..00000000 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Functions.kt +++ /dev/null @@ -1,19 +0,0 @@ - package snapshots -// ^^^^^^^^^ reference semanticdb maven . . snapshots/ - -//⌄ enclosing_range_start semanticdb maven . . snapshots/sampleText(). -// ⌄ enclosing_range_start semanticdb maven . . snapshots/sampleText().(x) - fun sampleText(x: String = "") { -// ^^^^^^^^^^ definition semanticdb maven . . snapshots/sampleText(). -// display_name sampleText -// signature_documentation kotlin public final fun sampleText(x: String = ...): Unit -// ^ definition semanticdb maven . . snapshots/sampleText().(x) -// display_name x -// signature_documentation kotlin x: String = ... -// ^^^^^^ reference semanticdb maven . . kotlin/String# -// ⌃ enclosing_range_end semanticdb maven . . snapshots/sampleText().(x) - println(x) -// ^^^^^^^ reference semanticdb maven . . kotlin/io/println(). -// ^ reference semanticdb maven . . snapshots/sampleText().(x) - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/sampleText(). diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt b/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt deleted file mode 100644 index 0a3abb81..00000000 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/Implementations.kt +++ /dev/null @@ -1,129 +0,0 @@ - package snapshots -// ^^^^^^^^^ reference semanticdb maven . . snapshots/ - -//⌄ enclosing_range_start semanticdb maven . . snapshots/Overrides# -//⌄ enclosing_range_start semanticdb maven . . snapshots/Overrides#``(). - class Overrides : AutoCloseable { -// ^^^^^^^^^ definition semanticdb maven . . snapshots/Overrides# -// display_name Overrides -// signature_documentation kotlin public final class Overrides : {kotlin/AutoCloseable=} AutoCloseable -// relationship is_implementation semanticdb maven jdk 11 java/lang/AutoCloseable# -// ^^^^^^^^^ definition semanticdb maven . . snapshots/Overrides#``(). -// display_name Overrides -// signature_documentation kotlin public constructor(): Overrides -// ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/AutoCloseable# -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Overrides#close(). - override fun close() { -// ^^^^^ definition semanticdb maven . . snapshots/Overrides#close(). -// display_name close -// signature_documentation kotlin public open override fun close(): Unit -// relationship is_implementation semanticdb maven jdk 11 java/lang/AutoCloseable#close(). - TODO("Not yet implemented") -// ^^^^ reference semanticdb maven . . kotlin/TODO(+1). - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Overrides#close(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/Overrides# -//⌃ enclosing_range_end semanticdb maven . . snapshots/Overrides#``(). - -//⌄ enclosing_range_start semanticdb maven . . snapshots/Animal# - interface Animal { -// ^^^^^^ definition semanticdb maven . . snapshots/Animal# -// display_name Animal -// signature_documentation kotlin public abstract interface Animal : Any -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Animal#favoriteNumber. -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Animal#getFavoriteNumber(). - val favoriteNumber: Int -// ^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/Animal#favoriteNumber. -// display_name favoriteNumber -// signature_documentation kotlin public abstract val favoriteNumber: Int -// ^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/Animal#getFavoriteNumber(). -// display_name favoriteNumber -// signature_documentation kotlin public get(): Int -// ^^^ reference semanticdb maven . . kotlin/Int# -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Animal#favoriteNumber. -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Animal#getFavoriteNumber(). -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Animal#sound(). - fun sound(): String -// ^^^^^ definition semanticdb maven . . snapshots/Animal#sound(). -// display_name sound -// signature_documentation kotlin public abstract fun sound(): String\n -// ^^^^^^ reference semanticdb maven . . kotlin/String# -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Animal#sound(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/Animal# -//⌄ enclosing_range_start semanticdb maven . . snapshots/Bird# -//⌄ enclosing_range_start semanticdb maven . . snapshots/Bird#``(). - open class Bird : Animal { -// ^^^^ definition semanticdb maven . . snapshots/Bird# -// display_name Bird -// signature_documentation kotlin public open class Bird : Animal -// relationship is_implementation semanticdb maven . . snapshots/Animal# -// ^^^^ definition semanticdb maven . . snapshots/Bird#``(). -// display_name Bird -// signature_documentation kotlin public constructor(): Bird -// ^^^^^^ reference semanticdb maven . . snapshots/Animal# -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Bird#favoriteNumber. - override val favoriteNumber: Int -// ^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/Bird#favoriteNumber. -// display_name favoriteNumber -// signature_documentation kotlin public open override val favoriteNumber: Int -// ^^^ reference semanticdb maven . . kotlin/Int# -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Bird#getFavoriteNumber(). - get() = 42 -// ^^^ definition semanticdb maven . . snapshots/Bird#getFavoriteNumber(). -// display_name favoriteNumber -// signature_documentation kotlin public get(): Int -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Bird#favoriteNumber. -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Bird#getFavoriteNumber(). - -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Bird#sound(). - override fun sound(): String { -// ^^^^^ definition semanticdb maven . . snapshots/Bird#sound(). -// display_name sound -// signature_documentation kotlin public open override fun sound(): String -// relationship is_implementation semanticdb maven . . snapshots/Animal#sound(). -// ^^^^^^ reference semanticdb maven . . kotlin/String# - return "tweet" - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Bird#sound(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/Bird# -//⌃ enclosing_range_end semanticdb maven . . snapshots/Bird#``(). -//⌄ enclosing_range_start semanticdb maven . . snapshots/Seagull# -//⌄ enclosing_range_start semanticdb maven . . snapshots/Seagull#``(). - class Seagull : Bird() { -// ^^^^^^^ definition semanticdb maven . . snapshots/Seagull# -// display_name Seagull -// signature_documentation kotlin public final class Seagull : Bird -// relationship is_implementation semanticdb maven . . snapshots/Bird# -// ^^^^^^^ definition semanticdb maven . . snapshots/Seagull#``(). -// display_name Seagull -// signature_documentation kotlin public constructor(): Seagull -// ^^^^ reference semanticdb maven . . snapshots/Bird# -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Seagull#favoriteNumber. - override val favoriteNumber: Int -// ^^^^^^^^^^^^^^ definition semanticdb maven . . snapshots/Seagull#favoriteNumber. -// display_name favoriteNumber -// signature_documentation kotlin public open override val favoriteNumber: Int -// ^^^ reference semanticdb maven . . kotlin/Int# -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Seagull#getFavoriteNumber(). - get() = 1337 -// ^^^ definition semanticdb maven . . snapshots/Seagull#getFavoriteNumber(). -// display_name favoriteNumber -// signature_documentation kotlin public get(): Int -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Seagull#favoriteNumber. -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Seagull#getFavoriteNumber(). -// ⌄ enclosing_range_start semanticdb maven . . snapshots/Seagull#sound(). - override fun sound(): String { -// ^^^^^ definition semanticdb maven . . snapshots/Seagull#sound(). -// display_name sound -// signature_documentation kotlin public open override fun sound(): String -// relationship is_implementation semanticdb maven . . snapshots/Bird#sound(). -// ^^^^^^ reference semanticdb maven . . kotlin/String# - return "squawk" - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/Seagull#sound(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/Seagull# -//⌃ enclosing_range_end semanticdb maven . . snapshots/Seagull#``(). diff --git a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt b/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt deleted file mode 100644 index 558123d2..00000000 --- a/semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/semanticdb-kotlinc/minimized/src/main/kotlin/snapshots/ObjectKt.kt +++ /dev/null @@ -1,37 +0,0 @@ - package snapshots -// ^^^^^^^^^ reference semanticdb maven . . snapshots/ - - import java.lang.RuntimeException -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/lang/ -// ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException# - -//⌄ enclosing_range_start semanticdb maven . . snapshots/ObjectKt# -//⌄ enclosing_range_start semanticdb maven . . snapshots/ObjectKt#``(). - object ObjectKt { -// ^^^^^^^^ definition semanticdb maven . . snapshots/ObjectKt# -// display_name ObjectKt -// signature_documentation kotlin public final object ObjectKt : Any -// ^^^^^^^^ definition semanticdb maven . . snapshots/ObjectKt#``(). -// display_name ObjectKt -// signature_documentation kotlin private constructor(): ObjectKt -// ⌄ enclosing_range_start semanticdb maven . . snapshots/ObjectKt#fail(). -// ⌄ enclosing_range_start semanticdb maven . . snapshots/ObjectKt#fail().(message) - fun fail(message: String?): Nothing { -// ^^^^ definition semanticdb maven . . snapshots/ObjectKt#fail(). -// display_name fail -// signature_documentation kotlin public final fun fail(message: String?): Nothing -// ^^^^^^^ definition semanticdb maven . . snapshots/ObjectKt#fail().(message) -// display_name message -// signature_documentation kotlin message: String? -// ^^^^^^^ reference semanticdb maven . . kotlin/String# -// ^^^^^^^ reference semanticdb maven . . kotlin/Nothing# -// ⌃ enclosing_range_end semanticdb maven . . snapshots/ObjectKt#fail().(message) - throw RuntimeException(message) -// ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#``(). -// ^^^^^^^ reference semanticdb maven . . snapshots/ObjectKt#fail().(message) - } -// ⌃ enclosing_range_end semanticdb maven . . snapshots/ObjectKt#fail(). - } -//⌃ enclosing_range_end semanticdb maven . . snapshots/ObjectKt# -//⌃ enclosing_range_end semanticdb maven . . snapshots/ObjectKt#``(). diff --git a/semanticdb-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor b/semanticdb-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor deleted file mode 100644 index 804ff870..00000000 --- a/semanticdb-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor +++ /dev/null @@ -1 +0,0 @@ -com.sourcegraph.semanticdb_kotlinc.AnalyzerCommandLineProcessor diff --git a/semanticdb-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar b/semanticdb-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar deleted file mode 100644 index f7d02a4a..00000000 --- a/semanticdb-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar +++ /dev/null @@ -1 +0,0 @@ -com.sourcegraph.semanticdb_kotlinc.AnalyzerRegistrar \ No newline at end of file diff --git a/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala index d7df9aae..2bae48d0 100644 --- a/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala +++ b/tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala @@ -61,7 +61,7 @@ abstract class BaseBuildToolSuite extends MopedSuite(ScipJava.app) { def checkBuild( options: TestOptions, original: String, - expectedSemanticdbFiles: Int = 0, + expectedScipFiles: Int = 0, extraArguments: List[String] = Nil, expectedError: Option[String => Unit] = None, expectedPackages: String = "", @@ -127,9 +127,9 @@ abstract class BaseBuildToolSuite extends MopedSuite(ScipJava.app) { FileIO .listAllFilesRecursively(AbsolutePath(targetroot)) .filter(p => scipShardPattern.matches(p.toNIO)) - if (scipShardFiles.length != expectedSemanticdbFiles) { + if (scipShardFiles.length != expectedScipFiles) { fail( - s"Expected $expectedSemanticdbFiles SCIP shard(s) to be generated.", + s"Expected $expectedScipFiles SCIP shard(s) to be generated.", clues(scipShardFiles, app.capturedOutput) ) } diff --git a/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala index 7cca65f2..b54b653e 100644 --- a/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala +++ b/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala @@ -36,7 +36,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) - build/generated/sources/annotationProcessor/java/main/test/ImmutableWorkflowOptions.java.scip - /META-INF/scip/src/main/java/WorkflowOptions.java.scip */ - expectedSemanticdbFiles = 2 + expectedScipFiles = 2 ) checkGradleBuild( @@ -66,8 +66,8 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) |} """.stripMargin, // See comment about immutable annotation processor above, - // it explains why we expecte 2 semanticdb files - expectedSemanticdbFiles = 2 + // it explains why we expecte 2 scip files + expectedScipFiles = 2 ) checkGradleBuild( @@ -94,7 +94,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) |package test; |public abstract class ExampleClass {} """.stripMargin, - expectedSemanticdbFiles = 1, + expectedScipFiles = 1, expectedPackages = "maven:com.sourcegraph:example-library:1.1" ) @@ -144,7 +144,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) | } | } |""".stripMargin, - expectedSemanticdbFiles = 2 + expectedScipFiles = 2 ) allJava.foreach { java => @@ -160,7 +160,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) |/src/main/java/Example.java |public class Example {} |""".stripMargin, - expectedSemanticdbFiles = 1 + expectedScipFiles = 1 ) } @@ -198,7 +198,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) |/src/main/java/Example.java |public class Example {} |""".stripMargin, - expectedSemanticdbFiles = 2 + expectedScipFiles = 2 ) checkGradleBuild( @@ -212,7 +212,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) |/pom.xml | |""".stripMargin, - expectedSemanticdbFiles = 2, + expectedScipFiles = 2, extraArguments = List("--build-tool", "gradle") ) @@ -225,7 +225,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) |/src/test/java/ExampleSuite.java |public class ExampleSuite {} |""".stripMargin, - expectedSemanticdbFiles = 1, + expectedScipFiles = 1, extraArguments = List("--", "compileJava") ) @@ -251,7 +251,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) |package foo |class ExampleSuite {} |""".stripMargin, - expectedSemanticdbFiles = 4 + expectedScipFiles = 4 ) checkGradleBuild( @@ -276,7 +276,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) | MethodType foo; |} |""".stripMargin, - expectedSemanticdbFiles = 1, + expectedScipFiles = 1, expectedPackages = """|maven:com.fasterxml.jackson.core:jackson-annotations:2.14.1 |maven:com.fasterxml.jackson.core:jackson-core:2.14.1 @@ -317,7 +317,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) |package foo |object Example {} |""".stripMargin, - expectedSemanticdbFiles = 1 + expectedScipFiles = 1 ) } @@ -350,7 +350,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle) |/src/intTest/java/ExampleIntTest.java |public class ExampleIntTest {} |""".stripMargin, - expectedSemanticdbFiles = 1 + expectedScipFiles = 1 ) } diff --git a/tests/buildTools/src/test/scala/tests/GradleBuildToolSuiteBase.scala b/tests/buildTools/src/test/scala/tests/GradleBuildToolSuiteBase.scala index 0f01ea73..11e83f87 100644 --- a/tests/buildTools/src/test/scala/tests/GradleBuildToolSuiteBase.scala +++ b/tests/buildTools/src/test/scala/tests/GradleBuildToolSuiteBase.scala @@ -27,7 +27,7 @@ abstract class GradleBuildToolSuiteBase(gradle: Tool.Gradle) def checkGradleBuild( title: TestOptions, setup: String, - expectedSemanticdbFiles: Int = 0, + expectedScipFiles: Int = 0, expectedPackages: String = "", extraArguments: List[String] = Nil, tools: List[Tool] = Nil @@ -37,7 +37,7 @@ abstract class GradleBuildToolSuiteBase(gradle: Tool.Gradle) checkBuild( testName, setup, - expectedSemanticdbFiles = expectedSemanticdbFiles, + expectedScipFiles = expectedScipFiles, expectedPackages = expectedPackages, initCommand = gradleVersion(gradle.version), extraArguments = extraArguments, diff --git a/tests/buildTools/src/test/scala/tests/MavenBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/MavenBuildToolSuite.scala index dd0fc303..3122b52e 100644 --- a/tests/buildTools/src/test/scala/tests/MavenBuildToolSuite.scala +++ b/tests/buildTools/src/test/scala/tests/MavenBuildToolSuite.scala @@ -25,7 +25,7 @@ class MavenBuildToolSuite extends BaseBuildToolSuite { |package com; |public class ExampleSuite {} |""".stripMargin, - expectedSemanticdbFiles = 2, + expectedScipFiles = 2, expectedPackages = """|maven:com.sourcegraph:example:1.0-SNAPSHOT |maven:junit:junit:4.11 diff --git a/tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala index 6707e175..d9414673 100644 --- a/tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala +++ b/tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala @@ -32,7 +32,7 @@ class ScipBuildToolSuite extends BaseBuildToolSuite { |package foo; |public class Example2 {} |""".stripMargin, - expectedSemanticdbFiles = 2 + expectedScipFiles = 2 ) checkBuild( @@ -46,7 +46,7 @@ class ScipBuildToolSuite extends BaseBuildToolSuite { | public String hello() { return new Greeter().greet(); } |} |""".stripMargin, - expectedSemanticdbFiles = 1, + expectedScipFiles = 1, prepare = () => { val libSrcDir = os.temp.dir(prefix = "scip-classpath-lib") diff --git a/tests/gradle-example/.gitignore b/tests/gradle-example/.gitignore index 581a649e..07915499 100644 --- a/tests/gradle-example/.gitignore +++ b/tests/gradle-example/.gitignore @@ -1,5 +1,5 @@ index.scip -semanticdb-targetroot/ +scip-targetroot/ .classpath .project .settings diff --git a/tests/minimized/BUILD b/tests/minimized/BUILD index 0d647b12..0bd36fcd 100644 --- a/tests/minimized/BUILD +++ b/tests/minimized/BUILD @@ -7,9 +7,9 @@ java_library( "@maven//:org_projectlombok_lombok", ], plugins = [ - "//semanticdb-javac:plugin", + "//scip-javac:plugin", ], javacopts = [ - "'-Xplugin:semanticdb -build-tool:bazel'", + "'-Xplugin:scip -build-tool:bazel'", ], ) diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java index ac2e74c3..fc494c4a 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java @@ -1,34 +1,34 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/AbstractClasses# +//⌄ enclosing_range_start scip-java maven . . minimized/AbstractClasses# public abstract class AbstractClasses { -// ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses# +// ^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AbstractClasses# // display_name AbstractClasses // signature_documentation java public abstract class AbstractClasses // kind Class -// ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#``(). +// ^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AbstractClasses#``(). // display_name // signature_documentation java public AbstractClasses() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/AbstractClasses#defaultImplementation(). +// ⌄ enclosing_range_start scip-java maven . . minimized/AbstractClasses#defaultImplementation(). public String defaultImplementation() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#defaultImplementation(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AbstractClasses#defaultImplementation(). // display_name defaultImplementation // signature_documentation java public String defaultImplementation() // kind Method return ""; } -// ⌃ enclosing_range_end semanticdb maven . . minimized/AbstractClasses#defaultImplementation(). +// ⌃ enclosing_range_end scip-java maven . . minimized/AbstractClasses#defaultImplementation(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/AbstractClasses#abstractImplementation(). +// ⌄ enclosing_range_start scip-java maven . . minimized/AbstractClasses#abstractImplementation(). public abstract String abstractImplementation(); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#abstractImplementation(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AbstractClasses#abstractImplementation(). // display_name abstractImplementation // signature_documentation java public abstract String abstractImplementation() // kind AbstractMethod -// relationship is_reference is_implementation semanticdb maven . . minimized/SubClasses#abstractImplementation(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/AbstractClasses#abstractImplementation(). +// relationship is_reference is_implementation scip-java maven . . minimized/SubClasses#abstractImplementation(). +// ⌃ enclosing_range_end scip-java maven . . minimized/AbstractClasses#abstractImplementation(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/AbstractClasses# +//⌃ enclosing_range_end scip-java maven . . minimized/AbstractClasses# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationParameters.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationParameters.java index dbfff8af..9fb12c05 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationParameters.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationParameters.java @@ -1,154 +1,154 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/Bar# +//⌄ enclosing_range_start scip-java maven . . minimized/Bar# @interface Bar { -// ^^^ definition semanticdb maven . . minimized/Bar# +// ^^^ definition scip-java maven . . minimized/Bar# // display_name Bar // signature_documentation java @interface Bar // kind Interface -// relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation# -// ⌄ enclosing_range_start semanticdb maven . . minimized/Bar#value(). +// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// ⌄ enclosing_range_start scip-java maven . . minimized/Bar#value(). double value(); -// ^^^^^ definition semanticdb maven . . minimized/Bar#value(). +// ^^^^^ definition scip-java maven . . minimized/Bar#value(). // display_name value // signature_documentation java public abstract double value() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/Bar#value(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Bar#value(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/Bar# +//⌃ enclosing_range_end scip-java maven . . minimized/Bar# -//⌄ enclosing_range_start semanticdb maven . . minimized/BarB# +//⌄ enclosing_range_start scip-java maven . . minimized/BarB# @interface BarB { -// ^^^^ definition semanticdb maven . . minimized/BarB# +// ^^^^ definition scip-java maven . . minimized/BarB# // display_name BarB // signature_documentation java @interface BarB // kind Interface -// relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation# -// ⌄ enclosing_range_start semanticdb maven . . minimized/BarB#value(). +// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// ⌄ enclosing_range_start scip-java maven . . minimized/BarB#value(). boolean value(); -// ^^^^^ definition semanticdb maven . . minimized/BarB#value(). +// ^^^^^ definition scip-java maven . . minimized/BarB#value(). // display_name value // signature_documentation java public abstract boolean value() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/BarB#value(). +// ⌃ enclosing_range_end scip-java maven . . minimized/BarB#value(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/BarB# +//⌃ enclosing_range_end scip-java maven . . minimized/BarB# -//⌄ enclosing_range_start semanticdb maven . . minimized/Nullable# +//⌄ enclosing_range_start scip-java maven . . minimized/Nullable# @interface Nullable { -// ^^^^^^^^ definition semanticdb maven . . minimized/Nullable# +// ^^^^^^^^ definition scip-java maven . . minimized/Nullable# // display_name Nullable // signature_documentation java @interface Nullable // kind Interface -// relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation# -// ⌄ enclosing_range_start semanticdb maven . . minimized/Nullable#value(). +// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// ⌄ enclosing_range_start scip-java maven . . minimized/Nullable#value(). String value() default ""; -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^ definition semanticdb maven . . minimized/Nullable#value(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^ definition scip-java maven . . minimized/Nullable#value(). // display_name value // signature_documentation java public abstract String value() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/Nullable#value(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Nullable#value(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/Nullable# +//⌃ enclosing_range_end scip-java maven . . minimized/Nullable# -//⌄ enclosing_range_start semanticdb maven . . minimized/BarRef# +//⌄ enclosing_range_start scip-java maven . . minimized/BarRef# @interface BarRef{ -// ^^^^^^ definition semanticdb maven . . minimized/BarRef# +// ^^^^^^ definition scip-java maven . . minimized/BarRef# // display_name BarRef // signature_documentation java @interface BarRef // kind Interface -// relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation# -// ⌄ enclosing_range_start semanticdb maven . . minimized/BarRef#value(). +// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// ⌄ enclosing_range_start scip-java maven . . minimized/BarRef#value(). SuppressWarnings value(); -// ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings# -// ^^^^^ definition semanticdb maven . . minimized/BarRef#value(). +// ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# +// ^^^^^ definition scip-java maven . . minimized/BarRef#value(). // display_name value // signature_documentation java public abstract SuppressWarnings value() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/BarRef#value(). +// ⌃ enclosing_range_end scip-java maven . . minimized/BarRef#value(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/BarRef# +//⌃ enclosing_range_end scip-java maven . . minimized/BarRef# -//⌄ enclosing_range_start semanticdb maven . . minimized/Foo# +//⌄ enclosing_range_start scip-java maven . . minimized/Foo# interface Foo { -// ^^^ definition semanticdb maven . . minimized/Foo# +// ^^^ definition scip-java maven . . minimized/Foo# // display_name Foo // signature_documentation java interface Foo // kind Interface -// ⌄ enclosing_range_start semanticdb maven . . minimized/Foo#test(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Foo#test(). @Bar(-1d) -// ^^^ reference semanticdb maven . . minimized/Bar# +// ^^^ reference scip-java maven . . minimized/Bar# double test(); -// ^^^^ definition semanticdb maven . . minimized/Foo#test(). +// ^^^^ definition scip-java maven . . minimized/Foo#test(). // display_name test // signature_documentation java @Bar(-1.0)\npublic abstract double test() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/Foo#test(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Foo#test(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Foo#test2(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Foo#test2(). @Bar(~5) -// ^^^ reference semanticdb maven . . minimized/Bar# +// ^^^ reference scip-java maven . . minimized/Bar# @SuppressWarnings(value = "unchecked") -// ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings# -// ^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#value(). +// ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# +// ^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings#value(). double test2(); -// ^^^^^ definition semanticdb maven . . minimized/Foo#test2(). +// ^^^^^ definition scip-java maven . . minimized/Foo#test2(). // display_name test2 // signature_documentation java @Bar(~5)\n@SuppressWarnings("unchecked")\npublic abstract double test2() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/Foo#test2(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Foo#test2(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Foo#test3(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Foo#test3(). @BarB(!true) -// ^^^^ reference semanticdb maven . . minimized/BarB# +// ^^^^ reference scip-java maven . . minimized/BarB# double test3(); -// ^^^^^ definition semanticdb maven . . minimized/Foo#test3(). +// ^^^^^ definition scip-java maven . . minimized/Foo#test3(). // display_name test3 // signature_documentation java @BarB(!true)\npublic abstract double test3() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/Foo#test3(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Foo#test3(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Foo#test4(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Foo#test4(). @Nullable(("what")) -// ^^^^^^^^ reference semanticdb maven . . minimized/Nullable# +// ^^^^^^^^ reference scip-java maven . . minimized/Nullable# Foo test4(); -// ^^^ reference semanticdb maven . . minimized/Foo# -// ^^^^^ definition semanticdb maven . . minimized/Foo#test4(). +// ^^^ reference scip-java maven . . minimized/Foo# +// ^^^^^ definition scip-java maven . . minimized/Foo#test4(). // display_name test4 // signature_documentation java @Nullable("what")\npublic abstract Foo test4() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/Foo#test4(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Foo#test4(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Foo#testCast(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Foo#testCast(). @Bar((double) -1) -// ^^^ reference semanticdb maven . . minimized/Bar# +// ^^^ reference scip-java maven . . minimized/Bar# double testCast(); -// ^^^^^^^^ definition semanticdb maven . . minimized/Foo#testCast(). +// ^^^^^^^^ definition scip-java maven . . minimized/Foo#testCast(). // display_name testCast // signature_documentation java @Bar((double) -1)\npublic abstract double testCast() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/Foo#testCast(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Foo#testCast(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/Foo# +//⌃ enclosing_range_end scip-java maven . . minimized/Foo# -//⌄ enclosing_range_start semanticdb maven . . minimized/TestRef# +//⌄ enclosing_range_start scip-java maven . . minimized/TestRef# interface TestRef { -// ^^^^^^^ definition semanticdb maven . . minimized/TestRef# +// ^^^^^^^ definition scip-java maven . . minimized/TestRef# // display_name TestRef // signature_documentation java interface TestRef // kind Interface -// ⌄ enclosing_range_start semanticdb maven . . minimized/TestRef#testCase(). +// ⌄ enclosing_range_start scip-java maven . . minimized/TestRef#testCase(). @BarRef(@SuppressWarnings(value = "unchecked")) -// ^^^^^^ reference semanticdb maven . . minimized/BarRef# -// ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings# -// ^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#value(). +// ^^^^^^ reference scip-java maven . . minimized/BarRef# +// ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# +// ^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings#value(). abstract double testCase(); -// ^^^^^^^^ definition semanticdb maven . . minimized/TestRef#testCase(). +// ^^^^^^^^ definition scip-java maven . . minimized/TestRef#testCase(). // display_name testCase // signature_documentation java @BarRef(@SuppressWarnings("unchecked"))\npublic abstract double testCase() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/TestRef#testCase(). +// ⌃ enclosing_range_end scip-java maven . . minimized/TestRef#testCase(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/TestRef# +//⌃ enclosing_range_end scip-java maven . . minimized/TestRef# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java index 1a6ace91..509abc87 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java @@ -1,79 +1,79 @@ package minimized; import java.lang.annotation.Documented; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/lang/ -// ^^^^^^^^^^ reference semanticdb maven . . java/lang/annotation/ -// ^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/Documented# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/lang/ +// ^^^^^^^^^^ reference scip-java maven . . java/lang/annotation/ +// ^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Documented# import java.lang.annotation.Retention; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/lang/ -// ^^^^^^^^^^ reference semanticdb maven . . java/lang/annotation/ -// ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/Retention# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/lang/ +// ^^^^^^^^^^ reference scip-java maven . . java/lang/annotation/ +// ^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Retention# import java.lang.annotation.RetentionPolicy; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/lang/ -// ^^^^^^^^^^ reference semanticdb maven . . java/lang/annotation/ -// ^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/RetentionPolicy# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/lang/ +// ^^^^^^^^^^ reference scip-java maven . . java/lang/annotation/ +// ^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/RetentionPolicy# import java.lang.annotation.Target; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/lang/ -// ^^^^^^^^^^ reference semanticdb maven . . java/lang/annotation/ -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/Target# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/lang/ +// ^^^^^^^^^^ reference scip-java maven . . java/lang/annotation/ +// ^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Target# import static java.lang.annotation.ElementType.*; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/lang/ -// ^^^^^^^^^^ reference semanticdb maven . . java/lang/annotation/ -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/ElementType# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/lang/ +// ^^^^^^^^^^ reference scip-java maven . . java/lang/annotation/ +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/ElementType# -//⌄ enclosing_range_start semanticdb maven . . minimized/Annotations# +//⌄ enclosing_range_start scip-java maven . . minimized/Annotations# @Documented -// ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/Documented# +// ^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Documented# @Retention(RetentionPolicy.RUNTIME) -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/Retention# -// ^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/RetentionPolicy# -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/RetentionPolicy#RUNTIME. +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Retention# +// ^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/RetentionPolicy# +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/RetentionPolicy#RUNTIME. @Target(value = {CONSTRUCTOR, -// ^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/Target# -// ^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/Target#value(). -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/ElementType#CONSTRUCTOR. +// ^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Target# +// ^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Target#value(). +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/ElementType#CONSTRUCTOR. FIELD, -// ^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/ElementType#FIELD. +// ^^^^^ reference scip-java maven jdk 11 java/lang/annotation/ElementType#FIELD. LOCAL_VARIABLE, -// ^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/ElementType#LOCAL_VARIABLE. +// ^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/ElementType#LOCAL_VARIABLE. METHOD, -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/ElementType#METHOD. +// ^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/ElementType#METHOD. PACKAGE, -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/ElementType#PACKAGE. +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/ElementType#PACKAGE. PARAMETER, -// ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/ElementType#PARAMETER. +// ^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/ElementType#PARAMETER. TYPE} -// ^^^^ reference semanticdb maven jdk 11 java/lang/annotation/ElementType#TYPE. +// ^^^^ reference scip-java maven jdk 11 java/lang/annotation/ElementType#TYPE. ) public @interface Annotations { -// ^^^^^^^^^^^ definition semanticdb maven . . minimized/Annotations# +// ^^^^^^^^^^^ definition scip-java maven . . minimized/Annotations# // display_name Annotations // signature_documentation java @Documented\n@Retention(RetentionPolicy.RUNTIME)\n@Target({CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE})\npublic @interface Annotations // kind Interface -// relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation# +// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# -// ⌄ enclosing_range_start semanticdb maven . . minimized/Annotations#value(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Annotations#value(). String value() default ""; -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^ definition semanticdb maven . . minimized/Annotations#value(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^ definition scip-java maven . . minimized/Annotations#value(). // display_name value // signature_documentation java public abstract String value() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/Annotations#value(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Annotations#value(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Annotations#format(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Annotations#format(). String format() default ""; -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^ definition semanticdb maven . . minimized/Annotations#format(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^ definition scip-java maven . . minimized/Annotations#format(). // display_name format // signature_documentation java public abstract String format() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/Annotations#format(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Annotations#format(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/Annotations# +//⌃ enclosing_range_end scip-java maven . . minimized/Annotations# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationsOnParameterizedTypes.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationsOnParameterizedTypes.java index 7026d6e9..48ca2d0d 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationsOnParameterizedTypes.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationsOnParameterizedTypes.java @@ -1,238 +1,238 @@ package minimized; import java.lang.reflect.Constructor; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/lang/ -// ^^^^^^^ reference semanticdb maven . . java/lang/reflect/ -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/lang/ +// ^^^^^^^ reference scip-java maven . . java/lang/reflect/ +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/reflect/Constructor# import java.lang.reflect.InvocationHandler; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/lang/ -// ^^^^^^^ reference semanticdb maven . . java/lang/reflect/ -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/InvocationHandler# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/lang/ +// ^^^^^^^ reference scip-java maven . . java/lang/reflect/ +// ^^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/reflect/InvocationHandler# import java.util.concurrent.ConcurrentHashMap; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^^^^^^^ reference semanticdb maven . . java/util/concurrent/ -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/ConcurrentHashMap# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^^^^^^^ reference scip-java maven . . java/util/concurrent/ +// ^^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/concurrent/ConcurrentHashMap# import java.util.concurrent.ConcurrentMap; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^^^^^^^ reference semanticdb maven . . java/util/concurrent/ -// ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/ConcurrentMap# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^^^^^^^ reference scip-java maven . . java/util/concurrent/ +// ^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/concurrent/ConcurrentMap# import java.util.function.Function; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^^^^^ reference semanticdb maven . . java/util/function/ -// ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^^^^^ reference scip-java maven . . java/util/function/ +// ^^^^^^^^ reference scip-java maven jdk 11 java/util/function/Function# -//⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypes# +//⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypes# public interface AnnotationsOnParameterizedTypes { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypes# +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypes# // display_name AnnotationsOnParameterizedTypes // signature_documentation java public interface AnnotationsOnParameterizedTypes // kind Interface -// ⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#getInstance(). +// ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypes#getInstance(). public static AnnotationsOnParameterizedTypes getInstance() { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypes# -// ^^^^^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#getInstance(). +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypes# +// ^^^^^^^^^^^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypes#getInstance(). // display_name getInstance // signature_documentation java public static AnnotationsOnParameterizedTypes getInstance() // kind StaticMethod return new AnnotationsOnParameterizedTypesImpl(); -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#``(). +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#``(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#getInstance(). +// ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypes#getInstance(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] -// ⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[W] -// ⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). +// ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] +// ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[W] +// ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). // ⌄ enclosing_range_start local 0 // ⌄ enclosing_range_start local 1 Function adapter(Class contract, Class wrappedClass); -// ^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] +// ^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] // display_name C // signature_documentation java C // kind TypeParameter -// ^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[W] +// ^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[W] // display_name W // signature_documentation java W // kind TypeParameter -// ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function# -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[W] -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] -// ^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). +// ^^^^^^^^ reference scip-java maven jdk 11 java/util/function/Function# +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[W] +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] +// ^^^^^^^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). // display_name adapter // signature_documentation java public abstract Function adapter(Class contract, Class wrappedClass) // kind AbstractMethod -// relationship is_reference is_implementation semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). -// ^^^^^ reference semanticdb maven jdk 11 java/lang/Class# -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] +// relationship is_reference is_implementation scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). +// ^^^^^ reference scip-java maven jdk 11 java/lang/Class# +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] // ^^^^^^^^ definition local 0 // display_name contract // signature_documentation java Class contract -// enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). -// ^^^^^ reference semanticdb maven jdk 11 java/lang/Class# -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[W] +// enclosing_symbol scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). +// ^^^^^ reference scip-java maven jdk 11 java/lang/Class# +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[W] // ^^^^^^^^^^^^ definition local 1 // display_name wrappedClass // signature_documentation java Class wrappedClass -// enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). +// enclosing_symbol scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). // ⌃ enclosing_range_end local 0 // ⌃ enclosing_range_end local 1 -// ⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] -// ⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[W] -// ⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). +// ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] +// ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[W] +// ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypes# +//⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypes# -//⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl# +//⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl# class AnnotationsOnParameterizedTypesImpl implements AnnotationsOnParameterizedTypes { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl# +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl# // display_name AnnotationsOnParameterizedTypesImpl // signature_documentation java class AnnotationsOnParameterizedTypesImpl implements AnnotationsOnParameterizedTypes // kind Class -// relationship is_implementation semanticdb maven . . minimized/AnnotationsOnParameterizedTypes# -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#``(). +// relationship is_implementation scip-java maven . . minimized/AnnotationsOnParameterizedTypes# +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#``(). // display_name // signature_documentation java AnnotationsOnParameterizedTypesImpl() // kind Constructor -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypes# -// ⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors. +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypes# +// ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors. private ConcurrentMap, Constructor> proxyConstructors = new ConcurrentHashMap<>(); -// ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/ConcurrentMap# -// ^^^^^ reference semanticdb maven jdk 11 java/lang/Class# -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor# -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors. +// ^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/concurrent/ConcurrentMap# +// ^^^^^ reference scip-java maven jdk 11 java/lang/Class# +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/reflect/Constructor# +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors. // display_name proxyConstructors // signature_documentation java private ConcurrentMap, Constructor> proxyConstructors // kind Field -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/ConcurrentHashMap#``(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors. +// ^^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/concurrent/ConcurrentHashMap#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors. -// ⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] -// ⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W] -// ⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). +// ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] +// ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W] +// ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). @Override -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override# +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Override# // ⌄ enclosing_range_start local 2 // ⌄ enclosing_range_start local 3 public Function adapter(Class contract, Class wrappedClass) { -// ^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] +// ^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] // display_name C // signature_documentation java C // kind TypeParameter -// ^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W] +// ^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W] // display_name W // signature_documentation java W // kind TypeParameter -// ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function# -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W] -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] -// ^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). +// ^^^^^^^^ reference scip-java maven jdk 11 java/util/function/Function# +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W] +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] +// ^^^^^^^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). // display_name adapter // signature_documentation java @Override\npublic Function adapter(Class contract, Class wrappedClass) // kind Method -// relationship is_reference is_implementation semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). -// ^^^^^ reference semanticdb maven jdk 11 java/lang/Class# -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] +// relationship is_reference is_implementation scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). +// ^^^^^ reference scip-java maven jdk 11 java/lang/Class# +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] // ^^^^^^^^ definition local 2 // display_name contract // signature_documentation java Class contract -// enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). -// ^^^^^ reference semanticdb maven jdk 11 java/lang/Class# -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W] +// enclosing_symbol scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). +// ^^^^^ reference scip-java maven jdk 11 java/lang/Class# +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W] // ^^^^^^^^^^^^ definition local 3 // display_name wrappedClass // signature_documentation java Class wrappedClass -// enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). +// enclosing_symbol scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). // ⌃ enclosing_range_end local 2 // ⌃ enclosing_range_end local 3 // ⌄ enclosing_range_start local 4 Function constructor = getConstructor(contract); -// ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function# -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/InvocationHandler# -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] +// ^^^^^^^^ reference scip-java maven jdk 11 java/util/function/Function# +// ^^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/reflect/InvocationHandler# +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] // ^^^^^^^^^^^ definition local 4 // display_name constructor // signature_documentation java Function constructor -// enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). +// enclosing_symbol scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). // kind Variable -// ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). +// ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). // ^^^^^^^^ reference local 2 // ⌃ enclosing_range_end local 4 System.out.println(constructor); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+9). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+9). // ^^^^^^^^^^^ reference local 4 return null; } -// ⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] -// ⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W] -// ⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). +// ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] +// ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W] +// ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] -// ⌄ enclosing_range_start semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). +// ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] +// ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). // ⌄ enclosing_range_start local 5 private Function getConstructor(Class contract) { -// ^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] +// ^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] // display_name T // signature_documentation java T // kind TypeParameter -// ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function# -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/InvocationHandler# -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] -// ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). +// ^^^^^^^^ reference scip-java maven jdk 11 java/util/function/Function# +// ^^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/reflect/InvocationHandler# +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] +// ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). // display_name getConstructor // signature_documentation java private Function getConstructor(Class contract) // kind Method -// ^^^^^ reference semanticdb maven jdk 11 java/lang/Class# -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] +// ^^^^^ reference scip-java maven jdk 11 java/lang/Class# +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] // ^^^^^^^^ definition local 5 // display_name contract // signature_documentation java Class contract -// enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). +// enclosing_symbol scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). // ⌃ enclosing_range_end local 5 // ⌄ enclosing_range_start local 6 @SuppressWarnings("unchecked") -// ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings# +// ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# // ⌄ enclosing_range_start local 7 Constructor constructor = (Constructor) proxyConstructors.computeIfAbsent(contract, c -> { -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor# -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/reflect/Constructor# +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] // ^^^^^^^^^^^ definition local 6 // display_name constructor // signature_documentation java @SuppressWarnings("unchecked")\nConstructor constructor -// enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). +// enclosing_symbol scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). // kind Variable -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor# -// ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors. -// ^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/ConcurrentMap#computeIfAbsent(). +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/reflect/Constructor# +// ^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] +// ^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors. +// ^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/concurrent/ConcurrentMap#computeIfAbsent(). // ^^^^^^^^ reference local 5 // ^ definition local 7 // display_name c // signature_documentation java Class c -// enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). +// enclosing_symbol scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). // ⌃ enclosing_range_end local 7 return null; }); // ⌃ enclosing_range_end local 6 System.out.println(constructor); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+9). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+9). // ^^^^^^^^^^^ reference local 6 return null; } -// ⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] -// ⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). - }//⌃ enclosing_range_end semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl# +// ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] +// ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). + }//⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java index 5b997a6b..e804e3e5 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java @@ -1,62 +1,62 @@ package minimized; import java.util.function.Function; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^^^^^ reference semanticdb maven . . java/util/function/ -// ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^^^^^ reference scip-java maven . . java/util/function/ +// ^^^^^^^^ reference scip-java maven jdk 11 java/util/function/Function# -//⌄ enclosing_range_start semanticdb maven . . minimized/AnonymousClasses# +//⌄ enclosing_range_start scip-java maven . . minimized/AnonymousClasses# @SuppressWarnings("ALL") -// ^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings# +// ^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# public class AnonymousClasses { -// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnonymousClasses# +// ^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnonymousClasses# // display_name AnonymousClasses // signature_documentation java @SuppressWarnings("ALL")\npublic class AnonymousClasses // kind Class -// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnonymousClasses#``(). +// ^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnonymousClasses#``(). // display_name // signature_documentation java public AnonymousClasses() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/AnonymousClasses#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/AnonymousClasses#app(). // ⌄ enclosing_range_start local 0 public static int app(int n) { -// ^^^ definition semanticdb maven . . minimized/AnonymousClasses#app(). +// ^^^ definition scip-java maven . . minimized/AnonymousClasses#app(). // display_name app // signature_documentation java public static int app(int n) // kind StaticMethod // ^ definition local 0 // display_name n // signature_documentation java int n -// enclosing_symbol semanticdb maven . . minimized/AnonymousClasses#app(). +// enclosing_symbol scip-java maven . . minimized/AnonymousClasses#app(). // ⌃ enclosing_range_end local 0 // ⌄ enclosing_range_start local 1 Function fn = -// ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function# -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# +// ^^^^^^^^ reference scip-java maven jdk 11 java/util/function/Function# +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# // ^^ definition local 1 // display_name fn // signature_documentation java Function fn -// enclosing_symbol semanticdb maven . . minimized/AnonymousClasses#app(). +// enclosing_symbol scip-java maven . . minimized/AnonymousClasses#app(). // kind Variable new Function() { -// ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function# -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# +// ^^^^^^^^ reference scip-java maven jdk 11 java/util/function/Function# +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# // ⌄ enclosing_range_start local 3 @Override -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override# +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Override# // ⌄ enclosing_range_start local 4 public Integer apply(Integer integer) { -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# // ^^^^^ definition local 3 // display_name apply // signature_documentation java @Override\npublic Integer apply(Integer integer) // enclosing_symbol local 2 // kind Method -// relationship is_reference is_implementation semanticdb maven jdk 11 java/util/function/Function#apply(). -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# +// relationship is_reference is_implementation scip-java maven jdk 11 java/util/function/Function#apply(). +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# // ^^^^^^^ definition local 4 // display_name integer // signature_documentation java Integer integer @@ -72,9 +72,9 @@ public Integer apply(Integer integer) { return fn.apply(n); // ^^ reference local 1 -// ^^^^^ reference semanticdb maven jdk 11 java/util/function/Function#apply(). +// ^^^^^ reference scip-java maven jdk 11 java/util/function/Function#apply(). // ^ reference local 0 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/AnonymousClasses#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/AnonymousClasses#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/AnonymousClasses# +//⌃ enclosing_range_end scip-java maven . . minimized/AnonymousClasses# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java index e3a05bc9..b788cf02 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java @@ -1,19 +1,19 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/Arrays# +//⌄ enclosing_range_start scip-java maven . . minimized/Arrays# public class Arrays { -// ^^^^^^ definition semanticdb maven . . minimized/Arrays# +// ^^^^^^ definition scip-java maven . . minimized/Arrays# // display_name Arrays // signature_documentation java public class Arrays // kind Class -// ^^^^^^ definition semanticdb maven . . minimized/Arrays#``(). +// ^^^^^^ definition scip-java maven . . minimized/Arrays#``(). // display_name // signature_documentation java public Arrays() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/Arrays#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Arrays#app(). public static String app() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^ definition semanticdb maven . . minimized/Arrays#app(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^ definition scip-java maven . . minimized/Arrays#app(). // display_name app // signature_documentation java public static String app() // kind StaticMethod @@ -22,16 +22,16 @@ public static String app() { // ^ definition local 0 // display_name a // signature_documentation java int[] a -// enclosing_symbol semanticdb maven . . minimized/Arrays#app(). +// enclosing_symbol scip-java maven . . minimized/Arrays#app(). // kind Variable // ⌃ enclosing_range_end local 0 // ⌄ enclosing_range_start local 1 String[] b = {"1", "2", "3"}; -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 1 // display_name b // signature_documentation java String[] b -// enclosing_symbol semanticdb maven . . minimized/Arrays#app(). +// enclosing_symbol scip-java maven . . minimized/Arrays#app(). // kind Variable // ⌃ enclosing_range_end local 1 // ⌄ enclosing_range_start local 2 @@ -39,16 +39,16 @@ public static String app() { // ^ definition local 2 // display_name c // signature_documentation java int[][] c -// enclosing_symbol semanticdb maven . . minimized/Arrays#app(). +// enclosing_symbol scip-java maven . . minimized/Arrays#app(). // kind Variable // ⌃ enclosing_range_end local 2 // ⌄ enclosing_range_start local 3 String[][] d = {{"1"}, {"2"}, {"3"}}; -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 3 // display_name d // signature_documentation java String[][] d -// enclosing_symbol semanticdb maven . . minimized/Arrays#app(). +// enclosing_symbol scip-java maven . . minimized/Arrays#app(). // kind Variable // ⌃ enclosing_range_end local 3 return b[0] + a[0] + c[1][0] + d[1][0]; @@ -57,6 +57,6 @@ public static String app() { // ^ reference local 2 // ^ reference local 3 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Arrays#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Arrays#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/Arrays# +//⌃ enclosing_range_end scip-java maven . . minimized/Arrays# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java index b5d2a071..e69bec05 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java @@ -1,27 +1,27 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/ClassOf# +//⌄ enclosing_range_start scip-java maven . . minimized/ClassOf# public class ClassOf { -// ^^^^^^^ definition semanticdb maven . . minimized/ClassOf# +// ^^^^^^^ definition scip-java maven . . minimized/ClassOf# // display_name ClassOf // signature_documentation java public class ClassOf // kind Class -// ^^^^^^^ definition semanticdb maven . . minimized/ClassOf#``(). +// ^^^^^^^ definition scip-java maven . . minimized/ClassOf#``(). // display_name // signature_documentation java public ClassOf() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/ClassOf#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/ClassOf#app(). public static String app() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^ definition semanticdb maven . . minimized/ClassOf#app(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^ definition scip-java maven . . minimized/ClassOf#app(). // display_name app // signature_documentation java public static String app() // kind StaticMethod return ClassOf.class.getName(); -// ^^^^^^^ reference semanticdb maven . . minimized/ClassOf# -// ^^^^^ reference semanticdb maven . . minimized/ClassOf#class. -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Class#getName(). +// ^^^^^^^ reference scip-java maven . . minimized/ClassOf# +// ^^^^^ reference scip-java maven . . minimized/ClassOf#class. +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Class#getName(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/ClassOf#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/ClassOf#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/ClassOf# +//⌃ enclosing_range_end scip-java maven . . minimized/ClassOf# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java index db59496f..f402eafb 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java @@ -1,43 +1,43 @@ package minimized; /** Example class docstring. */ -//⌄ enclosing_range_start semanticdb maven . . minimized/Docstrings# +//⌄ enclosing_range_start scip-java maven . . minimized/Docstrings# public class Docstrings { -// ^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings# +// ^^^^^^^^^^ definition scip-java maven . . minimized/Docstrings# // display_name Docstrings // signature_documentation java public class Docstrings // kind Class // documentation Example class docstring. -// ^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings#``(). +// ^^^^^^^^^^ definition scip-java maven . . minimized/Docstrings#``(). // display_name // signature_documentation java public Docstrings() // kind Constructor /** Example field docstring. */ -// ⌄ enclosing_range_start semanticdb maven . . minimized/Docstrings#field. +// ⌄ enclosing_range_start scip-java maven . . minimized/Docstrings#field. public static int field = 42; -// ^^^^^ definition semanticdb maven . . minimized/Docstrings#field. +// ^^^^^ definition scip-java maven . . minimized/Docstrings#field. // display_name field // signature_documentation java public static int field // kind StaticField // documentation Example field docstring. -// ⌃ enclosing_range_end semanticdb maven . . minimized/Docstrings#field. +// ⌃ enclosing_range_end scip-java maven . . minimized/Docstrings#field. /** * Example method docstring. * * @return 42. */ -// ⌄ enclosing_range_start semanticdb maven . . minimized/Docstrings#method(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Docstrings#method(). public static int method() { -// ^^^^^^ definition semanticdb maven . . minimized/Docstrings#method(). +// ^^^^^^ definition scip-java maven . . minimized/Docstrings#method(). // display_name method // signature_documentation java public static int method() // kind StaticMethod // documentation Example method docstring.\n\n @return 42.\n return 42; } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Docstrings#method(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Docstrings#method(). /** * Example method parameter docstring. @@ -45,10 +45,10 @@ public static int method() { * @param n The parameter. * @return The number + 42. */ -// ⌄ enclosing_range_start semanticdb maven . . minimized/Docstrings#methodParameter(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Docstrings#methodParameter(). // ⌄ enclosing_range_start local 0 public static int methodParameter(int n) { -// ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings#methodParameter(). +// ^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Docstrings#methodParameter(). // display_name methodParameter // signature_documentation java public static int methodParameter(int n) // kind StaticMethod @@ -56,27 +56,27 @@ public static int methodParameter(int n) { // ^ definition local 0 // display_name n // signature_documentation java int n -// enclosing_symbol semanticdb maven . . minimized/Docstrings#methodParameter(). +// enclosing_symbol scip-java maven . . minimized/Docstrings#methodParameter(). // ⌃ enclosing_range_end local 0 return n + 42; // ^ reference local 0 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Docstrings#methodParameter(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Docstrings#methodParameter(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Docstrings#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Docstrings#app(). public static String app() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^ definition semanticdb maven . . minimized/Docstrings#app(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^ definition scip-java maven . . minimized/Docstrings#app(). // display_name app // signature_documentation java public static String app() // kind StaticMethod return String.format("%s%s%s", field, method(), methodParameter(42)); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#format(). -// ^^^^^ reference semanticdb maven . . minimized/Docstrings#field. -// ^^^^^^ reference semanticdb maven . . minimized/Docstrings#method(). -// ^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Docstrings#methodParameter(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String#format(). +// ^^^^^ reference scip-java maven . . minimized/Docstrings#field. +// ^^^^^^ reference scip-java maven . . minimized/Docstrings#method(). +// ^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Docstrings#methodParameter(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Docstrings#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Docstrings#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/Docstrings# +//⌃ enclosing_range_end scip-java maven . . minimized/Docstrings# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/EnumImplementsInterface.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/EnumImplementsInterface.java index 27cd80af..bd64a49e 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/EnumImplementsInterface.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/EnumImplementsInterface.java @@ -1,37 +1,37 @@ package minimized; import java.io.Serializable; -// ^^^^ reference semanticdb maven . . java/ -// ^^ reference semanticdb maven . . java/io/ -// ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/Serializable# +// ^^^^ reference scip-java maven . . java/ +// ^^ reference scip-java maven . . java/io/ +// ^^^^^^^^^^^^ reference scip-java maven jdk 11 java/io/Serializable# -//⌄ enclosing_range_start semanticdb maven . . minimized/EnumImplementsInterface# +//⌄ enclosing_range_start scip-java maven . . minimized/EnumImplementsInterface# enum EnumImplementsInterface implements Serializable { -// ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/EnumImplementsInterface# +// ^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/EnumImplementsInterface# // display_name EnumImplementsInterface // signature_documentation java enum EnumImplementsInterface implements Serializable // kind Enum -// relationship is_implementation semanticdb maven jdk 11 java/io/Serializable# -// relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable# -// relationship is_implementation semanticdb maven jdk 11 java/lang/Enum# -// ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/EnumImplementsInterface#``(). +// relationship is_implementation scip-java maven jdk 11 java/io/Serializable# +// relationship is_implementation scip-java maven jdk 11 java/lang/Comparable# +// relationship is_implementation scip-java maven jdk 11 java/lang/Enum# +// ^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/EnumImplementsInterface#``(). // display_name // signature_documentation java private EnumImplementsInterface() // kind Constructor -// ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/Serializable# -// ⌄ enclosing_range_start semanticdb maven . . minimized/EnumImplementsInterface#A. +// ^^^^^^^^^^^^ reference scip-java maven jdk 11 java/io/Serializable# +// ⌄ enclosing_range_start scip-java maven . . minimized/EnumImplementsInterface#A. A, -// ^ definition semanticdb maven . . minimized/EnumImplementsInterface#A. +// ^ definition scip-java maven . . minimized/EnumImplementsInterface#A. // display_name A // signature_documentation java EnumImplementsInterface.A /* ordinal 0 */ -// ^ reference semanticdb maven . . minimized/EnumImplementsInterface#``(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/EnumImplementsInterface#A. -// ⌄ enclosing_range_start semanticdb maven . . minimized/EnumImplementsInterface#B. +// ^ reference scip-java maven . . minimized/EnumImplementsInterface#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/EnumImplementsInterface#A. +// ⌄ enclosing_range_start scip-java maven . . minimized/EnumImplementsInterface#B. B -// ^ definition semanticdb maven . . minimized/EnumImplementsInterface#B. +// ^ definition scip-java maven . . minimized/EnumImplementsInterface#B. // display_name B // signature_documentation java EnumImplementsInterface.B /* ordinal 1 */ -// ^ reference semanticdb maven . . minimized/EnumImplementsInterface#``(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/EnumImplementsInterface#B. +// ^ reference scip-java maven . . minimized/EnumImplementsInterface#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/EnumImplementsInterface#B. } -//⌃ enclosing_range_end semanticdb maven . . minimized/EnumImplementsInterface# +//⌃ enclosing_range_end scip-java maven . . minimized/EnumImplementsInterface# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java index 2e8cf63c..f4fcf952 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java @@ -1,123 +1,123 @@ package minimized; import java.util.Arrays; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^^^ reference scip-java maven jdk 11 java/util/Arrays# import java.util.stream.Collectors; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^^^ reference semanticdb maven . . java/util/stream/ -// ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/stream/Collectors# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^^^ reference scip-java maven . . java/util/stream/ +// ^^^^^^^^^^ reference scip-java maven jdk 11 java/util/stream/Collectors# -//⌄ enclosing_range_start semanticdb maven . . minimized/Enums# +//⌄ enclosing_range_start scip-java maven . . minimized/Enums# enum Enums { -// ^^^^^ definition semanticdb maven . . minimized/Enums# +// ^^^^^ definition scip-java maven . . minimized/Enums# // display_name Enums // signature_documentation java enum Enums // kind Enum -// relationship is_implementation semanticdb maven jdk 11 java/io/Serializable# -// relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable# -// relationship is_implementation semanticdb maven jdk 11 java/lang/Enum# -// ⌄ enclosing_range_start semanticdb maven . . minimized/Enums#A. +// relationship is_implementation scip-java maven jdk 11 java/io/Serializable# +// relationship is_implementation scip-java maven jdk 11 java/lang/Comparable# +// relationship is_implementation scip-java maven jdk 11 java/lang/Enum# +// ⌄ enclosing_range_start scip-java maven . . minimized/Enums#A. A("A", 420), -// ^ definition semanticdb maven . . minimized/Enums#A. +// ^ definition scip-java maven . . minimized/Enums#A. // display_name A("A", 420) // signature_documentation java Enums.A("A", 420) /* ordinal 0 */ -// ^ reference semanticdb maven . . minimized/Enums#``(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/Enums#A. -// ⌄ enclosing_range_start semanticdb maven . . minimized/Enums#B. +// ^ reference scip-java maven . . minimized/Enums#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Enums#A. +// ⌄ enclosing_range_start scip-java maven . . minimized/Enums#B. B("B", 1), -// ^ definition semanticdb maven . . minimized/Enums#B. +// ^ definition scip-java maven . . minimized/Enums#B. // display_name B("B", 1) // signature_documentation java Enums.B("B", 1) /* ordinal 1 */ -// ^ reference semanticdb maven . . minimized/Enums#``(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/Enums#B. -// ⌄ enclosing_range_start semanticdb maven . . minimized/Enums#C. +// ^ reference scip-java maven . . minimized/Enums#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Enums#B. +// ⌄ enclosing_range_start scip-java maven . . minimized/Enums#C. C("C", 5); -// ^ definition semanticdb maven . . minimized/Enums#C. +// ^ definition scip-java maven . . minimized/Enums#C. // display_name C("C", 5) // signature_documentation java Enums.C("C", 5) /* ordinal 2 */ -// ^ reference semanticdb maven . . minimized/Enums#``(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/Enums#C. -// ⌄ enclosing_range_start semanticdb maven . . minimized/Enums#value. +// ^ reference scip-java maven . . minimized/Enums#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Enums#C. +// ⌄ enclosing_range_start scip-java maven . . minimized/Enums#value. public String value; -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^ definition semanticdb maven . . minimized/Enums#value. +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^ definition scip-java maven . . minimized/Enums#value. // display_name value // signature_documentation java public String value // kind Field -// ⌃ enclosing_range_end semanticdb maven . . minimized/Enums#value. +// ⌃ enclosing_range_end scip-java maven . . minimized/Enums#value. -// ⌄ enclosing_range_start semanticdb maven . . minimized/Enums#``(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Enums#``(). // ⌄ enclosing_range_start local 0 // ⌄ enclosing_range_start local 1 Enums(String value, int a) { -// ^^^^^ definition semanticdb maven . . minimized/Enums#``(). +// ^^^^^ definition scip-java maven . . minimized/Enums#``(). // display_name // signature_documentation java private Enums(String value, int a) // kind Constructor -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^^ definition local 0 // display_name value // signature_documentation java String value -// enclosing_symbol semanticdb maven . . minimized/Enums#``(). +// enclosing_symbol scip-java maven . . minimized/Enums#``(). // ^ definition local 1 // display_name a // signature_documentation java int a -// enclosing_symbol semanticdb maven . . minimized/Enums#``(). +// enclosing_symbol scip-java maven . . minimized/Enums#``(). // ⌃ enclosing_range_end local 0 // ⌃ enclosing_range_end local 1 this.value = value; -// ^^^^^ reference semanticdb maven . . minimized/Enums#value. +// ^^^^^ reference scip-java maven . . minimized/Enums#value. // ^^^^^ reference local 0 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Enums#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Enums#``(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Enums#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Enums#app(). public static String app() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^ definition semanticdb maven . . minimized/Enums#app(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^ definition scip-java maven . . minimized/Enums#app(). // display_name app // signature_documentation java public static String app() // kind StaticMethod // ⌄ enclosing_range_start local 2 // ⌄ enclosing_range_start local 3 String all = Arrays.stream(values()).map(e -> e.value).map(Enums::valueOf).collect(Collectors.toList()).toString(); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^ definition local 2 // display_name all // signature_documentation java String all -// enclosing_symbol semanticdb maven . . minimized/Enums#app(). +// enclosing_symbol scip-java maven . . minimized/Enums#app(). // kind Variable -// ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays# -// ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#stream(). -// ^^^^^^ reference semanticdb maven . . minimized/Enums#values(). -// ^^^ reference semanticdb maven jdk 11 java/util/stream/Stream#map(). +// ^^^^^^ reference scip-java maven jdk 11 java/util/Arrays# +// ^^^^^^ reference scip-java maven jdk 11 java/util/Arrays#stream(). +// ^^^^^^ reference scip-java maven . . minimized/Enums#values(). +// ^^^ reference scip-java maven jdk 11 java/util/stream/Stream#map(). // ^ definition local 3 // display_name e // signature_documentation java Enums e -// enclosing_symbol semanticdb maven . . minimized/Enums#app(). +// enclosing_symbol scip-java maven . . minimized/Enums#app(). // ^ reference local 3 -// ^^^^^ reference semanticdb maven . . minimized/Enums#value. -// ^^^ reference semanticdb maven jdk 11 java/util/stream/Stream#map(). -// ^^^^^ reference semanticdb maven . . minimized/Enums# -// ^^^^^^^ reference semanticdb maven . . minimized/Enums#valueOf(). -// ^^^^^^^ reference semanticdb maven jdk 11 java/util/stream/Stream#collect(+1). -// ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/stream/Collectors# -// ^^^^^^ reference semanticdb maven jdk 11 java/util/stream/Collectors#toList(). -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#toString(). +// ^^^^^ reference scip-java maven . . minimized/Enums#value. +// ^^^ reference scip-java maven jdk 11 java/util/stream/Stream#map(). +// ^^^^^ reference scip-java maven . . minimized/Enums# +// ^^^^^^^ reference scip-java maven . . minimized/Enums#valueOf(). +// ^^^^^^^ reference scip-java maven jdk 11 java/util/stream/Stream#collect(+1). +// ^^^^^^^^^^ reference scip-java maven jdk 11 java/util/stream/Collectors# +// ^^^^^^ reference scip-java maven jdk 11 java/util/stream/Collectors#toList(). +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Object#toString(). // ⌃ enclosing_range_end local 3 // ⌃ enclosing_range_end local 2 return all + A.value + B.value + C.value; // ^^^ reference local 2 -// ^ reference semanticdb maven . . minimized/Enums#A. -// ^^^^^ reference semanticdb maven . . minimized/Enums#value. -// ^ reference semanticdb maven . . minimized/Enums#B. -// ^^^^^ reference semanticdb maven . . minimized/Enums#value. -// ^ reference semanticdb maven . . minimized/Enums#C. -// ^^^^^ reference semanticdb maven . . minimized/Enums#value. +// ^ reference scip-java maven . . minimized/Enums#A. +// ^^^^^ reference scip-java maven . . minimized/Enums#value. +// ^ reference scip-java maven . . minimized/Enums#B. +// ^^^^^ reference scip-java maven . . minimized/Enums#value. +// ^ reference scip-java maven . . minimized/Enums#C. +// ^^^^^ reference scip-java maven . . minimized/Enums#value. } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Enums#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Enums#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/Enums# +//⌃ enclosing_range_end scip-java maven . . minimized/Enums# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java index 3a9236e2..903159eb 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java @@ -1,171 +1,171 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/Fields# +//⌄ enclosing_range_start scip-java maven . . minimized/Fields# public class Fields { -// ^^^^^^ definition semanticdb maven . . minimized/Fields# +// ^^^^^^ definition scip-java maven . . minimized/Fields# // display_name Fields // signature_documentation java public class Fields // kind Class -// ^^^^^^ definition semanticdb maven . . minimized/Fields#``(). +// ^^^^^^ definition scip-java maven . . minimized/Fields#``(). // display_name // signature_documentation java public Fields() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#privateField. +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#privateField. private final int privateField = 0; -// ^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#privateField. +// ^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#privateField. // display_name privateField // signature_documentation java private final int privateField // kind Field -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#privateField. -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#protectedField. +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#privateField. +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#protectedField. protected int protectedField = 0; -// ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#protectedField. +// ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#protectedField. // display_name protectedField // signature_documentation java protected int protectedField // kind Field -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#protectedField. -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#publicField. +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#protectedField. +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#publicField. public int publicField = 0; -// ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#publicField. +// ^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#publicField. // display_name publicField // signature_documentation java public int publicField // kind Field -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#publicField. -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#staticPrivateField. +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#publicField. +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#staticPrivateField. private static final int staticPrivateField = 0; -// ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticPrivateField. +// ^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#staticPrivateField. // display_name staticPrivateField // signature_documentation java private static final int staticPrivateField // kind StaticField -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#staticPrivateField. -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#staticProtectedFields. +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#staticPrivateField. +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#staticProtectedFields. protected static int staticProtectedFields = 0; -// ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticProtectedFields. +// ^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#staticProtectedFields. // display_name staticProtectedFields // signature_documentation java protected static int staticProtectedFields // kind StaticField -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#staticProtectedFields. -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#staticPublicField. +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#staticProtectedFields. +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#staticPublicField. public static int staticPublicField = 0; -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticPublicField. +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#staticPublicField. // display_name staticPublicField // signature_documentation java public static int staticPublicField // kind StaticField -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#staticPublicField. +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#staticPublicField. -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#InnerFields# +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#InnerFields# public class InnerFields { -// ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields# +// ^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerFields# // display_name InnerFields // signature_documentation java public class InnerFields // kind Class -// ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields#``(). +// ^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerFields#``(). // display_name // signature_documentation java public InnerFields() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#InnerFields#publicInnerField. +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#InnerFields#publicInnerField. public int publicInnerField = publicField; -// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields#publicInnerField. +// ^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerFields#publicInnerField. // display_name publicInnerField // signature_documentation java public int publicInnerField // kind Field -// ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#publicField. -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#InnerFields#publicInnerField. +// ^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#publicField. +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#InnerFields#publicInnerField. } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#InnerFields# +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#InnerFields# -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#InnerStaticFields# +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#InnerStaticFields# public static class InnerStaticFields { -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields# +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerStaticFields# // display_name InnerStaticFields // signature_documentation java public static class InnerStaticFields // kind Class -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#``(). +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerStaticFields#``(). // display_name // signature_documentation java public InnerStaticFields() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField. +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField. public int publicNonStaticInnerField = 0; -// ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField. +// ^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField. // display_name publicNonStaticInnerField // signature_documentation java public int publicNonStaticInnerField // kind Field -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField. -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField. +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField. +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField. public static int publicStaticInnerField = 0; -// ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField. +// ^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField. // display_name publicStaticInnerField // signature_documentation java public static int publicStaticInnerField // kind StaticField -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField. +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField. } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#InnerStaticFields# +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#InnerStaticFields# -// ⌄ enclosing_range_start semanticdb maven . . minimized/Fields#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Fields#app(). public static String app() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^ definition semanticdb maven . . minimized/Fields#app(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^ definition scip-java maven . . minimized/Fields#app(). // display_name app // signature_documentation java public static String app() // kind StaticMethod // ⌄ enclosing_range_start local 0 Fields fields = new Fields(); -// ^^^^^^ reference semanticdb maven . . minimized/Fields# +// ^^^^^^ reference scip-java maven . . minimized/Fields# // ^^^^^^ definition local 0 // display_name fields // signature_documentation java Fields fields -// enclosing_symbol semanticdb maven . . minimized/Fields#app(). +// enclosing_symbol scip-java maven . . minimized/Fields#app(). // kind Variable -// ^^^^^^ reference semanticdb maven . . minimized/Fields#``(). +// ^^^^^^ reference scip-java maven . . minimized/Fields#``(). // ⌃ enclosing_range_end local 0 // ⌄ enclosing_range_start local 1 InnerFields innerFields = fields.new InnerFields(); -// ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerFields# +// ^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerFields# // ^^^^^^^^^^^ definition local 1 // display_name innerFields // signature_documentation java InnerFields innerFields -// enclosing_symbol semanticdb maven . . minimized/Fields#app(). +// enclosing_symbol scip-java maven . . minimized/Fields#app(). // kind Variable // ^^^^^^ reference local 0 -// ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerFields#``(). +// ^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerFields#``(). // ⌃ enclosing_range_end local 1 // ⌄ enclosing_range_start local 2 InnerStaticFields innerStaticFields = new InnerStaticFields(); -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerStaticFields# +// ^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerStaticFields# // ^^^^^^^^^^^^^^^^^ definition local 2 // display_name innerStaticFields // signature_documentation java InnerStaticFields innerStaticFields -// enclosing_symbol semanticdb maven . . minimized/Fields#app(). +// enclosing_symbol scip-java maven . . minimized/Fields#app(). // kind Variable -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerStaticFields#``(). +// ^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerStaticFields#``(). // ⌃ enclosing_range_end local 2 return String.valueOf(fields.privateField) -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/String#valueOf(+5). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/String#valueOf(+5). // ^^^^^^ reference local 0 -// ^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#privateField. +// ^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#privateField. + fields.protectedField // ^^^^^^ reference local 0 -// ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#protectedField. +// ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#protectedField. + fields.publicField // ^^^^^^ reference local 0 -// ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#publicField. +// ^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#publicField. + staticPrivateField -// ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#staticPrivateField. +// ^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#staticPrivateField. + staticProtectedFields -// ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#staticProtectedFields. +// ^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#staticProtectedFields. + staticPublicField -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#staticPublicField. +// ^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#staticPublicField. + innerFields.publicInnerField // ^^^^^^^^^^^ reference local 1 -// ^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerFields#publicInnerField. +// ^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerFields#publicInnerField. + InnerStaticFields.publicStaticInnerField -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerStaticFields# -// ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField. +// ^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerStaticFields# +// ^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField. + innerStaticFields.publicNonStaticInnerField; // ^^^^^^^^^^^^^^^^^ reference local 2 -// ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField. +// ^^^^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField. } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Fields#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Fields#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/Fields# +//⌃ enclosing_range_end scip-java maven . . minimized/Fields# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java index c1164a5c..6ecc398d 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java @@ -1,47 +1,47 @@ package minimized; import java.util.Collections; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Collections# import java.util.List; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^ reference semanticdb maven jdk 11 java/util/List# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^ reference scip-java maven jdk 11 java/util/List# -//⌄ enclosing_range_start semanticdb maven . . minimized/ForComprehensions# +//⌄ enclosing_range_start scip-java maven . . minimized/ForComprehensions# public class ForComprehensions { -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ForComprehensions# +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ForComprehensions# // display_name ForComprehensions // signature_documentation java public class ForComprehensions // kind Class -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ForComprehensions#``(). +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ForComprehensions#``(). // display_name // signature_documentation java public ForComprehensions() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/ForComprehensions#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/ForComprehensions#app(). // ⌄ enclosing_range_start local 0 public static int app(int n) { -// ^^^ definition semanticdb maven . . minimized/ForComprehensions#app(). +// ^^^ definition scip-java maven . . minimized/ForComprehensions#app(). // display_name app // signature_documentation java public static int app(int n) // kind StaticMethod // ^ definition local 0 // display_name n // signature_documentation java int n -// enclosing_symbol semanticdb maven . . minimized/ForComprehensions#app(). +// enclosing_symbol scip-java maven . . minimized/ForComprehensions#app(). // ⌃ enclosing_range_end local 0 // ⌄ enclosing_range_start local 1 List integers = Collections.singletonList(n); -// ^^^^ reference semanticdb maven jdk 11 java/util/List# -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# +// ^^^^ reference scip-java maven jdk 11 java/util/List# +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# // ^^^^^^^^ definition local 1 // display_name integers // signature_documentation java List integers -// enclosing_symbol semanticdb maven . . minimized/ForComprehensions#app(). +// enclosing_symbol scip-java maven . . minimized/ForComprehensions#app(). // kind Variable -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections# -// ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#singletonList(). +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Collections# +// ^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Collections#singletonList(). // ^ reference local 0 // ⌃ enclosing_range_end local 1 // ⌄ enclosing_range_start local 2 @@ -49,7 +49,7 @@ public static int app(int n) { // ^^^^^^ definition local 2 // display_name result // signature_documentation java int result -// enclosing_symbol semanticdb maven . . minimized/ForComprehensions#app(). +// enclosing_symbol scip-java maven . . minimized/ForComprehensions#app(). // kind Variable // ⌃ enclosing_range_end local 2 // ⌄ enclosing_range_start local 3 @@ -57,7 +57,7 @@ public static int app(int n) { // ^ definition local 3 // display_name i // signature_documentation java int i -// enclosing_symbol semanticdb maven . . minimized/ForComprehensions#app(). +// enclosing_symbol scip-java maven . . minimized/ForComprehensions#app(). // kind Variable // ^^^^^^^^ reference local 1 // ⌃ enclosing_range_end local 3 @@ -68,6 +68,6 @@ public static int app(int n) { return result; // ^^^^^^ reference local 2 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/ForComprehensions#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/ForComprehensions#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/ForComprehensions# +//⌃ enclosing_range_end scip-java maven . . minimized/ForComprehensions# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java index b622416d..878777e0 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java @@ -1,395 +1,395 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses# +//⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses# public class InnerClasses { -// ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses# +// ^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses# // display_name InnerClasses // signature_documentation java public class InnerClasses // kind Class -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#exampleField. +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#exampleField. private final int exampleField; -// ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#exampleField. +// ^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#exampleField. // display_name exampleField // signature_documentation java private final int exampleField // kind Field -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#exampleField. +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#exampleField. -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#STRING. +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#STRING. private static final String STRING = "asdf"; -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^ definition semanticdb maven . . minimized/InnerClasses#STRING. +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^ definition scip-java maven . . minimized/InnerClasses#STRING. // display_name STRING // signature_documentation java private static final String STRING // kind StaticField -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#STRING. +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#STRING. -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#top. +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#top. private static final int top = 5; -// ^^^ definition semanticdb maven . . minimized/InnerClasses#top. +// ^^^ definition scip-java maven . . minimized/InnerClasses#top. // display_name top // signature_documentation java private static final int top // kind StaticField -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#top. -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#bottom. +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#top. +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#bottom. private static final int bottom = 10; -// ^^^^^^ definition semanticdb maven . . minimized/InnerClasses#bottom. +// ^^^^^^ definition scip-java maven . . minimized/InnerClasses#bottom. // display_name bottom // signature_documentation java private static final int bottom // kind StaticField -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#bottom. +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#bottom. -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#``(). +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#``(). // ⌄ enclosing_range_start local 0 public InnerClasses(int exampleField) { -// ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#``(). +// ^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#``(). // display_name // signature_documentation java public InnerClasses(int exampleField) // kind Constructor // ^^^^^^^^^^^^ definition local 0 // display_name exampleField // signature_documentation java int exampleField -// enclosing_symbol semanticdb maven . . minimized/InnerClasses#``(). +// enclosing_symbol scip-java maven . . minimized/InnerClasses#``(). // ⌃ enclosing_range_end local 0 this.exampleField = exampleField; -// ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#exampleField. +// ^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#exampleField. // ^^^^^^^^^^^^ reference local 0 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#``(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerEnum# +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerEnum# public enum InnerEnum { -// ^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum# +// ^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerEnum# // display_name InnerEnum // signature_documentation java public enum InnerEnum // kind Enum -// relationship is_implementation semanticdb maven jdk 11 java/io/Serializable# -// relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable# -// relationship is_implementation semanticdb maven jdk 11 java/lang/Enum# -// ^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#``(). +// relationship is_implementation scip-java maven jdk 11 java/io/Serializable# +// relationship is_implementation scip-java maven jdk 11 java/lang/Comparable# +// relationship is_implementation scip-java maven jdk 11 java/lang/Enum# +// ^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerEnum#``(). // display_name // signature_documentation java private InnerEnum() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerEnum#A. +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerEnum#A. A, -// ^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#A. +// ^ definition scip-java maven . . minimized/InnerClasses#InnerEnum#A. // display_name A // signature_documentation java InnerEnum.A /* ordinal 0 */ -// ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#``(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerEnum#A. -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerEnum#B. +// ^ reference scip-java maven . . minimized/InnerClasses#InnerEnum#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerEnum#A. +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerEnum#B. B, -// ^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#B. +// ^ definition scip-java maven . . minimized/InnerClasses#InnerEnum#B. // display_name B // signature_documentation java InnerEnum.B /* ordinal 1 */ -// ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#``(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerEnum#B. -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerEnum#C. +// ^ reference scip-java maven . . minimized/InnerClasses#InnerEnum#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerEnum#B. +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerEnum#C. C -// ^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#C. +// ^ definition scip-java maven . . minimized/InnerClasses#InnerEnum#C. // display_name C // signature_documentation java InnerEnum.C /* ordinal 2 */ -// ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#``(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerEnum#C. +// ^ reference scip-java maven . . minimized/InnerClasses#InnerEnum#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerEnum#C. } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerEnum# +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerEnum# -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerInterface# -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerInterface#[A] -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerInterface#[B] +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerInterface# +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerInterface#[A] +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerInterface#[B] public interface InnerInterface { -// ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface# +// ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerInterface# // display_name InnerInterface // signature_documentation java public interface InnerInterface // kind Interface -// ^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#[A] +// ^ definition scip-java maven . . minimized/InnerClasses#InnerInterface#[A] // display_name A // signature_documentation java A // kind TypeParameter -// ^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#[B] +// ^ definition scip-java maven . . minimized/InnerClasses#InnerInterface#[B] // display_name B // signature_documentation java B // kind TypeParameter -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerInterface#apply(). +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). // ⌄ enclosing_range_start local 1 B apply(A a); -// ^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#[B] -// ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#apply(). +// ^ reference scip-java maven . . minimized/InnerClasses#InnerInterface#[B] +// ^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). // display_name apply // signature_documentation java public abstract B apply(A a) // kind AbstractMethod -// relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerClass#apply(). -// ^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#[A] +// relationship is_reference is_implementation scip-java maven . . minimized/InnerClasses#InnerClass#apply(). +// ^ reference scip-java maven . . minimized/InnerClasses#InnerInterface#[A] // ^ definition local 1 // display_name a // signature_documentation java A a -// enclosing_symbol semanticdb maven . . minimized/InnerClasses#InnerInterface#apply(). +// enclosing_symbol scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). // ⌃ enclosing_range_end local 1 -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerInterface#apply(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerInterface# -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerInterface#[A] -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerInterface#[B] +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerInterface# +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerInterface#[A] +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerInterface#[B] -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerAnnotation# +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerAnnotation# public @interface InnerAnnotation { -// ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerAnnotation# +// ^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerAnnotation# // display_name InnerAnnotation // signature_documentation java public @interface InnerAnnotation // kind Interface -// relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation# -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerAnnotation#value(). +// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerAnnotation#value(). int value(); -// ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerAnnotation#value(). +// ^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerAnnotation#value(). // display_name value // signature_documentation java public abstract int value() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerAnnotation#value(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerAnnotation#value(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerAnnotation# +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerAnnotation# -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerStaticClass# +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerStaticClass# @SuppressWarnings(STRING + " ") -// ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings# -// ^^^^^^ reference semanticdb maven . . minimized/InnerClasses#STRING. +// ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# +// ^^^^^^ reference scip-java maven . . minimized/InnerClasses#STRING. @InnerAnnotation(top / bottom) -// ^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerAnnotation# -// ^^^ reference semanticdb maven . . minimized/InnerClasses#top. -// ^^^^^^ reference semanticdb maven . . minimized/InnerClasses#bottom. +// ^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerAnnotation# +// ^^^ reference scip-java maven . . minimized/InnerClasses#top. +// ^^^^^^ reference scip-java maven . . minimized/InnerClasses#bottom. public static class InnerStaticClass { -// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass# +// ^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerStaticClass# // display_name InnerStaticClass // signature_documentation java @SuppressWarnings(STRING + " ")\n@InnerAnnotation(top / bottom)\npublic static class InnerStaticClass // kind Class -// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass#``(). +// ^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerStaticClass#``(). // display_name // signature_documentation java public InnerStaticClass() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). public static void innerStaticMethod() {} -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). // display_name innerStaticMethod // signature_documentation java public static void innerStaticMethod() // kind StaticMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerStaticClass# +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerStaticClass# -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerClass# +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerClass# public class InnerClass implements InnerInterface { -// ^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass# +// ^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerClass# // display_name InnerClass // signature_documentation java public class InnerClass implements InnerInterface // kind Class -// relationship is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface# -// ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface# -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerClass#field. +// relationship is_implementation scip-java maven . . minimized/InnerClasses#InnerInterface# +// ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerInterface# +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerClass#field. private final int field; -// ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#field. +// ^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerClass#field. // display_name field // signature_documentation java private final int field // kind Field -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerClass#field. +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerClass#field. -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerClass#``(). +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerClass#``(). // ⌄ enclosing_range_start local 2 public InnerClass(int field) { -// ^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#``(). +// ^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerClass#``(). // display_name // signature_documentation java public InnerClass(int field) // kind Constructor // ^^^^^ definition local 2 // display_name field // signature_documentation java int field -// enclosing_symbol semanticdb maven . . minimized/InnerClasses#InnerClass#``(). +// enclosing_symbol scip-java maven . . minimized/InnerClasses#InnerClass#``(). // ⌃ enclosing_range_end local 2 this.field = field; -// ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#field. +// ^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerClass#field. // ^^^^^ reference local 2 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerClass#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerClass#``(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerClass#innerMethod(). +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerClass#innerMethod(). public void innerMethod() { -// ^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#innerMethod(). +// ^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerClass#innerMethod(). // display_name innerMethod // signature_documentation java public void innerMethod() // kind Method System.out.println(field + exampleField); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+3). -// ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#field. -// ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#exampleField. +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+3). +// ^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerClass#field. +// ^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#exampleField. } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerClass#innerMethod(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerClass#innerMethod(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#InnerClass#apply(). +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerClass#apply(). @Override -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override# +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Override# // ⌄ enclosing_range_start local 3 public Integer apply(Integer integer) { -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# -// ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#apply(). +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# +// ^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerClass#apply(). // display_name apply // signature_documentation java @Override\npublic Integer apply(Integer integer) // kind Method -// relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#apply(). -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# +// relationship is_reference is_implementation scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# // ^^^^^^^ definition local 3 // display_name integer // signature_documentation java Integer integer -// enclosing_symbol semanticdb maven . . minimized/InnerClasses#InnerClass#apply(). +// enclosing_symbol scip-java maven . . minimized/InnerClasses#InnerClass#apply(). // ⌃ enclosing_range_end local 3 return field * integer; -// ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#field. +// ^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerClass#field. // ^^^^^^^ reference local 3 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerClass#apply(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerClass#apply(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#InnerClass# +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerClass# -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A] -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B] -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#runInnerInterface(). +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#runInnerInterface().[A] +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#runInnerInterface().[B] +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#runInnerInterface(). // ⌄ enclosing_range_start local 4 // ⌄ enclosing_range_start local 5 private static B runInnerInterface(InnerInterface fn, A a) { -// ^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A] +// ^ definition scip-java maven . . minimized/InnerClasses#runInnerInterface().[A] // display_name A // signature_documentation java A // kind TypeParameter -// ^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B] +// ^ definition scip-java maven . . minimized/InnerClasses#runInnerInterface().[B] // display_name B // signature_documentation java B // kind TypeParameter -// ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B] -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface(). +// ^ reference scip-java maven . . minimized/InnerClasses#runInnerInterface().[B] +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#runInnerInterface(). // display_name runInnerInterface // signature_documentation java private static B runInnerInterface(InnerInterface fn, A a) // kind StaticMethod -// ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface# -// ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A] -// ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B] +// ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerInterface# +// ^ reference scip-java maven . . minimized/InnerClasses#runInnerInterface().[A] +// ^ reference scip-java maven . . minimized/InnerClasses#runInnerInterface().[B] // ^^ definition local 4 // display_name fn // signature_documentation java InnerInterface fn -// enclosing_symbol semanticdb maven . . minimized/InnerClasses#runInnerInterface(). -// ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A] +// enclosing_symbol scip-java maven . . minimized/InnerClasses#runInnerInterface(). +// ^ reference scip-java maven . . minimized/InnerClasses#runInnerInterface().[A] // ^ definition local 5 // display_name a // signature_documentation java A a -// enclosing_symbol semanticdb maven . . minimized/InnerClasses#runInnerInterface(). +// enclosing_symbol scip-java maven . . minimized/InnerClasses#runInnerInterface(). // ⌃ enclosing_range_end local 4 // ⌃ enclosing_range_end local 5 return fn.apply(a); // ^^ reference local 4 -// ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#apply(). +// ^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). // ^ reference local 5 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A] -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B] -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#runInnerInterface(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#runInnerInterface().[A] +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#runInnerInterface().[B] +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#runInnerInterface(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#testEnum(). +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#testEnum(). // ⌄ enclosing_range_start local 6 public static void testEnum(InnerEnum magicEnum) { -// ^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#testEnum(). +// ^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#testEnum(). // display_name testEnum // signature_documentation java public static void testEnum(InnerEnum magicEnum) // kind StaticMethod -// ^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum# +// ^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerEnum# // ^^^^^^^^^ definition local 6 // display_name magicEnum // signature_documentation java InnerEnum magicEnum -// enclosing_symbol semanticdb maven . . minimized/InnerClasses#testEnum(). +// enclosing_symbol scip-java maven . . minimized/InnerClasses#testEnum(). // ⌃ enclosing_range_end local 6 if (System.nanoTime() > System.currentTimeMillis()) { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/System#nanoTime(). -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/System#currentTimeMillis(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/System#nanoTime(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/System#currentTimeMillis(). magicEnum = InnerEnum.B; // ^^^^^^^^^ reference local 6 -// ^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum# -// ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#B. +// ^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerEnum# +// ^ reference scip-java maven . . minimized/InnerClasses#InnerEnum#B. } switch (magicEnum) { // ^^^^^^^^^ reference local 6 case B: -// ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#B. +// ^ reference scip-java maven . . minimized/InnerClasses#InnerEnum#B. System.out.println("b"); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+8). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+8). break; case A: -// ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#A. +// ^ reference scip-java maven . . minimized/InnerClasses#InnerEnum#A. System.out.println("a"); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+8). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+8). break; default: break; } if (magicEnum == InnerEnum.A) System.out.println("a"); // ^^^^^^^^^ reference local 6 -// ^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum# -// ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#A. -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+8). +// ^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerEnum# +// ^ reference scip-java maven . . minimized/InnerClasses#InnerEnum#A. +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+8). else if (magicEnum == InnerEnum.C) System.out.println("b"); // ^^^^^^^^^ reference local 6 -// ^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum# -// ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#C. -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+8). +// ^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerEnum# +// ^ reference scip-java maven . . minimized/InnerClasses#InnerEnum#C. +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+8). else System.out.println("c"); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+8). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+8). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#testEnum(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#testEnum(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#testAnon(). +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#testAnon(). public static void testAnon() { -// ^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#testAnon(). +// ^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#testAnon(). // display_name testAnon // signature_documentation java public static void testAnon() // kind StaticMethod // ⌄ enclosing_range_start local 7 InnerInterface fn = -// ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerInterface# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^ definition local 7 // display_name fn // signature_documentation java InnerInterface fn -// enclosing_symbol semanticdb maven . . minimized/InnerClasses#testAnon(). +// enclosing_symbol scip-java maven . . minimized/InnerClasses#testAnon(). // kind Variable new InnerInterface() { -// ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerInterface# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ⌄ enclosing_range_start local 9 @Override -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override# +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Override# // ⌄ enclosing_range_start local 10 public String apply(String s) { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^^ definition local 9 // display_name apply // signature_documentation java @Override\npublic String apply(String s) // enclosing_symbol local 8 // kind Method -// relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#apply(). -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// relationship is_reference is_implementation scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 10 // display_name s // signature_documentation java String s @@ -402,18 +402,18 @@ public String apply(String s) { }; // ⌃ enclosing_range_end local 7 System.out.println(fn.apply("a")); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+8). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+8). // ^^ reference local 7 -// ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#apply(). +// ^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#testAnon(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#testAnon(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/InnerClasses#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#app(). public static String app() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^ definition semanticdb maven . . minimized/InnerClasses#app(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^ definition scip-java maven . . minimized/InnerClasses#app(). // display_name app // signature_documentation java public static String app() // kind StaticMethod @@ -422,53 +422,53 @@ public static String app() { // ^ definition local 11 // display_name a // signature_documentation java int a -// enclosing_symbol semanticdb maven . . minimized/InnerClasses#app(). +// enclosing_symbol scip-java maven . . minimized/InnerClasses#app(). // kind Variable // ⌃ enclosing_range_end local 11 InnerStaticClass.innerStaticMethod(); -// ^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerStaticClass# -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). +// ^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerStaticClass# +// ^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). // ⌄ enclosing_range_start local 12 InnerClasses innerClasses = new InnerClasses(a); -// ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses# +// ^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses# // ^^^^^^^^^^^^ definition local 12 // display_name innerClasses // signature_documentation java InnerClasses innerClasses -// enclosing_symbol semanticdb maven . . minimized/InnerClasses#app(). +// enclosing_symbol scip-java maven . . minimized/InnerClasses#app(). // kind Variable -// ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#``(). +// ^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#``(). // ^ reference local 11 // ⌃ enclosing_range_end local 12 // ⌄ enclosing_range_start local 13 InnerClass innerClass = innerClasses.new InnerClass(a); -// ^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass# +// ^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerClass# // ^^^^^^^^^^ definition local 13 // display_name innerClass // signature_documentation java InnerClass innerClass -// enclosing_symbol semanticdb maven . . minimized/InnerClasses#app(). +// enclosing_symbol scip-java maven . . minimized/InnerClasses#app(). // kind Variable // ^^^^^^^^^^^^ reference local 12 -// ^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#``(). +// ^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerClass#``(). // ^ reference local 11 // ⌃ enclosing_range_end local 13 innerClass.innerMethod(); // ^^^^^^^^^^ reference local 13 -// ^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#innerMethod(). +// ^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerClass#innerMethod(). System.out.println(runInnerInterface(innerClass, a)); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+9). -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+9). +// ^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#runInnerInterface(). // ^^^^^^^^^^ reference local 13 // ^ reference local 11 testEnum(InnerEnum.A); -// ^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#testEnum(). -// ^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum# -// ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#A. +// ^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#testEnum(). +// ^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerEnum# +// ^ reference scip-java maven . . minimized/InnerClasses#InnerEnum#A. testAnon(); -// ^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#testAnon(). +// ^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#testAnon(). return ""; } -// ⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/InnerClasses# +//⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java index 544af797..77b47e80 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java @@ -1,83 +1,83 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/Interfaces# +//⌄ enclosing_range_start scip-java maven . . minimized/Interfaces# public interface Interfaces { -// ^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces# +// ^^^^^^^^^^ definition scip-java maven . . minimized/Interfaces# // display_name Interfaces // signature_documentation java public interface Interfaces // kind Interface -// ⌄ enclosing_range_start semanticdb maven . . minimized/Interfaces#staticInterfaceMethod(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Interfaces#staticInterfaceMethod(). static void staticInterfaceMethod() {} -// ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#staticInterfaceMethod(). +// ^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Interfaces#staticInterfaceMethod(). // display_name staticInterfaceMethod // signature_documentation java public static void staticInterfaceMethod() // kind StaticMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/Interfaces#staticInterfaceMethod(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Interfaces#staticInterfaceMethod(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Interfaces#abstractInterfaceMethod(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Interfaces#abstractInterfaceMethod(). String abstractInterfaceMethod(); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#abstractInterfaceMethod(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Interfaces#abstractInterfaceMethod(). // display_name abstractInterfaceMethod // signature_documentation java public abstract String abstractInterfaceMethod() // kind AbstractMethod -// relationship is_reference is_implementation semanticdb maven . . minimized/SubClasses#abstractInterfaceMethod(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/Interfaces#abstractInterfaceMethod(). +// relationship is_reference is_implementation scip-java maven . . minimized/SubClasses#abstractInterfaceMethod(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Interfaces#abstractInterfaceMethod(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Interfaces#defaultInterfaceMethod(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Interfaces#defaultInterfaceMethod(). default String defaultInterfaceMethod() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#defaultInterfaceMethod(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Interfaces#defaultInterfaceMethod(). // display_name defaultInterfaceMethod // signature_documentation java public default String defaultInterfaceMethod() // kind Method return "default"; } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Interfaces#defaultInterfaceMethod(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Interfaces#defaultInterfaceMethod(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/Interfaces# +//⌃ enclosing_range_end scip-java maven . . minimized/Interfaces# -//⌄ enclosing_range_start semanticdb maven . . minimized/BookService# +//⌄ enclosing_range_start scip-java maven . . minimized/BookService# interface BookService { -// ^^^^^^^^^^^ definition semanticdb maven . . minimized/BookService# +// ^^^^^^^^^^^ definition scip-java maven . . minimized/BookService# // display_name BookService // signature_documentation java interface BookService // kind Interface -// ⌄ enclosing_range_start semanticdb maven . . minimized/BookService#checkPages(). +// ⌄ enclosing_range_start scip-java maven . . minimized/BookService#checkPages(). void checkPages(); -// ^^^^^^^^^^ definition semanticdb maven . . minimized/BookService#checkPages(). +// ^^^^^^^^^^ definition scip-java maven . . minimized/BookService#checkPages(). // display_name checkPages // signature_documentation java public abstract void checkPages() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/BookService#checkPages(). +// ⌃ enclosing_range_end scip-java maven . . minimized/BookService#checkPages(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/BookService# +//⌃ enclosing_range_end scip-java maven . . minimized/BookService# -//⌄ enclosing_range_start semanticdb maven . . minimized/MyService# +//⌄ enclosing_range_start scip-java maven . . minimized/MyService# interface MyService { -// ^^^^^^^^^ definition semanticdb maven . . minimized/MyService# +// ^^^^^^^^^ definition scip-java maven . . minimized/MyService# // display_name MyService // signature_documentation java interface MyService // kind Interface -// ⌄ enclosing_range_start semanticdb maven . . minimized/MyService#bookService(). +// ⌄ enclosing_range_start scip-java maven . . minimized/MyService#bookService(). BookService bookService(); -// ^^^^^^^^^^^ reference semanticdb maven . . minimized/BookService# -// ^^^^^^^^^^^ definition semanticdb maven . . minimized/MyService#bookService(). +// ^^^^^^^^^^^ reference scip-java maven . . minimized/BookService# +// ^^^^^^^^^^^ definition scip-java maven . . minimized/MyService#bookService(). // display_name bookService // signature_documentation java public abstract BookService bookService() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/MyService#bookService(). +// ⌃ enclosing_range_end scip-java maven . . minimized/MyService#bookService(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/MyService#example(). +// ⌄ enclosing_range_start scip-java maven . . minimized/MyService#example(). default void example() { -// ^^^^^^^ definition semanticdb maven . . minimized/MyService#example(). +// ^^^^^^^ definition scip-java maven . . minimized/MyService#example(). // display_name example // signature_documentation java public default void example() // kind Method bookService().checkPages(); -// ^^^^^^^^^^^ reference semanticdb maven . . minimized/MyService#bookService(). -// ^^^^^^^^^^ reference semanticdb maven . . minimized/BookService#checkPages(). +// ^^^^^^^^^^^ reference scip-java maven . . minimized/MyService#bookService(). +// ^^^^^^^^^^ reference scip-java maven . . minimized/BookService#checkPages(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/MyService#example(). +// ⌃ enclosing_range_end scip-java maven . . minimized/MyService#example(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/MyService# +//⌃ enclosing_range_end scip-java maven . . minimized/MyService# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java index 80c75b80..46e8fb91 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java @@ -1,97 +1,97 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/Hello#HelloBuilder# -//⌄ enclosing_range_start semanticdb maven . . minimized/Hello#HelloBuilder#``(). -//⌄ enclosing_range_start semanticdb maven . . minimized/Hello#HelloBuilder#build(). -//⌄ enclosing_range_start semanticdb maven . . minimized/Hello#HelloBuilder#toString(). -//⌄ enclosing_range_start semanticdb maven . . minimized/Hello#builder(). -//⌄ enclosing_range_start semanticdb maven . . minimized/Hello# -//⌄ enclosing_range_start semanticdb maven . . minimized/Hello#``(). +//⌄ enclosing_range_start scip-java maven . . minimized/Hello#HelloBuilder# +//⌄ enclosing_range_start scip-java maven . . minimized/Hello#HelloBuilder#``(). +//⌄ enclosing_range_start scip-java maven . . minimized/Hello#HelloBuilder#build(). +//⌄ enclosing_range_start scip-java maven . . minimized/Hello#HelloBuilder#toString(). +//⌄ enclosing_range_start scip-java maven . . minimized/Hello#builder(). +//⌄ enclosing_range_start scip-java maven . . minimized/Hello# +//⌄ enclosing_range_start scip-java maven . . minimized/Hello#``(). //⌄ enclosing_range_start local 0 -//⌄ enclosing_range_start semanticdb maven . . minimized/Hello#HelloBuilder#message. -//⌄ enclosing_range_start semanticdb maven . . minimized/Hello#HelloBuilder#message(). +//⌄ enclosing_range_start scip-java maven . . minimized/Hello#HelloBuilder#message. +//⌄ enclosing_range_start scip-java maven . . minimized/Hello#HelloBuilder#message(). //⌄ enclosing_range_start local 1 @lombok.Builder //^^^^^^^^^^^^^^^ reference local 0 //^^^^^^^^^^^^^^^ reference local 1 -//^^^^^^^^^^^^^^^ reference semanticdb maven . . java/ -//^^^^^^^^^^^^^^^ reference semanticdb maven . . java/lang/ -//^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Hello# -//^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Hello#HelloBuilder# -//^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Hello#HelloBuilder#message. -//^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Hello#message. -//^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override# -//^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -//^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings# -//^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#value(). -// ^^^^^ reference semanticdb maven . . lombok/ -// ^^^^^^^ reference semanticdb maven . . lombok/Builder# -// definition semanticdb maven . . minimized/Hello#HelloBuilder#build(). 1:4 +//^^^^^^^^^^^^^^^ reference scip-java maven . . java/ +//^^^^^^^^^^^^^^^ reference scip-java maven . . java/lang/ +//^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Hello# +//^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Hello#HelloBuilder# +//^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Hello#HelloBuilder#message. +//^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Hello#message. +//^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/Override# +//^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/String# +//^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# +//^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings#value(). +// ^^^^^ reference scip-java maven . . lombok/ +// ^^^^^^^ reference scip-java maven . . lombok/Builder# +// definition scip-java maven . . minimized/Hello#HelloBuilder#build(). 1:4 // display_name build // signature_documentation java @SuppressWarnings("all")\npublic Hello build() // kind Method -// definition semanticdb maven . . minimized/Hello#builder(). 1:6 +// definition scip-java maven . . minimized/Hello#builder(). 1:6 // display_name builder // signature_documentation java @SuppressWarnings("all")\npublic static HelloBuilder builder() // kind StaticMethod -// definition semanticdb maven . . minimized/Hello#HelloBuilder#toString(). 1:7 +// definition scip-java maven . . minimized/Hello#HelloBuilder#toString(). 1:7 // display_name toString // signature_documentation java @Override\n@SuppressWarnings("all")\npublic String toString() // kind Method -// relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString(). -// definition semanticdb maven . . minimized/Hello#HelloBuilder# 1:11 +// relationship is_reference is_implementation scip-java maven jdk 11 java/lang/Object#toString(). +// definition scip-java maven . . minimized/Hello#HelloBuilder# 1:11 // display_name HelloBuilder // signature_documentation java @SuppressWarnings("all")\npublic static class HelloBuilder // kind Class -// definition semanticdb maven . . minimized/Hello#HelloBuilder#``(). 1:11 +// definition scip-java maven . . minimized/Hello#HelloBuilder#``(). 1:11 // display_name // signature_documentation java @SuppressWarnings("all")\nHelloBuilder() // kind Constructor -// reference semanticdb maven . . minimized/Hello#HelloBuilder#``(). 1:11 -// ⌃ enclosing_range_end semanticdb maven . . minimized/Hello#HelloBuilder# -// ⌃ enclosing_range_end semanticdb maven . . minimized/Hello#HelloBuilder#``(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/Hello#HelloBuilder#build(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/Hello#HelloBuilder#toString(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/Hello#builder(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/Hello#``(). +// reference scip-java maven . . minimized/Hello#HelloBuilder#``(). 1:11 +// ⌃ enclosing_range_end scip-java maven . . minimized/Hello#HelloBuilder# +// ⌃ enclosing_range_end scip-java maven . . minimized/Hello#HelloBuilder#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Hello#HelloBuilder#build(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Hello#HelloBuilder#toString(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Hello#builder(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Hello#``(). // ⌃ enclosing_range_end local 0 -// ⌃ enclosing_range_end semanticdb maven . . minimized/Hello#HelloBuilder#message. -// ⌃ enclosing_range_end semanticdb maven . . minimized/Hello#HelloBuilder#message(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Hello#HelloBuilder#message. +// ⌃ enclosing_range_end scip-java maven . . minimized/Hello#HelloBuilder#message(). // ⌃ enclosing_range_end local 1 class Hello { -// ^^^^^ definition semanticdb maven . . minimized/Hello# +// ^^^^^ definition scip-java maven . . minimized/Hello# // display_name Hello // signature_documentation java @Builder\nclass Hello // kind Class -// ^^^^^ definition semanticdb maven . . minimized/Hello#``(). +// ^^^^^ definition scip-java maven . . minimized/Hello#``(). // display_name // signature_documentation java @SuppressWarnings("all")\nHello(String message) // kind Constructor -// ^^^^^ reference semanticdb maven . . minimized/Hello#``(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Hello#message. +// ^^^^^ reference scip-java maven . . minimized/Hello#``(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Hello#message. private String message; -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^^^^ definition local 0 // display_name message // signature_documentation java final String message -// enclosing_symbol semanticdb maven . . minimized/Hello#``(). +// enclosing_symbol scip-java maven . . minimized/Hello#``(). // ^^^^^^^ definition local 1 // display_name message // signature_documentation java final String message -// enclosing_symbol semanticdb maven . . minimized/Hello#HelloBuilder#message(). -// ^^^^^^^ definition semanticdb maven . . minimized/Hello#HelloBuilder#message(). +// enclosing_symbol scip-java maven . . minimized/Hello#HelloBuilder#message(). +// ^^^^^^^ definition scip-java maven . . minimized/Hello#HelloBuilder#message(). // display_name message // signature_documentation java @SuppressWarnings("all")\npublic HelloBuilder message(String message) // kind Method // documentation @return {@code this}. -// ^^^^^^^ definition semanticdb maven . . minimized/Hello#HelloBuilder#message. +// ^^^^^^^ definition scip-java maven . . minimized/Hello#HelloBuilder#message. // display_name message // signature_documentation java @SuppressWarnings("all")\nprivate String message // kind Field -// ^^^^^^^ definition semanticdb maven . . minimized/Hello#message. +// ^^^^^^^ definition scip-java maven . . minimized/Hello#message. // display_name message // signature_documentation java private String message // kind Field -// ⌃ enclosing_range_end semanticdb maven . . minimized/Hello#message. +// ⌃ enclosing_range_end scip-java maven . . minimized/Hello#message. } -//⌃ enclosing_range_end semanticdb maven . . minimized/Hello# +//⌃ enclosing_range_end scip-java maven . . minimized/Hello# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java index a7c2528a..729d76ad 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java @@ -1,138 +1,138 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/Methods# +//⌄ enclosing_range_start scip-java maven . . minimized/Methods# public class Methods { -// ^^^^^^^ definition semanticdb maven . . minimized/Methods# +// ^^^^^^^ definition scip-java maven . . minimized/Methods# // display_name Methods // signature_documentation java public class Methods // kind Class -// ^^^^^^^ definition semanticdb maven . . minimized/Methods#``(). +// ^^^^^^^ definition scip-java maven . . minimized/Methods#``(). // display_name // signature_documentation java public Methods() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/Methods#overload(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Methods#overload(). // ⌄ enclosing_range_start local 0 private int overload(int value) { -// ^^^^^^^^ definition semanticdb maven . . minimized/Methods#overload(). +// ^^^^^^^^ definition scip-java maven . . minimized/Methods#overload(). // display_name overload // signature_documentation java private int overload(int value) // kind Method // ^^^^^ definition local 0 // display_name value // signature_documentation java int value -// enclosing_symbol semanticdb maven . . minimized/Methods#overload(). +// enclosing_symbol scip-java maven . . minimized/Methods#overload(). // ⌃ enclosing_range_end local 0 return value + 1; // ^^^^^ reference local 0 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Methods#overload(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Methods#overload(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Methods#overload(+1). +// ⌄ enclosing_range_start scip-java maven . . minimized/Methods#overload(+1). // ⌄ enclosing_range_start local 1 private String overload(String value) { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^^^ definition semanticdb maven . . minimized/Methods#overload(+1). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^^^ definition scip-java maven . . minimized/Methods#overload(+1). // display_name overload // signature_documentation java private String overload(String value) // kind Method -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^^ definition local 1 // display_name value // signature_documentation java String value -// enclosing_symbol semanticdb maven . . minimized/Methods#overload(+1). +// enclosing_symbol scip-java maven . . minimized/Methods#overload(+1). // ⌃ enclosing_range_end local 1 return value + "1"; // ^^^^^ reference local 1 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Methods#overload(+1). +// ⌃ enclosing_range_end scip-java maven . . minimized/Methods#overload(+1). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Methods#staticOverload(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Methods#staticOverload(). // ⌄ enclosing_range_start local 2 private static int staticOverload(int value) { -// ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Methods#staticOverload(). +// ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Methods#staticOverload(). // display_name staticOverload // signature_documentation java private static int staticOverload(int value) // kind StaticMethod // ^^^^^ definition local 2 // display_name value // signature_documentation java int value -// enclosing_symbol semanticdb maven . . minimized/Methods#staticOverload(). +// enclosing_symbol scip-java maven . . minimized/Methods#staticOverload(). // ⌃ enclosing_range_end local 2 return value + 1; // ^^^^^ reference local 2 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Methods#staticOverload(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Methods#staticOverload(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Methods#staticOverload(+1). +// ⌄ enclosing_range_start scip-java maven . . minimized/Methods#staticOverload(+1). // ⌄ enclosing_range_start local 3 private static String staticOverload(String value) { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Methods#staticOverload(+1). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Methods#staticOverload(+1). // display_name staticOverload // signature_documentation java private static String staticOverload(String value) // kind StaticMethod -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^^ definition local 3 // display_name value // signature_documentation java String value -// enclosing_symbol semanticdb maven . . minimized/Methods#staticOverload(+1). +// enclosing_symbol scip-java maven . . minimized/Methods#staticOverload(+1). // ⌃ enclosing_range_end local 3 return value + "1"; // ^^^^^ reference local 3 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Methods#staticOverload(+1). +// ⌃ enclosing_range_end scip-java maven . . minimized/Methods#staticOverload(+1). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Methods#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Methods#app(). // ⌄ enclosing_range_start local 4 // ⌄ enclosing_range_start local 5 public static String app(int n, String m) throws RuntimeException, IndexOutOfBoundsException { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^ definition semanticdb maven . . minimized/Methods#app(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^ definition scip-java maven . . minimized/Methods#app(). // display_name app // signature_documentation java public static String app(int n, String m) throws RuntimeException, IndexOutOfBoundsException // kind StaticMethod // ^ definition local 4 // display_name n // signature_documentation java int n -// enclosing_symbol semanticdb maven . . minimized/Methods#app(). -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// enclosing_symbol scip-java maven . . minimized/Methods#app(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 5 // display_name m // signature_documentation java String m -// enclosing_symbol semanticdb maven . . minimized/Methods#app(). -// ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException# -// ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IndexOutOfBoundsException# +// enclosing_symbol scip-java maven . . minimized/Methods#app(). +// ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/RuntimeException# +// ^^^^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/IndexOutOfBoundsException# // ⌃ enclosing_range_end local 4 // ⌃ enclosing_range_end local 5 // ⌄ enclosing_range_start local 6 Methods methods = new Methods(); -// ^^^^^^^ reference semanticdb maven . . minimized/Methods# +// ^^^^^^^ reference scip-java maven . . minimized/Methods# // ^^^^^^^ definition local 6 // display_name methods // signature_documentation java Methods methods -// enclosing_symbol semanticdb maven . . minimized/Methods#app(). +// enclosing_symbol scip-java maven . . minimized/Methods#app(). // kind Variable -// ^^^^^^^ reference semanticdb maven . . minimized/Methods#``(). +// ^^^^^^^ reference scip-java maven . . minimized/Methods#``(). // ⌃ enclosing_range_end local 6 // ⌄ enclosing_range_start local 7 int a = staticOverload(n); // ^ definition local 7 // display_name a // signature_documentation java int a -// enclosing_symbol semanticdb maven . . minimized/Methods#app(). +// enclosing_symbol scip-java maven . . minimized/Methods#app(). // kind Variable -// ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Methods#staticOverload(). +// ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Methods#staticOverload(). // ^ reference local 4 // ⌃ enclosing_range_end local 7 // ⌄ enclosing_range_start local 8 String b = staticOverload(m); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 8 // display_name b // signature_documentation java String b -// enclosing_symbol semanticdb maven . . minimized/Methods#app(). +// enclosing_symbol scip-java maven . . minimized/Methods#app(). // kind Variable -// ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Methods#staticOverload(+1). +// ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Methods#staticOverload(+1). // ^ reference local 5 // ⌃ enclosing_range_end local 8 // ⌄ enclosing_range_start local 9 @@ -140,22 +140,22 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou // ^ definition local 9 // display_name c // signature_documentation java int c -// enclosing_symbol semanticdb maven . . minimized/Methods#app(). +// enclosing_symbol scip-java maven . . minimized/Methods#app(). // kind Variable // ^^^^^^^ reference local 6 -// ^^^^^^^^ reference semanticdb maven . . minimized/Methods#overload(). +// ^^^^^^^^ reference scip-java maven . . minimized/Methods#overload(). // ^ reference local 4 // ⌃ enclosing_range_end local 9 // ⌄ enclosing_range_start local 10 String d = methods.overload(m); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 10 // display_name d // signature_documentation java String d -// enclosing_symbol semanticdb maven . . minimized/Methods#app(). +// enclosing_symbol scip-java maven . . minimized/Methods#app(). // kind Variable // ^^^^^^^ reference local 6 -// ^^^^^^^^ reference semanticdb maven . . minimized/Methods#overload(+1). +// ^^^^^^^^ reference scip-java maven . . minimized/Methods#overload(+1). // ^ reference local 5 // ⌃ enclosing_range_end local 10 return b + a + c + d; @@ -164,6 +164,6 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou // ^ reference local 9 // ^ reference local 10 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Methods#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Methods#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/Methods# +//⌃ enclosing_range_end scip-java maven . . minimized/Methods# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java index c6d47949..ecc0a150 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java @@ -1,81 +1,81 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/MinimizedJavaMain# +//⌄ enclosing_range_start scip-java maven . . minimized/MinimizedJavaMain# @Annotations(value = "value", format = "format") -// ^^^^^^^^^^ reference semanticdb maven . . minimized/Annotations# -// ^^^^^ reference semanticdb maven . . minimized/Annotations#value(). -// ^^^^^^ reference semanticdb maven . . minimized/Annotations#format(). +// ^^^^^^^^^^ reference scip-java maven . . minimized/Annotations# +// ^^^^^ reference scip-java maven . . minimized/Annotations#value(). +// ^^^^^^ reference scip-java maven . . minimized/Annotations#format(). public class MinimizedJavaMain { -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain# +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/MinimizedJavaMain# // display_name MinimizedJavaMain // signature_documentation java @Annotations(value = "value", format = "format")\npublic class MinimizedJavaMain // kind Class -// ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain#``(). +// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/MinimizedJavaMain#``(). // display_name // signature_documentation java public MinimizedJavaMain() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/MinimizedJavaMain#main(). +// ⌄ enclosing_range_start scip-java maven . . minimized/MinimizedJavaMain#main(). // ⌄ enclosing_range_start local 0 public static void main(String[] args) { -// ^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain#main(). +// ^^^^ definition scip-java maven . . minimized/MinimizedJavaMain#main(). // display_name main // signature_documentation java public static void main(String[] args) // kind StaticMethod -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^ definition local 0 // display_name args // signature_documentation java String[] args -// enclosing_symbol semanticdb maven . . minimized/MinimizedJavaMain#main(). +// enclosing_symbol scip-java maven . . minimized/MinimizedJavaMain#main(). // ⌃ enclosing_range_end local 0 TypeVariables.app(new TypeVariables.CT()); -// ^^^^^^^^^^^^^ reference semanticdb maven . . minimized/TypeVariables# -// ^^^ reference semanticdb maven . . minimized/TypeVariables#app(). -// ^^^^^^^^^^^^^ reference semanticdb maven . . minimized/TypeVariables# -// ^^ reference semanticdb maven . . minimized/TypeVariables#CT#``(). +// ^^^^^^^^^^^^^ reference scip-java maven . . minimized/TypeVariables# +// ^^^ reference scip-java maven . . minimized/TypeVariables#app(). +// ^^^^^^^^^^^^^ reference scip-java maven . . minimized/TypeVariables# +// ^^ reference scip-java maven . . minimized/TypeVariables#CT#``(). System.out.println( -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^ reference semanticdb maven jdk 11 java/lang/System#out. -// ^^^^^^^ reference semanticdb maven jdk 11 java/io/PrintStream#println(+8). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^ reference scip-java maven jdk 11 java/lang/System#out. +// ^^^^^^^ reference scip-java maven jdk 11 java/io/PrintStream#println(+8). Methods.app(42, "42") -// ^^^^^^^ reference semanticdb maven . . minimized/Methods# -// ^^^ reference semanticdb maven . . minimized/Methods#app(). +// ^^^^^^^ reference scip-java maven . . minimized/Methods# +// ^^^ reference scip-java maven . . minimized/Methods#app(). + Enums.app() -// ^^^^^ reference semanticdb maven . . minimized/Enums# -// ^^^ reference semanticdb maven . . minimized/Enums#app(). +// ^^^^^ reference scip-java maven . . minimized/Enums# +// ^^^ reference scip-java maven . . minimized/Enums#app(). + Docstrings.app() -// ^^^^^^^^^^ reference semanticdb maven . . minimized/Docstrings# -// ^^^ reference semanticdb maven . . minimized/Docstrings#app(). +// ^^^^^^^^^^ reference scip-java maven . . minimized/Docstrings# +// ^^^ reference scip-java maven . . minimized/Docstrings#app(). + InnerClasses.app() -// ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses# -// ^^^ reference semanticdb maven . . minimized/InnerClasses#app(). +// ^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses# +// ^^^ reference scip-java maven . . minimized/InnerClasses#app(). + ForComprehensions.app(42) -// ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/ForComprehensions# -// ^^^ reference semanticdb maven . . minimized/ForComprehensions#app(). +// ^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/ForComprehensions# +// ^^^ reference scip-java maven . . minimized/ForComprehensions#app(). + AnonymousClasses.app(42) -// ^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AnonymousClasses# -// ^^^ reference semanticdb maven . . minimized/AnonymousClasses#app(). +// ^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AnonymousClasses# +// ^^^ reference scip-java maven . . minimized/AnonymousClasses#app(). + Primitives.app() -// ^^^^^^^^^^ reference semanticdb maven . . minimized/Primitives# -// ^^^ reference semanticdb maven . . minimized/Primitives#app(). +// ^^^^^^^^^^ reference scip-java maven . . minimized/Primitives# +// ^^^ reference scip-java maven . . minimized/Primitives#app(). + new ParameterizedTypes().app(42, "42") -// ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/ParameterizedTypes#``(). -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^ reference semanticdb maven . . minimized/ParameterizedTypes#app(). +// ^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/ParameterizedTypes#``(). +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^ reference scip-java maven . . minimized/ParameterizedTypes#app(). + RawTypes.x.toString() -// ^^^^^^^^ reference semanticdb maven . . minimized/RawTypes# -// ^ reference semanticdb maven . . minimized/RawTypes#x. -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#toString(). +// ^^^^^^^^ reference scip-java maven . . minimized/RawTypes# +// ^ reference scip-java maven . . minimized/RawTypes#x. +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Object#toString(). + ClassOf.app() -// ^^^^^^^ reference semanticdb maven . . minimized/ClassOf# -// ^^^ reference semanticdb maven . . minimized/ClassOf#app(). +// ^^^^^^^ reference scip-java maven . . minimized/ClassOf# +// ^^^ reference scip-java maven . . minimized/ClassOf#app(). + SubClasses.app() -// ^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses# -// ^^^ reference semanticdb maven . . minimized/SubClasses#app(). +// ^^^^^^^^^^ reference scip-java maven . . minimized/SubClasses# +// ^^^ reference scip-java maven . . minimized/SubClasses#app(). + Fields.app()); -// ^^^^^^ reference semanticdb maven . . minimized/Fields# -// ^^^ reference semanticdb maven . . minimized/Fields#app(). +// ^^^^^^ reference scip-java maven . . minimized/Fields# +// ^^^ reference scip-java maven . . minimized/Fields#app(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/MinimizedJavaMain#main(). +// ⌃ enclosing_range_end scip-java maven . . minimized/MinimizedJavaMain#main(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/MinimizedJavaMain# +//⌃ enclosing_range_end scip-java maven . . minimized/MinimizedJavaMain# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java index 1dbe55c0..d5eae2dd 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java @@ -1,155 +1,155 @@ package minimized; import java.util.HashMap; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashMap# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^^^^ reference scip-java maven jdk 11 java/util/HashMap# import java.util.Iterator; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^^^^^ reference scip-java maven jdk 11 java/util/Iterator# import java.util.List; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^ reference semanticdb maven jdk 11 java/util/List# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^ reference scip-java maven jdk 11 java/util/List# import java.util.Map; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^ reference semanticdb maven jdk 11 java/util/Map# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^ reference scip-java maven jdk 11 java/util/Map# -//⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes# -//⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#[A] -//⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#[B] +//⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes# +//⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#[A] +//⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#[B] public class ParameterizedTypes { -// ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes# +// ^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ParameterizedTypes# // display_name ParameterizedTypes // signature_documentation java public class ParameterizedTypes // kind Class -// ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#``(). +// ^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ParameterizedTypes#``(). // display_name // signature_documentation java public ParameterizedTypes() // kind Constructor -// ^ definition semanticdb maven . . minimized/ParameterizedTypes#[A] +// ^ definition scip-java maven . . minimized/ParameterizedTypes#[A] // display_name A // signature_documentation java A // kind TypeParameter -// ^ definition semanticdb maven . . minimized/ParameterizedTypes#[B] +// ^ definition scip-java maven . . minimized/ParameterizedTypes#[B] // display_name B // signature_documentation java B extends String // kind TypeParameter -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#iteratorable().[T] -// ⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#iteratorable(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#iteratorable().[T] +// ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#iteratorable(). // ⌄ enclosing_range_start local 0 public & Iterator> void iteratorable(List list) {} -// ^ definition semanticdb maven . . minimized/ParameterizedTypes#iteratorable().[T] +// ^ definition scip-java maven . . minimized/ParameterizedTypes#iteratorable().[T] // display_name T // signature_documentation java T extends Iterable & Iterator // kind TypeParameter -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable# -// ^ reference semanticdb maven . . minimized/ParameterizedTypes#[A] -// ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator# -// ^ reference semanticdb maven . . minimized/ParameterizedTypes#[B] -// ^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#iteratorable(). +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Iterable# +// ^ reference scip-java maven . . minimized/ParameterizedTypes#[A] +// ^^^^^^^^ reference scip-java maven jdk 11 java/util/Iterator# +// ^ reference scip-java maven . . minimized/ParameterizedTypes#[B] +// ^^^^^^^^^^^^ definition scip-java maven . . minimized/ParameterizedTypes#iteratorable(). // display_name iteratorable // signature_documentation java public & Iterator> void iteratorable(List list) // kind Method -// ^^^^ reference semanticdb maven jdk 11 java/util/List# -// ^ reference semanticdb maven . . minimized/ParameterizedTypes#iteratorable().[T] +// ^^^^ reference scip-java maven jdk 11 java/util/List# +// ^ reference scip-java maven . . minimized/ParameterizedTypes#iteratorable().[T] // ^^^^ definition local 0 // display_name list // signature_documentation java List list -// enclosing_symbol semanticdb maven . . minimized/ParameterizedTypes#iteratorable(). +// enclosing_symbol scip-java maven . . minimized/ParameterizedTypes#iteratorable(). // ⌃ enclosing_range_end local 0 -// ⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#iteratorable().[T] -// ⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#iteratorable(). +// ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#iteratorable().[T] +// ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#iteratorable(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#app(). // ⌄ enclosing_range_start local 1 // ⌄ enclosing_range_start local 2 public String app(A a, B b) { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^ definition semanticdb maven . . minimized/ParameterizedTypes#app(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^ definition scip-java maven . . minimized/ParameterizedTypes#app(). // display_name app // signature_documentation java public String app(A a, B b) // kind Method -// ^ reference semanticdb maven . . minimized/ParameterizedTypes#[A] +// ^ reference scip-java maven . . minimized/ParameterizedTypes#[A] // ^ definition local 1 // display_name a // signature_documentation java A a -// enclosing_symbol semanticdb maven . . minimized/ParameterizedTypes#app(). -// ^ reference semanticdb maven . . minimized/ParameterizedTypes#[B] +// enclosing_symbol scip-java maven . . minimized/ParameterizedTypes#app(). +// ^ reference scip-java maven . . minimized/ParameterizedTypes#[B] // ^ definition local 2 // display_name b // signature_documentation java B b -// enclosing_symbol semanticdb maven . . minimized/ParameterizedTypes#app(). +// enclosing_symbol scip-java maven . . minimized/ParameterizedTypes#app(). // ⌃ enclosing_range_end local 1 // ⌃ enclosing_range_end local 2 return a.toString() + b; // ^ reference local 1 -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#toString(). +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Object#toString(). // ^ reference local 2 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#app(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#doStuff(). +// ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#doStuff(). public Map doStuff() { return null; } -// ^^^ reference semanticdb maven jdk 11 java/util/Map# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#doStuff(). +// ^^^ reference scip-java maven jdk 11 java/util/Map# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^^ definition scip-java maven . . minimized/ParameterizedTypes#doStuff(). // display_name doStuff // signature_documentation java public Map doStuff() // kind Method -// ⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#doStuff(). +// ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#doStuff(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#createQuadruplet(). +// ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#createQuadruplet(). public Quadruplet createQuadruplet() { return null; } -// ^^^^^^^^^^ reference semanticdb maven . . minimized/ParameterizedTypes#Quadruplet# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object# -// ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer# -// ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#createQuadruplet(). +// ^^^^^^^^^^ reference scip-java maven . . minimized/ParameterizedTypes#Quadruplet# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/Object# +// ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# +// ^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ParameterizedTypes#createQuadruplet(). // display_name createQuadruplet // signature_documentation java public Quadruplet createQuadruplet() // kind Method -// ⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#createQuadruplet(). +// ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#createQuadruplet(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#Quadruplet# -// ⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[T] -// ⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[S] -// ⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[X] -// ⌄ enclosing_range_start semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[Y] +// ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#Quadruplet# +// ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[T] +// ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[S] +// ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[X] +// ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[Y] public static class Quadruplet {} -// ^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet# +// ^^^^^^^^^^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet# // display_name Quadruplet // signature_documentation java public static class Quadruplet // kind Class -// ^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#``(). +// ^^^^^^^^^^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet#``(). // display_name // signature_documentation java public Quadruplet() // kind Constructor -// ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[T] +// ^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[T] // display_name T // signature_documentation java T // kind TypeParameter -// ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[S] +// ^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[S] // display_name S // signature_documentation java S // kind TypeParameter -// ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[X] +// ^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[X] // display_name X // signature_documentation java X // kind TypeParameter -// ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[Y] +// ^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[Y] // display_name Y // signature_documentation java Y // kind TypeParameter -// ⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#Quadruplet# -// ⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[T] -// ⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[S] -// ⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[X] -// ⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[Y] +// ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#Quadruplet# +// ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[T] +// ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[S] +// ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[X] +// ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[Y] } -//⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes# -//⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#[A] -//⌃ enclosing_range_end semanticdb maven . . minimized/ParameterizedTypes#[B] +//⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes# +//⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#[A] +//⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#[B] diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java index d1fb9899..83e5de54 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java @@ -1,116 +1,116 @@ package minimized; import java.util.Random; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^^^ reference semanticdb maven jdk 11 java/util/Random# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^^^ reference scip-java maven jdk 11 java/util/Random# -//⌄ enclosing_range_start semanticdb maven . . minimized/Primitives# +//⌄ enclosing_range_start scip-java maven . . minimized/Primitives# public class Primitives { -// ^^^^^^^^^^ definition semanticdb maven . . minimized/Primitives# +// ^^^^^^^^^^ definition scip-java maven . . minimized/Primitives# // display_name Primitives // signature_documentation java public class Primitives // kind Class -// ^^^^^^^^^^ definition semanticdb maven . . minimized/Primitives#``(). +// ^^^^^^^^^^ definition scip-java maven . . minimized/Primitives#``(). // display_name // signature_documentation java public Primitives() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/Primitives#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Primitives#app(). public static String app() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^ definition semanticdb maven . . minimized/Primitives#app(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^ definition scip-java maven . . minimized/Primitives#app(). // display_name app // signature_documentation java public static String app() // kind StaticMethod // ⌄ enclosing_range_start local 0 Random random = new Random(); -// ^^^^^^ reference semanticdb maven jdk 11 java/util/Random# +// ^^^^^^ reference scip-java maven jdk 11 java/util/Random# // ^^^^^^ definition local 0 // display_name random // signature_documentation java Random random -// enclosing_symbol semanticdb maven . . minimized/Primitives#app(). +// enclosing_symbol scip-java maven . . minimized/Primitives#app(). // kind Variable -// ^^^^^^ reference semanticdb maven jdk 11 java/util/Random#``(). +// ^^^^^^ reference scip-java maven jdk 11 java/util/Random#``(). // ⌃ enclosing_range_end local 0 // ⌄ enclosing_range_start local 1 byte a = (byte) random.nextInt(); // ^ definition local 1 // display_name a // signature_documentation java byte a -// enclosing_symbol semanticdb maven . . minimized/Primitives#app(). +// enclosing_symbol scip-java maven . . minimized/Primitives#app(). // kind Variable // ^^^^^^ reference local 0 -// ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt(). +// ^^^^^^^ reference scip-java maven jdk 11 java/util/Random#nextInt(). // ⌃ enclosing_range_end local 1 // ⌄ enclosing_range_start local 2 short b = (short) random.nextInt(); // ^ definition local 2 // display_name b // signature_documentation java short b -// enclosing_symbol semanticdb maven . . minimized/Primitives#app(). +// enclosing_symbol scip-java maven . . minimized/Primitives#app(). // kind Variable // ^^^^^^ reference local 0 -// ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt(). +// ^^^^^^^ reference scip-java maven jdk 11 java/util/Random#nextInt(). // ⌃ enclosing_range_end local 2 // ⌄ enclosing_range_start local 3 int c = random.nextInt(); // ^ definition local 3 // display_name c // signature_documentation java int c -// enclosing_symbol semanticdb maven . . minimized/Primitives#app(). +// enclosing_symbol scip-java maven . . minimized/Primitives#app(). // kind Variable // ^^^^^^ reference local 0 -// ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt(). +// ^^^^^^^ reference scip-java maven jdk 11 java/util/Random#nextInt(). // ⌃ enclosing_range_end local 3 // ⌄ enclosing_range_start local 4 long d = random.nextLong(); // ^ definition local 4 // display_name d // signature_documentation java long d -// enclosing_symbol semanticdb maven . . minimized/Primitives#app(). +// enclosing_symbol scip-java maven . . minimized/Primitives#app(). // kind Variable // ^^^^^^ reference local 0 -// ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextLong(). +// ^^^^^^^^ reference scip-java maven jdk 11 java/util/Random#nextLong(). // ⌃ enclosing_range_end local 4 // ⌄ enclosing_range_start local 5 char e = (char) random.nextInt(); // ^ definition local 5 // display_name e // signature_documentation java char e -// enclosing_symbol semanticdb maven . . minimized/Primitives#app(). +// enclosing_symbol scip-java maven . . minimized/Primitives#app(). // kind Variable // ^^^^^^ reference local 0 -// ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt(). +// ^^^^^^^ reference scip-java maven jdk 11 java/util/Random#nextInt(). // ⌃ enclosing_range_end local 5 // ⌄ enclosing_range_start local 6 float f = (float) random.nextDouble(); // ^ definition local 6 // display_name f // signature_documentation java float f -// enclosing_symbol semanticdb maven . . minimized/Primitives#app(). +// enclosing_symbol scip-java maven . . minimized/Primitives#app(). // kind Variable // ^^^^^^ reference local 0 -// ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextDouble(). +// ^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Random#nextDouble(). // ⌃ enclosing_range_end local 6 // ⌄ enclosing_range_start local 7 double g = (double) random.nextDouble(); // ^ definition local 7 // display_name g // signature_documentation java double g -// enclosing_symbol semanticdb maven . . minimized/Primitives#app(). +// enclosing_symbol scip-java maven . . minimized/Primitives#app(). // kind Variable // ^^^^^^ reference local 0 -// ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextDouble(). +// ^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Random#nextDouble(). // ⌃ enclosing_range_end local 7 // ⌄ enclosing_range_start local 8 boolean h = random.nextBoolean(); // ^ definition local 8 // display_name h // signature_documentation java boolean h -// enclosing_symbol semanticdb maven . . minimized/Primitives#app(). +// enclosing_symbol scip-java maven . . minimized/Primitives#app(). // kind Variable // ^^^^^^ reference local 0 -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextBoolean(). +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Random#nextBoolean(). // ⌃ enclosing_range_end local 8 return "" + a + b + c + d + e + f + g + h; // ^ reference local 1 @@ -122,14 +122,14 @@ public static String app() { // ^ reference local 7 // ^ reference local 8 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/Primitives#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Primitives#app(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/Primitives#test(). +// ⌄ enclosing_range_start scip-java maven . . minimized/Primitives#test(). public static void test() {} -// ^^^^ definition semanticdb maven . . minimized/Primitives#test(). +// ^^^^ definition scip-java maven . . minimized/Primitives#test(). // display_name test // signature_documentation java public static void test() // kind StaticMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/Primitives#test(). +// ⌃ enclosing_range_end scip-java maven . . minimized/Primitives#test(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/Primitives# +//⌃ enclosing_range_end scip-java maven . . minimized/Primitives# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java index ac6262b9..de176c3a 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java @@ -1,35 +1,35 @@ package minimized; import java.util.Collections; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Collections# import java.util.List; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/util/ -// ^^^^ reference semanticdb maven jdk 11 java/util/List# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/util/ +// ^^^^ reference scip-java maven jdk 11 java/util/List# -//⌄ enclosing_range_start semanticdb maven . . minimized/RawTypes# +//⌄ enclosing_range_start scip-java maven . . minimized/RawTypes# @SuppressWarnings("ALL") -// ^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings# +// ^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# public class RawTypes { -// ^^^^^^^^ definition semanticdb maven . . minimized/RawTypes# +// ^^^^^^^^ definition scip-java maven . . minimized/RawTypes# // display_name RawTypes // signature_documentation java @SuppressWarnings("ALL")\npublic class RawTypes // kind Class -// ^^^^^^^^ definition semanticdb maven . . minimized/RawTypes#``(). +// ^^^^^^^^ definition scip-java maven . . minimized/RawTypes#``(). // display_name // signature_documentation java public RawTypes() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/RawTypes#x. +// ⌄ enclosing_range_start scip-java maven . . minimized/RawTypes#x. public static final List x = Collections.singletonList(42); -// ^^^^ reference semanticdb maven jdk 11 java/util/List# -// ^ definition semanticdb maven . . minimized/RawTypes#x. +// ^^^^ reference scip-java maven jdk 11 java/util/List# +// ^ definition scip-java maven . . minimized/RawTypes#x. // display_name x // signature_documentation java public static final List x // kind StaticField -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections# -// ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#singletonList(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/RawTypes#x. +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Collections# +// ^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Collections#singletonList(). +// ⌃ enclosing_range_end scip-java maven . . minimized/RawTypes#x. } -//⌃ enclosing_range_end semanticdb maven . . minimized/RawTypes# +//⌃ enclosing_range_end scip-java maven . . minimized/RawTypes# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java index b701b2fc..cb921052 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java @@ -1,78 +1,78 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/SubClasses# +//⌄ enclosing_range_start scip-java maven . . minimized/SubClasses# public class SubClasses extends AbstractClasses implements Interfaces { -// ^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses# +// ^^^^^^^^^^ definition scip-java maven . . minimized/SubClasses# // display_name SubClasses // signature_documentation java public class SubClasses extends AbstractClasses implements Interfaces // kind Class -// relationship is_implementation semanticdb maven . . minimized/AbstractClasses# -// relationship is_implementation semanticdb maven . . minimized/Interfaces# -// ^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#``(). +// relationship is_implementation scip-java maven . . minimized/AbstractClasses# +// relationship is_implementation scip-java maven . . minimized/Interfaces# +// ^^^^^^^^^^ definition scip-java maven . . minimized/SubClasses#``(). // display_name // signature_documentation java public SubClasses() // kind Constructor -// ^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AbstractClasses# -// ^^^^^^^^^^ reference semanticdb maven . . minimized/Interfaces# +// ^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AbstractClasses# +// ^^^^^^^^^^ reference scip-java maven . . minimized/Interfaces# -// ⌄ enclosing_range_start semanticdb maven . . minimized/SubClasses#abstractImplementation(). +// ⌄ enclosing_range_start scip-java maven . . minimized/SubClasses#abstractImplementation(). @Override -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override# +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Override# public String abstractImplementation() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#abstractImplementation(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/SubClasses#abstractImplementation(). // display_name abstractImplementation // signature_documentation java @Override\npublic String abstractImplementation() // kind Method -// relationship is_reference is_implementation semanticdb maven . . minimized/AbstractClasses#abstractImplementation(). +// relationship is_reference is_implementation scip-java maven . . minimized/AbstractClasses#abstractImplementation(). return "abstract"; } -// ⌃ enclosing_range_end semanticdb maven . . minimized/SubClasses#abstractImplementation(). +// ⌃ enclosing_range_end scip-java maven . . minimized/SubClasses#abstractImplementation(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/SubClasses#abstractInterfaceMethod(). +// ⌄ enclosing_range_start scip-java maven . . minimized/SubClasses#abstractInterfaceMethod(). @Override -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override# +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Override# public String abstractInterfaceMethod() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#abstractInterfaceMethod(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/SubClasses#abstractInterfaceMethod(). // display_name abstractInterfaceMethod // signature_documentation java @Override\npublic String abstractInterfaceMethod() // kind Method -// relationship is_reference is_implementation semanticdb maven . . minimized/Interfaces#abstractInterfaceMethod(). +// relationship is_reference is_implementation scip-java maven . . minimized/Interfaces#abstractInterfaceMethod(). return "abstractInterface"; } -// ⌃ enclosing_range_end semanticdb maven . . minimized/SubClasses#abstractInterfaceMethod(). +// ⌃ enclosing_range_end scip-java maven . . minimized/SubClasses#abstractInterfaceMethod(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/SubClasses#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/SubClasses#app(). public static String app() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^ definition semanticdb maven . . minimized/SubClasses#app(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^ definition scip-java maven . . minimized/SubClasses#app(). // display_name app // signature_documentation java public static String app() // kind StaticMethod // ⌄ enclosing_range_start local 0 SubClasses s = new SubClasses(); -// ^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses# +// ^^^^^^^^^^ reference scip-java maven . . minimized/SubClasses# // ^ definition local 0 // display_name s // signature_documentation java SubClasses s -// enclosing_symbol semanticdb maven . . minimized/SubClasses#app(). +// enclosing_symbol scip-java maven . . minimized/SubClasses#app(). // kind Variable -// ^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses#``(). +// ^^^^^^^^^^ reference scip-java maven . . minimized/SubClasses#``(). // ⌃ enclosing_range_end local 0 return s.abstractImplementation() // ^ reference local 0 -// ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses#abstractImplementation(). +// ^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/SubClasses#abstractImplementation(). + s.defaultImplementation() // ^ reference local 0 -// ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AbstractClasses#defaultImplementation(). +// ^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AbstractClasses#defaultImplementation(). + s.abstractInterfaceMethod() // ^ reference local 0 -// ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses#abstractInterfaceMethod(). +// ^^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/SubClasses#abstractInterfaceMethod(). + s.defaultInterfaceMethod(); // ^ reference local 0 -// ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Interfaces#defaultInterfaceMethod(). +// ^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Interfaces#defaultInterfaceMethod(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/SubClasses#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/SubClasses#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/SubClasses# +//⌃ enclosing_range_end scip-java maven . . minimized/SubClasses# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java index 3af5743c..b4833cb5 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java @@ -1,33 +1,33 @@ package minimized; -//⌄ enclosing_range_start semanticdb maven . . minimized/TabIndented# +//⌄ enclosing_range_start scip-java maven . . minimized/TabIndented# public class TabIndented { -// ^^^^^^^^^^^ definition semanticdb maven . . minimized/TabIndented# +// ^^^^^^^^^^^ definition scip-java maven . . minimized/TabIndented# // display_name TabIndented // signature_documentation java public class TabIndented // kind Class -// ^^^^^^^^^^^ definition semanticdb maven . . minimized/TabIndented#``(). +// ^^^^^^^^^^^ definition scip-java maven . . minimized/TabIndented#``(). // display_name // signature_documentation java public TabIndented() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/TabIndented#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/TabIndented#app(). public void app() { -// ^^^ definition semanticdb maven . . minimized/TabIndented#app(). +// ^^^ definition scip-java maven . . minimized/TabIndented#app(). // display_name app // signature_documentation java public void app() // kind Method // ⌄ enclosing_range_start local 0 Object o = new Object() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/Object# // ^ definition local 0 // display_name o // signature_documentation java Object o -// enclosing_symbol semanticdb maven . . minimized/TabIndented#app(). +// enclosing_symbol scip-java maven . . minimized/TabIndented#app(). // kind Variable -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/Object# // ⌄ enclosing_range_start local 2 @Override -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override# +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Override# // ⌄ enclosing_range_start local 3 public boolean equals(Object other) { // ^^^^^^ definition local 2 @@ -35,8 +35,8 @@ public boolean equals(Object other) { // signature_documentation java @Override\npublic boolean equals(Object other) // enclosing_symbol local 1 // kind Method -// relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals(). -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object# +// relationship is_reference is_implementation scip-java maven jdk 11 java/lang/Object#equals(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/Object# // ^^^^^ definition local 3 // display_name other // signature_documentation java Object other @@ -48,37 +48,37 @@ public boolean equals(Object other) { // ⌄ enclosing_range_start local 4 @Override -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override# +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Override# public int hashCode() { // ^^^^^^^^ definition local 4 // display_name hashCode // signature_documentation java @Override\npublic int hashCode() // enclosing_symbol local 1 // kind Method -// relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode(). +// relationship is_reference is_implementation scip-java maven jdk 11 java/lang/Object#hashCode(). return System.identityHashCode(this); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/System# -// ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/System#identityHashCode(). +// ^^^^^^ reference scip-java maven jdk 11 java/lang/System# +// ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/System#identityHashCode(). } // ⌃ enclosing_range_end local 4 // ⌄ enclosing_range_start local 5 @Override -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override# +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/Override# public String toString() { -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^^^^^ definition local 5 // display_name toString // signature_documentation java @Override\npublic String toString() // enclosing_symbol local 1 // kind Method -// relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString(). +// relationship is_reference is_implementation scip-java maven jdk 11 java/lang/Object#toString(). return ""; } // ⌃ enclosing_range_end local 5 }; // ⌃ enclosing_range_end local 0 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/TabIndented#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/TabIndented#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/TabIndented# +//⌃ enclosing_range_end scip-java maven . . minimized/TabIndented# diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeAnnotations.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeAnnotations.java index c23c6356..692b31e9 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeAnnotations.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeAnnotations.java @@ -1,72 +1,72 @@ package minimized; import java.lang.annotation.ElementType; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/lang/ -// ^^^^^^^^^^ reference semanticdb maven . . java/lang/annotation/ -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/ElementType# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/lang/ +// ^^^^^^^^^^ reference scip-java maven . . java/lang/annotation/ +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/ElementType# import java.lang.annotation.Target; -// ^^^^ reference semanticdb maven . . java/ -// ^^^^ reference semanticdb maven . . java/lang/ -// ^^^^^^^^^^ reference semanticdb maven . . java/lang/annotation/ -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/Target# +// ^^^^ reference scip-java maven . . java/ +// ^^^^ reference scip-java maven . . java/lang/ +// ^^^^^^^^^^ reference scip-java maven . . java/lang/annotation/ +// ^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Target# -//⌄ enclosing_range_start semanticdb maven . . minimized/TypeAnnotation# +//⌄ enclosing_range_start scip-java maven . . minimized/TypeAnnotation# @Target({ ElementType.TYPE_USE }) -// ^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/Target# -// ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/ElementType# -// ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/ElementType#TYPE_USE. +// ^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Target# +// ^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/ElementType# +// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/ElementType#TYPE_USE. @interface TypeAnnotation { -// ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeAnnotation# +// ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/TypeAnnotation# // display_name TypeAnnotation // signature_documentation java @Target({ElementType.TYPE_USE})\n@interface TypeAnnotation // kind Interface -// relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation# -// ⌄ enclosing_range_start semanticdb maven . . minimized/TypeAnnotation#integer(). +// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// ⌄ enclosing_range_start scip-java maven . . minimized/TypeAnnotation#integer(). int integer() default 1; -// ^^^^^^^ definition semanticdb maven . . minimized/TypeAnnotation#integer(). +// ^^^^^^^ definition scip-java maven . . minimized/TypeAnnotation#integer(). // display_name integer // signature_documentation java public abstract int integer() // kind AbstractMethod -// ⌃ enclosing_range_end semanticdb maven . . minimized/TypeAnnotation#integer(). +// ⌃ enclosing_range_end scip-java maven . . minimized/TypeAnnotation#integer(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/TypeAnnotation# +//⌃ enclosing_range_end scip-java maven . . minimized/TypeAnnotation# // FIXME(issue: GRAPH-1122): Definition range for T below is incorrect -//⌄ enclosing_range_start semanticdb maven . . minimized/ClassProcessed# -//⌄ enclosing_range_start semanticdb maven . . minimized/ClassProcessed#[T] +//⌄ enclosing_range_start scip-java maven . . minimized/ClassProcessed# +//⌄ enclosing_range_start scip-java maven . . minimized/ClassProcessed#[T] class ClassProcessed<@TypeAnnotation T extends Number> { -// ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ClassProcessed# +// ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ClassProcessed# // display_name ClassProcessed // signature_documentation java class ClassProcessed // kind Class -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ClassProcessed#[T] +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ClassProcessed#[T] // display_name T // signature_documentation java T extends Number // kind TypeParameter -// ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/TypeAnnotation# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/Number# +// ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/TypeAnnotation# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/Number# -// ⌄ enclosing_range_start semanticdb maven . . minimized/ClassProcessed#``(). +// ⌄ enclosing_range_start scip-java maven . . minimized/ClassProcessed#``(). public ClassProcessed() { -// ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ClassProcessed#``(). +// ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ClassProcessed#``(). // display_name // signature_documentation java public ClassProcessed() // kind Constructor // ⌄ enclosing_range_start local 0 String s = new @TypeAnnotation String(); -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 0 // display_name s // signature_documentation java String s -// enclosing_symbol semanticdb maven . . minimized/ClassProcessed#``(). +// enclosing_symbol scip-java maven . . minimized/ClassProcessed#``(). // kind Variable -// ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/TypeAnnotation# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# -// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#``(). +// ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/TypeAnnotation# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^ reference scip-java maven jdk 11 java/lang/String#``(). // ⌃ enclosing_range_end local 0 } -// ⌃ enclosing_range_end semanticdb maven . . minimized/ClassProcessed#``(). +// ⌃ enclosing_range_end scip-java maven . . minimized/ClassProcessed#``(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/ClassProcessed# -//⌃ enclosing_range_end semanticdb maven . . minimized/ClassProcessed#[T] +//⌃ enclosing_range_end scip-java maven . . minimized/ClassProcessed# +//⌃ enclosing_range_end scip-java maven . . minimized/ClassProcessed#[T] diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java index cf7ae943..187fc61f 100644 --- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java +++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java @@ -1,129 +1,129 @@ package minimized; /** Example from https://docs.oracle.com/javase/specs/jls/se8/html/jls-4.html#jls-4.4 */ -//⌄ enclosing_range_start semanticdb maven . . minimized/TypeVariables# +//⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables# public class TypeVariables { -// ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables# +// ^^^^^^^^^^^^^ definition scip-java maven . . minimized/TypeVariables# // display_name TypeVariables // signature_documentation java public class TypeVariables // kind Class // documentation Example from https://docs.oracle.com/javase/specs/jls/se8/html/jls-4.html#jls-4.4 -// ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#``(). +// ^^^^^^^^^^^^^ definition scip-java maven . . minimized/TypeVariables#``(). // display_name // signature_documentation java public TypeVariables() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/TypeVariables#C# +// ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#C# static class C { -// ^ definition semanticdb maven . . minimized/TypeVariables#C# +// ^ definition scip-java maven . . minimized/TypeVariables#C# // display_name C // signature_documentation java static class C // kind Class -// ^ definition semanticdb maven . . minimized/TypeVariables#C#``(). +// ^ definition scip-java maven . . minimized/TypeVariables#C#``(). // display_name // signature_documentation java C() // kind Constructor -// ⌄ enclosing_range_start semanticdb maven . . minimized/TypeVariables#C#mCPublic(). +// ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#C#mCPublic(). public void mCPublic() {} -// ^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCPublic(). +// ^^^^^^^^ definition scip-java maven . . minimized/TypeVariables#C#mCPublic(). // display_name mCPublic // signature_documentation java public void mCPublic() // kind Method -// ⌃ enclosing_range_end semanticdb maven . . minimized/TypeVariables#C#mCPublic(). +// ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#C#mCPublic(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/TypeVariables#C#mCProtected(). +// ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#C#mCProtected(). protected void mCProtected() {} -// ^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCProtected(). +// ^^^^^^^^^^^ definition scip-java maven . . minimized/TypeVariables#C#mCProtected(). // display_name mCProtected // signature_documentation java protected void mCProtected() // kind Method -// ⌃ enclosing_range_end semanticdb maven . . minimized/TypeVariables#C#mCProtected(). +// ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#C#mCProtected(). -// ⌄ enclosing_range_start semanticdb maven . . minimized/TypeVariables#C#mCPackage(). +// ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#C#mCPackage(). void mCPackage() {} -// ^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCPackage(). +// ^^^^^^^^^ definition scip-java maven . . minimized/TypeVariables#C#mCPackage(). // display_name mCPackage // signature_documentation java void mCPackage() // kind Method -// ⌃ enclosing_range_end semanticdb maven . . minimized/TypeVariables#C#mCPackage(). +// ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#C#mCPackage(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/TypeVariables#C# +// ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#C# -// ⌄ enclosing_range_start semanticdb maven . . minimized/TypeVariables#I# +// ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#I# interface I { -// ^ definition semanticdb maven . . minimized/TypeVariables#I# +// ^ definition scip-java maven . . minimized/TypeVariables#I# // display_name I // signature_documentation java interface I // kind Interface -// ⌄ enclosing_range_start semanticdb maven . . minimized/TypeVariables#I#mI(). +// ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#I#mI(). void mI(); -// ^^ definition semanticdb maven . . minimized/TypeVariables#I#mI(). +// ^^ definition scip-java maven . . minimized/TypeVariables#I#mI(). // display_name mI // signature_documentation java public abstract void mI() // kind AbstractMethod -// relationship is_reference is_implementation semanticdb maven . . minimized/TypeVariables#CT#mI(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/TypeVariables#I#mI(). +// relationship is_reference is_implementation scip-java maven . . minimized/TypeVariables#CT#mI(). +// ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#I#mI(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/TypeVariables#I# +// ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#I# -// ⌄ enclosing_range_start semanticdb maven . . minimized/TypeVariables#CT# +// ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#CT# static class CT extends C implements I { -// ^^ definition semanticdb maven . . minimized/TypeVariables#CT# +// ^^ definition scip-java maven . . minimized/TypeVariables#CT# // display_name CT // signature_documentation java static class CT extends C implements I // kind Class -// relationship is_implementation semanticdb maven . . minimized/TypeVariables#C# -// relationship is_implementation semanticdb maven . . minimized/TypeVariables#I# -// ^^ definition semanticdb maven . . minimized/TypeVariables#CT#``(). +// relationship is_implementation scip-java maven . . minimized/TypeVariables#C# +// relationship is_implementation scip-java maven . . minimized/TypeVariables#I# +// ^^ definition scip-java maven . . minimized/TypeVariables#CT#``(). // display_name // signature_documentation java CT() // kind Constructor -// ^ reference semanticdb maven . . minimized/TypeVariables#C# -// ^ reference semanticdb maven . . minimized/TypeVariables#I# -// ⌄ enclosing_range_start semanticdb maven . . minimized/TypeVariables#CT#mI(). +// ^ reference scip-java maven . . minimized/TypeVariables#C# +// ^ reference scip-java maven . . minimized/TypeVariables#I# +// ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#CT#mI(). public void mI() {} -// ^^ definition semanticdb maven . . minimized/TypeVariables#CT#mI(). +// ^^ definition scip-java maven . . minimized/TypeVariables#CT#mI(). // display_name mI // signature_documentation java public void mI() // kind Method -// relationship is_reference is_implementation semanticdb maven . . minimized/TypeVariables#I#mI(). -// ⌃ enclosing_range_end semanticdb maven . . minimized/TypeVariables#CT#mI(). +// relationship is_reference is_implementation scip-java maven . . minimized/TypeVariables#I#mI(). +// ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#CT#mI(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/TypeVariables#CT# +// ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#CT# -// ⌄ enclosing_range_start semanticdb maven . . minimized/TypeVariables#app().[T] -// ⌄ enclosing_range_start semanticdb maven . . minimized/TypeVariables#app(). +// ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#app().[T] +// ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#app(). // ⌄ enclosing_range_start local 0 public static void app(T t) { -// ^ definition semanticdb maven . . minimized/TypeVariables#app().[T] +// ^ definition scip-java maven . . minimized/TypeVariables#app().[T] // display_name T // signature_documentation java T extends C & I // kind TypeParameter -// ^ reference semanticdb maven . . minimized/TypeVariables#C# -// ^ reference semanticdb maven . . minimized/TypeVariables#I# -// ^^^ definition semanticdb maven . . minimized/TypeVariables#app(). +// ^ reference scip-java maven . . minimized/TypeVariables#C# +// ^ reference scip-java maven . . minimized/TypeVariables#I# +// ^^^ definition scip-java maven . . minimized/TypeVariables#app(). // display_name app // signature_documentation java public static void app(T t) // kind StaticMethod -// ^ reference semanticdb maven . . minimized/TypeVariables#app().[T] +// ^ reference scip-java maven . . minimized/TypeVariables#app().[T] // ^ definition local 0 // display_name t // signature_documentation java T t -// enclosing_symbol semanticdb maven . . minimized/TypeVariables#app(). +// enclosing_symbol scip-java maven . . minimized/TypeVariables#app(). // ⌃ enclosing_range_end local 0 t.mI(); // ^ reference local 0 -// ^^ reference semanticdb maven . . minimized/TypeVariables#I#mI(). +// ^^ reference scip-java maven . . minimized/TypeVariables#I#mI(). t.mCPublic(); // ^ reference local 0 -// ^^^^^^^^ reference semanticdb maven . . minimized/TypeVariables#C#mCPublic(). +// ^^^^^^^^ reference scip-java maven . . minimized/TypeVariables#C#mCPublic(). t.mCProtected(); // ^ reference local 0 -// ^^^^^^^^^^^ reference semanticdb maven . . minimized/TypeVariables#C#mCProtected(). +// ^^^^^^^^^^^ reference scip-java maven . . minimized/TypeVariables#C#mCProtected(). t.mCPackage(); // ^ reference local 0 -// ^^^^^^^^^ reference semanticdb maven . . minimized/TypeVariables#C#mCPackage(). +// ^^^^^^^^^ reference scip-java maven . . minimized/TypeVariables#C#mCPackage(). } -// ⌃ enclosing_range_end semanticdb maven . . minimized/TypeVariables#app().[T] -// ⌃ enclosing_range_end semanticdb maven . . minimized/TypeVariables#app(). +// ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#app().[T] +// ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#app(). } -//⌃ enclosing_range_end semanticdb maven . . minimized/TypeVariables# +//⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables# diff --git a/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala b/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala index b17dafe9..d53ea191 100644 --- a/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala +++ b/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala @@ -39,7 +39,7 @@ class MinimizedSnapshotScipGenerator { val snapshotOutput = AbsolutePath(Files.createTempDirectory("scip-java")) run( List( - "index-semanticdb", + "index-scip", "--cwd", sourceroot.toString(), "--output", diff --git a/tests/unit/src/main/scala/tests/SimpleFileManager.java b/tests/unit/src/main/scala/tests/SimpleFileManager.java index c75b586b..c3786c0e 100644 --- a/tests/unit/src/main/scala/tests/SimpleFileManager.java +++ b/tests/unit/src/main/scala/tests/SimpleFileManager.java @@ -9,7 +9,7 @@ import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; -import com.sourcegraph.semanticdb_javac.SemanticdbPlugin; +import com.sourcegraph.scip_javac.ScipPlugin; public class SimpleFileManager extends ForwardingJavaFileManager { @@ -28,7 +28,7 @@ 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(SemanticdbPlugin.stubClassName)) { + if (!className.equals(ScipPlugin.stubClassName)) { compiled.add(result); } return result; diff --git a/tests/unit/src/main/scala/tests/TempDirectories.scala b/tests/unit/src/main/scala/tests/TempDirectories.scala index 86e6a571..50f32789 100644 --- a/tests/unit/src/main/scala/tests/TempDirectories.scala +++ b/tests/unit/src/main/scala/tests/TempDirectories.scala @@ -14,7 +14,7 @@ trait TempDirectories { override def apply(): Path = path override def beforeEach(context: BeforeEach): Unit = { - path = Files.createTempDirectory("semanticdb-javac") + path = Files.createTempDirectory("scip-javac") } override def afterEach(context: AfterEach): Unit = { diff --git a/tests/unit/src/main/scala/tests/TestCompiler.scala b/tests/unit/src/main/scala/tests/TestCompiler.scala index 13f9bed2..05bfa6b0 100644 --- a/tests/unit/src/main/scala/tests/TestCompiler.scala +++ b/tests/unit/src/main/scala/tests/TestCompiler.scala @@ -37,21 +37,20 @@ class TestCompiler( this(TestCompiler.PROCESSOR_PATH, Nil, targetroot) } - def compileSemanticdbDirectory(dir: Path): CompileResult = compileSemanticdb( + def compileScipDirectory(dir: Path): CompileResult = compileScip( inputsFromDirectory(dir) ) - def compileSemanticdb(inputs: Seq[Input.VirtualFile]): CompileResult = - compile( - inputs, - List( - String.format( - "-Xplugin:semanticdb -verbose -text:on -sourceroot:%s -targetroot:%s", - sourceroot, - targetroot - ) + def compileScip(inputs: Seq[Input.VirtualFile]): CompileResult = compile( + inputs, + List( + String.format( + "-Xplugin:scip -verbose -text:on -sourceroot:%s -targetroot:%s", + sourceroot, + targetroot ) ) + ) def compile( inputs: Seq[Input.VirtualFile], diff --git a/tests/unit/src/test/scala/tests/JavacClassesDirectorySuite.scala b/tests/unit/src/test/scala/tests/JavacClassesDirectorySuite.scala index 6674ba01..364b1127 100644 --- a/tests/unit/src/test/scala/tests/JavacClassesDirectorySuite.scala +++ b/tests/unit/src/test/scala/tests/JavacClassesDirectorySuite.scala @@ -30,7 +30,7 @@ class JavacClassesDirectorySuite extends FunSuite with TempDirectories { ) ), List( - s"-Xplugin:semanticdb -sourceroot:${sourceroot()} -targetroot:javac-classes-directory", + s"-Xplugin:scip -sourceroot:${sourceroot()} -targetroot:javac-classes-directory", "-d", sourceroot().toString ) diff --git a/tests/unit/src/test/scala/tests/JdkPackageSuite.scala b/tests/unit/src/test/scala/tests/JdkPackageSuite.scala index 45bdabdf..60c93874 100644 --- a/tests/unit/src/test/scala/tests/JdkPackageSuite.scala +++ b/tests/unit/src/test/scala/tests/JdkPackageSuite.scala @@ -1,6 +1,6 @@ package tests -import com.sourcegraph.scip_semanticdb.JdkPackage +import com.sourcegraph.scip_aggregator.JdkPackage 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 3e604215..8acdfefb 100644 --- a/tests/unit/src/test/scala/tests/OverridesSuite.scala +++ b/tests/unit/src/test/scala/tests/OverridesSuite.scala @@ -24,7 +24,7 @@ class OverridesSuite extends FunSuite with TempDirectories { val compiler = new TestCompiler(targetroot()) val relativePath = "example.Parent".replace('.', '/') + ".java" val input = Input.VirtualFile(relativePath, source) - val result = compiler.compileSemanticdb(List(input)) + val result = compiler.compileScip(List(input)) val document = result.document.orNull val info = document .getSymbolsList diff --git a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala b/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala index aa4a89fb..e27cdb9a 100644 --- a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala +++ b/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala @@ -29,7 +29,7 @@ class SnapshotCommandSuite extends MopedSuite(ScipJava.app) { val targetroot = workingDirectory.resolve("target/main") val sourcepath = workingDirectory.resolve("main/Sample.java") val code = new String(Files.readAllBytes(sourcepath)) - new TestCompiler(targetroot).compileSemanticdb( + new TestCompiler(targetroot).compileScip( List(Input.VirtualFile("main/Sample.java", code)) ) @@ -37,7 +37,7 @@ class SnapshotCommandSuite extends MopedSuite(ScipJava.app) { val indexExit = app().run( List( - "index-semanticdb", + "index-scip", "--output", targetroot.resolve("index.scip").toString, targetroot.toString @@ -57,37 +57,37 @@ class SnapshotCommandSuite extends MopedSuite(ScipJava.app) { | /** | * Sample class | */ - |//⌄ enclosing_range_start semanticdb maven . . main/Sample# + |//⌄ enclosing_range_start scip-java maven . . main/Sample# | public class Sample { - |// ^^^^^^ definition semanticdb maven . . main/Sample# + |// ^^^^^^ definition scip-java maven . . main/Sample# |// display_name Sample |// signature_documentation java public class Sample |// kind Class |// documentation Sample class\n - |// ^^^^^^ definition semanticdb maven . . main/Sample#``(). + |// ^^^^^^ definition scip-java maven . . main/Sample#``(). |// display_name |// signature_documentation java public Sample() |// kind Constructor | /** | * Main application entry point | */ - |// ⌄ enclosing_range_start semanticdb maven . . main/Sample#main(). + |// ⌄ enclosing_range_start scip-java maven . . main/Sample#main(). |// ⌄ enclosing_range_start local 0 | public static void main(String[] asdf) {} - |// ^^^^ definition semanticdb maven . . main/Sample#main(). + |// ^^^^ definition scip-java maven . . main/Sample#main(). |// display_name main |// signature_documentation java public static void main(String[] asdf) |// kind StaticMethod |// documentation Main application entry point\n - |// ^^^^^^ reference semanticdb maven jdk 11 java/lang/String# + |// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# |// ^^^^ definition local 0 |// display_name asdf |// signature_documentation java String[] asdf - |// enclosing_symbol semanticdb maven . . main/Sample#main(). + |// enclosing_symbol scip-java maven . . main/Sample#main(). |// ⌃ enclosing_range_end local 0 - |// ⌃ enclosing_range_end semanticdb maven . . main/Sample#main(). + |// ⌃ enclosing_range_end scip-java maven . . main/Sample#main(). | } - |//⌃ enclosing_range_end semanticdb maven . . main/Sample# + |//⌃ enclosing_range_end scip-java maven . . main/Sample# |""".stripMargin ) } diff --git a/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala b/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala index 9888e162..9bb612cf 100644 --- a/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala +++ b/tests/unit/src/test/scala/tests/SymbolDescriptorSuite.scala @@ -2,8 +2,8 @@ package tests import scala.meta.internal.semanticdb.Scala._ -import com.sourcegraph.scip_semanticdb.SymbolDescriptor -import com.sourcegraph.semanticdb.SemanticdbSymbols.Descriptor.Kind +import com.sourcegraph.scip.ScipSymbols.Descriptor.Kind +import com.sourcegraph.scip_aggregator.SymbolDescriptor import munit.FunSuite import munit.TestOptions diff --git a/tests/unit/src/test/scala/tests/TargetedSuite.scala b/tests/unit/src/test/scala/tests/TargetedSuite.scala index c54600b7..da08a3d5 100644 --- a/tests/unit/src/test/scala/tests/TargetedSuite.scala +++ b/tests/unit/src/test/scala/tests/TargetedSuite.scala @@ -42,7 +42,7 @@ class TargetedSuite extends FunSuite with TempDirectories { Position.Range(input, m.start - startOffset, m.end - endOffset) }) .toList - val result = compiler.compileSemanticdb(List(input)) + val result = compiler.compileScip(List(input)) val document = result.document.orNull val occurrences = document.getOccurrencesList.asScala.toList val symbols: List[String] = positions.map { pos => From 9330f4cc39e7172b53ffa10bc0ec8d354a390a95 Mon Sep 17 00:00:00 2001 From: jupblb Date: Thu, 4 Jun 2026 20:56:29 +0200 Subject: [PATCH 4/9] Fix Bazel aspect SCIP file/dir name collision --- scip-java/src/main/resources/scip-java/scip_java.bzl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scip-java/src/main/resources/scip-java/scip_java.bzl b/scip-java/src/main/resources/scip-java/scip_java.bzl index 6e377251..d880f407 100644 --- a/scip-java/src/main/resources/scip-java/scip_java.bzl +++ b/scip-java/src/main/resources/scip-java/scip_java.bzl @@ -9,13 +9,12 @@ different contents. This aspect is needed for scip-java to inspect the structure of the Bazel build and register actions to index all java_library/java_test/java_binary targets. The result of running this aspect is that your bazel-bin/ directory will contain -many *.scip (https://github.com/sourcegraph/scip) and -*.scip (https://scalameta.org/docs/scip/specification.html) files. +many *.scip (https://github.com/sourcegraph/scip) files. These files encode information about which symbols are referenced from which locations in your source code. This aspect only works on Linux when using the `local` spawn strategy because -the `run_shell` action writes SCIP and SCIP files to the provided +the `run_shell` action writes SCIP files to the provided --targetroot argument. It should be possible to avoid this requirement in the future if there's a strong desire to make the aspect work with the default (sandboxed) spawn strategy. @@ -128,7 +127,7 @@ def _scip_java(target, ctx): build_config_path = ctx.actions.declare_file(ctx.label.name + ".scip.json") scip_output = ctx.actions.declare_file(ctx.label.name + ".scip") - targetroot = ctx.actions.declare_directory(ctx.label.name + ".scip") + targetroot = ctx.actions.declare_directory(ctx.label.name + ".scip-targetroot") ctx.actions.write( output = build_config_path, content = json.encode(build_config), From 2abd100f9bc4fa46b11d68defe036d9df56cf699 Mon Sep 17 00:00:00 2001 From: jupblb Date: Thu, 4 Jun 2026 21:07:27 +0200 Subject: [PATCH 5/9] Fix mangled SCIP/SemanticDB doc references --- README.md | 2 +- docs/design.md | 31 ++++++++++--------- docs/getting-started.md | 2 +- .../main/resources/scip-java/scip_java.bzl | 2 +- .../scip_javac/GlobalSymbolsCache.java | 5 +-- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index cfa746a1..c1ce4f0d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Java and Kotlin indexer for [SCIP](https://github.com/sourcegraph/scip) ![](https://img.shields.io/badge/status-development-green?style=flat) +# Java and Kotlin indexer for [SCIP](https://github.com/scip-code/scip) ![](https://img.shields.io/badge/status-development-green?style=flat) | Documentation | Link | | -------------------- | ---------------------------------------------------------------------- | diff --git a/docs/design.md b/docs/design.md index ef0469c3..39de7302 100644 --- a/docs/design.md +++ b/docs/design.md @@ -5,10 +5,10 @@ title: Design This project is implemented as a [Java compiler plugin](https://docs.oracle.com/en/java/javase/11/docs/api/jdk.compiler/com/sun/source/util/Plugin.html) -that generates one -[SCIP](https://scalameta.org/docs/scip/specification.html) file for -every `*.java` source file. After compilation completes, the SCIP files -are processed to produce SCIP. +that generates one partial +[SCIP](https://github.com/scip-code/scip) index (a "shard") for +every `*.java` source file. After compilation completes, the per-file SCIP +shards are merged into a single SCIP index. ### Why Java compiler plugin? @@ -25,20 +25,21 @@ There are several benefits to implementing scip-java as a compiler plugin: installed system dependencies, custom compiler options and custom annotation processors. -### Why SCIP? +### Why per-file SCIP shards? -SCIP is Protobuf schema for information about symbols and types in Java -programs and other languages. There are several benefits to using SCIP as -an intermediary representation for SCIP: +[SCIP](https://github.com/scip-code/scip) is a Protobuf schema for information +about symbols and types in Java programs and other languages. There are several +benefits to emitting one SCIP shard per source file and merging them afterwards: - **Simplicity**: It's easy to translate a single Java source file into a single - SCIP file inside a compiler plugin. It's more complicated to produce - SCIP because compiler plugins does not have access to a project-wide context, - which is necessary to produce accurate definitions and hovers in multi-module - projects with external library dependencies. -- **Performance**: SCIP is fast to write and read. Each compilation unit - can be processed independently to keep memory usage low. The final conversion - from SCIP to SCIP can be safely parallelized. + SCIP shard inside a compiler plugin. It's more complicated to produce a + complete project-wide index directly because compiler plugins do not have + access to a project-wide context, which is necessary to produce accurate + definitions and hovers in multi-module projects with external library + dependencies. +- **Performance**: SCIP shards are fast to write and read. Each compilation unit + can be processed independently to keep memory usage low. The final merge of + the shards into a single index can be safely parallelized. - **Cross-repository**: Compiler plugins have access to both source code and the classpath (compiled bytecode of upstream dependencies). SCIP has been designed so that it's also possible to generate spec-compliant symbols from diff --git a/docs/getting-started.md b/docs/getting-started.md index 401e0a29..c295ced8 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -4,7 +4,7 @@ title: Getting started --- By following the instructions on this page, you should be able to generate a -[SCIP](https://github.com/sourcegraph/scip) index of your Java codebase using +[SCIP](https://github.com/scip-code/scip) index of your Java codebase using Gradle, Maven, or Bazel. See [Supported build tools](#supported-build-tools) for an overview of other build tools that we're planning to support in the future. diff --git a/scip-java/src/main/resources/scip-java/scip_java.bzl b/scip-java/src/main/resources/scip-java/scip_java.bzl index d880f407..d325e2b8 100644 --- a/scip-java/src/main/resources/scip-java/scip_java.bzl +++ b/scip-java/src/main/resources/scip-java/scip_java.bzl @@ -9,7 +9,7 @@ different contents. This aspect is needed for scip-java to inspect the structure of the Bazel build and register actions to index all java_library/java_test/java_binary targets. The result of running this aspect is that your bazel-bin/ directory will contain -many *.scip (https://github.com/sourcegraph/scip) files. +many *.scip (https://github.com/scip-code/scip) files. These files encode information about which symbols are referenced from which locations in your source code. diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/GlobalSymbolsCache.java b/scip-javac/src/main/java/com/sourcegraph/scip_javac/GlobalSymbolsCache.java index 367da68b..a0705fc7 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/GlobalSymbolsCache.java +++ b/scip-javac/src/main/java/com/sourcegraph/scip_javac/GlobalSymbolsCache.java @@ -117,7 +117,7 @@ private ScipSymbols.Descriptor scipDescriptor(Element sym) { } /** - * Computes the method "disambiguator" according to the SCIP spec. + * Computes the method "disambiguator" according to the SemanticDB spec. * *

    Concatenation of a left parenthesis ("("), a tag and a right parenthesis (")"). If * the definition is not overloaded, the tag is empty. If the definition is overloaded, the tag is @@ -131,7 +131,8 @@ private ScipSymbols.Descriptor scipDescriptor(Element sym) { * * * - *

    Link to SCIP spec. + *

    Link to + * SemanticDB spec. */ private String methodDisambiguator(ExecutableElement sym) { Iterable elements = sym.getEnclosingElement().getEnclosedElements(); From c6f8d5c4f9f991c3e9990eaba875bec3e2e4f96c Mon Sep 17 00:00:00 2001 From: jupblb Date: Thu, 4 Jun 2026 21:15:16 +0200 Subject: [PATCH 6/9] Recreate pipeline diagram for SCIP shard architecture --- docs/assets/scip-javac-pipeline.svg | 40 +++++++++++++++++++++++++++++ docs/manual-configuration.md | 4 +-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 docs/assets/scip-javac-pipeline.svg diff --git a/docs/assets/scip-javac-pipeline.svg b/docs/assets/scip-javac-pipeline.svg new file mode 100644 index 00000000..568f2aa0 --- /dev/null +++ b/docs/assets/scip-javac-pipeline.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + scip-javac + index-scip + + + + + + + + RequestHandler.java + + + + + + + + + + + RequestHandler.java.scip + + + + + + + index.scip + diff --git a/docs/manual-configuration.md b/docs/manual-configuration.md index 11e80e1f..95294be3 100644 --- a/docs/manual-configuration.md +++ b/docs/manual-configuration.md @@ -203,8 +203,8 @@ references" to show results from multiple repositories. First, install the `scip-java` command-line tool according to the instructions in the [getting started guide](getting-started.md). -Next, run the `scip-java index-scip` command to convert SCIP files -into SCIP. +Next, run the `scip-java index-scip` command to merge the per-file SCIP +files into a single SCIP index. ```sh ❯ scip-java index-scip $TARGETROOT From 8274a55a06976e98d9b875b612744f872ec9aec2 Mon Sep 17 00:00:00 2001 From: jupblb Date: Thu, 4 Jun 2026 21:31:18 +0200 Subject: [PATCH 7/9] Rename index-scip command to aggregate --- build.sbt | 2 +- docs/assets/scip-javac-pipeline.svg | 2 +- docs/manual-configuration.md | 4 ++-- scip-java/src/main/resources/scip-java/scip_java.bzl | 2 +- .../ConsoleScipAggregatorReporter.scala | 2 +- .../scala/com/sourcegraph/scip_java/ScipJava.scala | 4 ++-- .../sourcegraph/scip_java/buildtools/BuildTool.scala | 2 +- ...IndexScipCommand.scala => AggregateCommand.scala} | 12 ++++++------ .../scip_java/commands/IndexCommand.scala | 2 +- .../scala/tests/MinimizedSnapshotScipGenerator.scala | 2 +- .../src/test/scala/tests/SnapshotCommandSuite.scala | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) rename scip-java/src/main/scala/com/sourcegraph/scip_java/commands/{IndexScipCommand.scala => AggregateCommand.scala} (92%) diff --git a/build.sbt b/build.sbt index 67050a19..638d7ae9 100644 --- a/build.sbt +++ b/build.sbt @@ -486,7 +486,7 @@ lazy val scipKotlincMinimized = project Def.sequential( Compile / compile, (cli / Compile / runMain).toTask( - s" $mainCls index-scip --no-emit-inverse-relationships --cwd $srcRoot --output $scipOut $tgtRoot" + s" $mainCls aggregate --no-emit-inverse-relationships --cwd $srcRoot --output $scipOut $tgtRoot" ), (cli / Compile / runMain).toTask( s" $mainCls snapshot --cwd $srcRoot --output $snapDir $tgtRoot" diff --git a/docs/assets/scip-javac-pipeline.svg b/docs/assets/scip-javac-pipeline.svg index 568f2aa0..418f373b 100644 --- a/docs/assets/scip-javac-pipeline.svg +++ b/docs/assets/scip-javac-pipeline.svg @@ -10,7 +10,7 @@ scip-javac - index-scip + aggregate diff --git a/docs/manual-configuration.md b/docs/manual-configuration.md index 95294be3..9c5c2c25 100644 --- a/docs/manual-configuration.md +++ b/docs/manual-configuration.md @@ -203,11 +203,11 @@ references" to show results from multiple repositories. First, install the `scip-java` command-line tool according to the instructions in the [getting started guide](getting-started.md). -Next, run the `scip-java index-scip` command to merge the per-file SCIP +Next, run the `scip-java aggregate` command to merge the per-file SCIP files into a single SCIP index. ```sh -❯ scip-java index-scip $TARGETROOT +❯ scip-java aggregate $TARGETROOT ❯ file index.scip index.scip: JSON data ``` diff --git a/scip-java/src/main/resources/scip-java/scip_java.bzl b/scip-java/src/main/resources/scip-java/scip_java.bzl index d325e2b8..67ba9bd2 100644 --- a/scip-java/src/main/resources/scip-java/scip_java.bzl +++ b/scip-java/src/main/resources/scip-java/scip_java.bzl @@ -139,7 +139,7 @@ def _scip_java(target, ctx): # Prefix bazel-out paths with $PWD (the execroot) so they don't depend # on the workspace-level bazel-out convenience symlink, which doesn't # exist on a cold build. - command = "\"{}\" index --no-cleanup --index-scip.allow-empty-index --cwd \"{}\" --targetroot \"$PWD/{}\" --scip-config \"$PWD/{}\" --output \"$PWD/{}\"".format( + command = "\"{}\" index --no-cleanup --aggregate.allow-empty-index --cwd \"{}\" --targetroot \"$PWD/{}\" --scip-config \"$PWD/{}\" --output \"$PWD/{}\"".format( ctx.var["scip_java_binary"], ctx.var["sourceroot"], targetroot.path, diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_aggregator/ConsoleScipAggregatorReporter.scala b/scip-java/src/main/scala/com/sourcegraph/scip_aggregator/ConsoleScipAggregatorReporter.scala index d8abb9e7..fe0db55d 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_aggregator/ConsoleScipAggregatorReporter.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_aggregator/ConsoleScipAggregatorReporter.scala @@ -7,7 +7,7 @@ import moped.cli.Application import moped.progressbars.InteractiveProgressBar /** - * Console reporter for index-scip command. + * Console reporter for the aggregate command. */ class ConsoleScipAggregatorReporter(app: Application) extends ScipAggregatorReporter { diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala index 6274de58..a6355ff7 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala @@ -3,7 +3,7 @@ package com.sourcegraph.scip_java import java.io.PrintStream import com.sourcegraph.scip_java.commands.IndexCommand -import com.sourcegraph.scip_java.commands.IndexScipCommand +import com.sourcegraph.scip_java.commands.AggregateCommand import com.sourcegraph.scip_java.commands.SnapshotCommand import moped.cli.Application import moped.cli.CommandParser @@ -19,7 +19,7 @@ object ScipJava { CommandParser[HelpCommand], CommandParser[VersionCommand], CommandParser[IndexCommand], - CommandParser[IndexScipCommand], + CommandParser[AggregateCommand], CommandParser[SnapshotCommand] ) ) diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BuildTool.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BuildTool.scala index a2e86cc5..e5fbb501 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BuildTool.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BuildTool.scala @@ -53,7 +53,7 @@ object BuildTool { generateScipResult.exitCode } else { index - .indexScip + .aggregate .copy( output = index.finalOutput, targetroot = List(targetroot), diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexScipCommand.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/AggregateCommand.scala similarity index 92% rename from scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexScipCommand.scala rename to scip-java/src/main/scala/com/sourcegraph/scip_java/commands/AggregateCommand.scala index 55b634f8..a5d69491 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexScipCommand.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/AggregateCommand.scala @@ -18,12 +18,12 @@ import moped.cli.CommandParser import org.scip_code.scip.ToolInfo @Description("Aggregates per-source SCIP shards into a single SCIP index file.") -@Usage("scip-java index-scip [OPTIONS ...] [POSITIONAL ARGUMENTS ...]") +@Usage("scip-java aggregate [OPTIONS ...] [POSITIONAL ARGUMENTS ...]") @ExampleUsage( - "scip-java index-scip --out=myindex.scip my/targetroot1 my/targetroot2" + "scip-java aggregate --out=myindex.scip my/targetroot1 my/targetroot2" ) -@CommandName("index-scip") -final case class IndexScipCommand( +@CommandName("aggregate") +final case class AggregateCommand( @Description("The name of the output file.") output: Path = Paths.get("index.scip"), @Description("Whether to process the SCIP shards in parallel") @@ -94,7 +94,7 @@ final case class IndexScipCommand( } } -object IndexScipCommand { - val default = IndexScipCommand() +object AggregateCommand { + val default = AggregateCommand() implicit val parser = CommandParser.derive(default) } diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala index a5ebabe7..bf3c3df3 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala @@ -87,7 +87,7 @@ case class IndexCommand( @TrailingArguments() buildCommand: List[String] = Nil, @Hidden - indexScip: IndexScipCommand = IndexScipCommand(), + aggregate: AggregateCommand = AggregateCommand(), @Inline app: Application = Application.default ) extends Command { diff --git a/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala b/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala index d53ea191..6fd12c07 100644 --- a/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala +++ b/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala @@ -39,7 +39,7 @@ class MinimizedSnapshotScipGenerator { val snapshotOutput = AbsolutePath(Files.createTempDirectory("scip-java")) run( List( - "index-scip", + "aggregate", "--cwd", sourceroot.toString(), "--output", diff --git a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala b/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala index e27cdb9a..659fda04 100644 --- a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala +++ b/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala @@ -37,7 +37,7 @@ class SnapshotCommandSuite extends MopedSuite(ScipJava.app) { val indexExit = app().run( List( - "index-scip", + "aggregate", "--output", targetroot.resolve("index.scip").toString, targetroot.toString From 1356f76642b285c01337365543fea62e8f12ee31 Mon Sep 17 00:00:00 2001 From: jupblb Date: Thu, 4 Jun 2026 21:45:04 +0200 Subject: [PATCH 8/9] Fix CI workflow command name and import order after rename --- .github/workflows/ci.yml | 2 +- .../src/main/scala/com/sourcegraph/scip_java/ScipJava.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c9914ba..9d39e56e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -169,7 +169,7 @@ jobs: mvn clean verify -DskipTests "-Dscip-java.version=$SCIP_JAVA_VERSION" sourcegraph:sourcegraphDependencies working-directory: examples/maven-example - - run: nix develop "$GITHUB_WORKSPACE#jdk${{ matrix.java }}" --command "$SCIP_JAVA_CLI" index-scip target/scip-targetroot + - run: nix develop "$GITHUB_WORKSPACE#jdk${{ matrix.java }}" --command "$SCIP_JAVA_CLI" aggregate target/scip-targetroot working-directory: examples/maven-example - run: | diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala index a6355ff7..5c550ef8 100644 --- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala +++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipJava.scala @@ -2,8 +2,8 @@ package com.sourcegraph.scip_java import java.io.PrintStream -import com.sourcegraph.scip_java.commands.IndexCommand import com.sourcegraph.scip_java.commands.AggregateCommand +import com.sourcegraph.scip_java.commands.IndexCommand import com.sourcegraph.scip_java.commands.SnapshotCommand import moped.cli.Application import moped.cli.CommandParser From 174203a97347827fcd7e3e02379e472fa180e98d Mon Sep 17 00:00:00 2001 From: jupblb Date: Thu, 4 Jun 2026 21:55:04 +0200 Subject: [PATCH 9/9] Minor doc update --- .../java/com/sourcegraph/scip_aggregator/SymbolRewriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolRewriter.java b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolRewriter.java index a6addb6d..b3754faa 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolRewriter.java +++ b/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolRewriter.java @@ -4,7 +4,7 @@ /** * Rewrites bare descriptor symbols emitted by the compiler plugins (e.g. {@code - * _root_/com/example/Foo#}) into fully-qualified SCIP symbols (e.g. {@code scip maven + * _root_/com/example/Foo#}) into fully-qualified SCIP symbols (e.g. {@code scip-java maven * com.example:my-lib 1.0 _root_/com/example/Foo#}) by looking up the descriptor's owning package in * a {@link PackageTable}. *