diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index adc2ec51c..c09db35e7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -56,7 +56,9 @@ These are the main components of the project. | `snapshots/testOnly tests.MinimizedSnapshotSuite` | sbt | Runs fast snapshot tests. Indexes a small set of files under `tests/minimized`. | | `snapshots/testOnly tests.MinimizedSnapshotSuite -- *InnerClasses*` | sbt | Runs only individual tests cases matching the name "InnerClasses". | | `snapshots/test` | sbt | Runs all snapshot tests. | -| `snapshots/run` | sbt | Update snapshot tests. Use this command after you have fixed a bug. | +| `snapshots/run` | sbt | Update only the Java snapshot goldens under `tests/snapshots`. | +| `scipKotlincMinimized/kotlincSnapshots` | sbt | Update only the Kotlin snapshot goldens under `scip-kotlinc/minimized`. | +| `regenerateSnapshots` | sbt | Regenerate ALL snapshot goldens (Java + Kotlin). Run after fixing a bug. | | `cli/run --cwd DIRECTORY` | sbt | Run `scip-java` command-line tool against a given Gradle/Maven build. | | `fixAll` | sbt | Run Scalafmt, Scalafix and Javafmt on all sources. Run this before opening a PR. | diff --git a/build.sbt b/build.sbt index fa90ebe22..db2aaf067 100644 --- a/build.sbt +++ b/build.sbt @@ -72,6 +72,11 @@ commands += "scalafixAll --check" :: "publishLocal" :: s } +commands += + Command.command("regenerateSnapshots") { s => + "snapshots/run" :: "scipKotlincMinimized/kotlincSnapshots" :: s + } + // Shared module with the SCIP shard utilities (symbol encoder, document // builder, on-disk writer) consumed by both the Java compiler plugin // (scip-javac) and the Kotlin compiler plugin (scip-kotlinc). @@ -480,7 +485,14 @@ lazy val scipKotlincMinimized = project val snapDir = (baseDirectory.value / "src" / "generatedSnapshots" / "resources") .getAbsolutePath - val scipOut = s"$tgtRoot/index.scip" + // Write the aggregated index OUTSIDE the scanned targetroot. If it + // lived under `tgtRoot`, a second `kotlincSnapshots` run would feed + // the previous index.scip back into `aggregate`, which re-applies the + // package prefix and yields doubled symbols + // (e.g. `scip-java maven . . scip-java maven . . kotlin/`). + val indexDir = target.value / "scip-index" + IO.createDirectory(indexDir) + val scipOut = (indexDir / "index.scip").getAbsolutePath val mainCls = "com.sourcegraph.scip_java.ScipJava" Def.sequential( Compile / compile, @@ -488,7 +500,8 @@ lazy val scipKotlincMinimized = project s" $mainCls aggregate --no-emit-inverse-relationships --cwd $srcRoot --output $scipOut $tgtRoot" ), (cli / Compile / runMain).toTask( - s" $mainCls snapshot --cwd $srcRoot --output $snapDir $tgtRoot" + s" $mainCls snapshot --cwd $srcRoot --output $snapDir ${indexDir + .getAbsolutePath}" ) ) } diff --git a/flake.lock b/flake.lock index 86c022cd9..3e3901da7 100644 --- a/flake.lock +++ b/flake.lock @@ -18,6 +18,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1778737229, @@ -34,10 +52,46 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1779971959, + "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "scip": "scip" + } + }, + "scip": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1781710865, + "narHash": "sha256-LrzIrhyz5S3BZIsh1roFBbDvxQ3LRgyp5SaQQs8+eDo=", + "owner": "scip-code", + "repo": "scip", + "rev": "1c8430746a2d59ca22d1de3578c3b7bd41085fe7", + "type": "github" + }, + "original": { + "owner": "scip-code", + "repo": "scip", + "type": "github" } }, "systems": { @@ -54,6 +108,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 62d73eb00..7bcf4efdf 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,9 @@ nixpkgs = { url = "github:NixOS/nixpkgs/nixos-25.11"; }; + scip = { + url = "github:scip-code/scip"; + }; }; outputs = @@ -13,11 +16,13 @@ self, flake-utils, nixpkgs, + scip, }: flake-utils.lib.eachDefaultSystem ( system: let pkgs = import nixpkgs { inherit system; }; + scipCli = scip.packages.${system}.default; mkDevShell = jdk: pkgs.mkShellNoCC { @@ -32,6 +37,7 @@ nodejs (sbt.override ({ jre = jdk; })) scalafmt + scipCli yarn ]; }; diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/ScipPrinters.kt b/scip-java/src/main/kotlin/com/sourcegraph/scip_java/ScipPrinters.kt deleted file mode 100644 index 0c5c4ddef..000000000 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/ScipPrinters.kt +++ /dev/null @@ -1,343 +0,0 @@ -package com.sourcegraph.scip_java - -import com.sourcegraph.scip.ScipSymbols -import com.sourcegraph.scip_aggregator.SymbolDescriptor -import kotlin.math.max -import org.scip_code.scip.Document -import org.scip_code.scip.Occurrence -import org.scip_code.scip.SymbolInformation -import org.scip_code.scip.SymbolRole - -/** - * Renders a SCIP `Document` (parsed from an `index.scip` file) into the - * human-readable golden-snapshot format used by the test suite. - * - * The output is annotated source code: every source line is followed by - * comment lines that point at the SCIP occurrences/symbols defined on - * that line. - */ -object ScipPrinters { - - /** - * Indent prefix prepended to each source line so that caret-based - * indicators in snapshot comments can point at arbitrary columns. - */ - const val sourceIndent: String = " " - - // scip-java only indexes Java and Kotlin sources, both of which use `//`. - private const val commentSyntax: String = "//" - - @JvmStatic - fun printTextDocument(doc: Document, text: String): String { - val out = StringBuilder() - val occurrencesByLine: Map> = - doc.occurrencesList.groupBy { it.getRange(0) } - val symtab: Map = - doc.symbolsList.associateBy { it.symbol } - val input = SourceInput(text) - - val syntheticDefinitions: Map> = - doc.symbolsList - .flatMap { info -> - info.relationshipsList - .filter { it.isDefinition } - .map { it.symbol to info } - } - .groupBy({ it.first }, { it.second }) - - val allEnclosingRanges: List = - doc.occurrencesList.mapNotNull { occ -> - val r = occ.enclosingRangeList.map { it.toInt() } - when (r.size) { - 3 -> EnclosingRange(r[0], r[1], r[0], r[2], occ.symbol) - 4 -> EnclosingRange(r[0], r[1], r[2], r[3], occ.symbol) - else -> null - } - } - val enclosingByStartLine = - allEnclosingRanges.groupBy { it.startLine }.mapValues { it.value.sortedBy { r -> r.startChar } } - val enclosingByEndLine = - allEnclosingRanges.groupBy { it.endLine }.mapValues { it.value.sortedBy { r -> r.endChar } } - - linesWithSeparators(text).forEachIndexed { i, line -> - enclosingByStartLine[i]?.forEach { er -> - out.append(commentSyntax) - .append(" ".repeat(er.startChar)) - .append("⌄ enclosing_range_start ") - .append(er.symbol) - .append("\n") - } - out.append(sourceIndent).append(line.replace("\t", " ")) - val occurrences = - (occurrencesByLine[i] ?: emptyList()).sortedWith(occurrenceOrdering) - for (occ in occurrences) { - formatOccurrence(input, out, occ, line, symtab, null) - if ((occ.symbolRoles and SymbolRole.Definition_VALUE) > 0) { - syntheticDefinitions[occ.symbol]?.forEach { syntheticDefinition -> - formatOccurrence(input, out, occ, line, symtab, syntheticDefinition) - } - } - } - enclosingByEndLine[i]?.forEach { er -> - val indent = max(0, er.endChar - 1) - out.append(commentSyntax) - .append(" ".repeat(indent)) - .append("⌃ enclosing_range_end ") - .append(er.symbol) - .append("\n") - } - } - return out.toString() - } - - private data class EnclosingRange( - val startLine: Int, - val startChar: Int, - val endLine: Int, - val endChar: Int, - val symbol: String, - ) - - /** - * Element-wise integer-list comparator for `Occurrence.rangeList`, with - * `symbol` as a tie-breaker. - */ - private val occurrenceOrdering: Comparator = - Comparator { a, b -> - val ra = a.rangeList - val rb = b.rangeList - val n = minOf(ra.size, rb.size) - for (i in 0 until n) { - val cmp = ra[i].toInt().compareTo(rb[i].toInt()) - if (cmp != 0) return@Comparator cmp - } - val sizeCmp = ra.size.compareTo(rb.size) - if (sizeCmp != 0) sizeCmp else a.symbol.compareTo(b.symbol) - } - - private data class OccurrencePos( - val startLine: Int, - val startColumn: Int, - val endLine: Int, - val endColumn: Int, - ) - - /** - * Converts the SCIP `(line, column)` pair to a flat character offset and - * back. The round-trip matters for occurrences whose end column overflows - * its start line (e.g. Kotlin `companion object` definitions), where the - * overflow "carries" the end onto a later line, turning a raw single-line - * range into a rendered multi-line range. - */ - private fun positionOf(input: SourceInput, occ: Occurrence): OccurrencePos { - val rawStartLine: Int - val rawStartColumn: Int - val rawEndLine: Int - val rawEndColumn: Int - when (occ.rangeCount) { - 3 -> { - rawStartLine = occ.getRange(0) - rawStartColumn = occ.getRange(1) - rawEndLine = occ.getRange(0) - rawEndColumn = occ.getRange(2) - } - 4 -> { - rawStartLine = occ.getRange(0) - rawStartColumn = occ.getRange(1) - rawEndLine = occ.getRange(2) - rawEndColumn = occ.getRange(3) - } - else -> throw IllegalArgumentException("Invalid range: $occ") - } - // Empty input has no position (all -1). - if (input.isEmpty) return OccurrencePos(-1, -1, -1, -1) - val start = input.lineToOffset(rawStartLine) + rawStartColumn - val end = input.lineToOffset(rawEndLine) + rawEndColumn - val startLine = input.offsetToLine(start) - val endLine = input.offsetToLine(end) - return OccurrencePos( - startLine = startLine, - startColumn = start - input.lineToOffset(startLine), - endLine = endLine, - endColumn = end - input.lineToOffset(endLine), - ) - } - - private fun formatOccurrence( - input: SourceInput, - out: StringBuilder, - occ: Occurrence, - line: String, - symtab: Map, - syntheticDefinition: SymbolInformation?, - ) { - val pos = positionOf(input, occ) - val isMultiline = pos.startLine != pos.endLine - val width = - if (isMultiline) line.length - pos.startColumn - 1 - else max(1, pos.endColumn - pos.startColumn) - - val isDefinition = (occ.symbolRoles and SymbolRole.Definition_VALUE) > 0 - val role = - when { - syntheticDefinition != null -> "synthetic_definition" - isDefinition -> "definition" - else -> "reference" - } - val indent = - if (pos.startColumn + sourceIndent.length > commentSyntax.length) - " ".repeat(pos.startColumn + sourceIndent.length - commentSyntax.length) - else "" - val caretCharacter = if (syntheticDefinition != null) "_" else "^" - // String.repeat throws on a negative argument; clamp to 0. - val carets = - if (pos.startColumn == 1) caretCharacter.repeat(max(0, width - 1)) - else caretCharacter.repeat(max(0, width)) - - val symbol = syntheticDefinition?.symbol ?: occ.symbol - - // Fail the tests on symbols that aren't valid SCIP. - parseOrThrowExceptionIfInvalid(symbol) - - out.append(commentSyntax) - .append(indent) - .append(carets) - .append(' ') - .append(role) - .append(' ') - .append(symbol) - if (isMultiline) { - out.append(" ${pos.endLine - pos.startLine}:${pos.endColumn}") - } - out.append('\n') - - val info = syntheticDefinition ?: symtab[occ.symbol] - if (info != null && isDefinition) { - val prefix = commentSyntax + " ".repeat(indent.length) + " ".repeat(carets.length) + " " - if (info.displayName.isNotEmpty()) { - out.append(prefix).append("display_name ").append(info.displayName).append('\n') - } - if (info.hasSignatureDocumentation()) { - out.append(prefix) - .append("signature_documentation ") - .append(info.signatureDocumentation.language) - .append(' ') - .append( - info.signatureDocumentation.text - .replace("\n", "\\n") - .replace("\t", "\\t") - ) - .append('\n') - } - if (info.enclosingSymbol.isNotEmpty()) { - out.append(prefix).append("enclosing_symbol ").append(info.enclosingSymbol).append('\n') - } - if (info.kind != SymbolInformation.Kind.UnspecifiedKind) { - out.append(prefix).append("kind ").append(info.kind).append('\n') - } - for (n in 0 until info.documentationCount) { - val documentation = info.getDocumentation(n) - out.append(prefix) - .append("documentation ") - .append(documentation.replace("\n", "\\n").replace("\t", "\\t")) - .append('\n') - } - info.relationshipsList - .sortedBy { it.symbol } - .forEach { relationship -> - out.append(prefix).append("relationship") - if (relationship.isReference) out.append(" is_reference") - if (relationship.isDefinition) out.append(" is_definition") - if (relationship.isImplementation) out.append(" is_implementation") - if (relationship.isTypeDefinition) out.append(" is_type_definition") - out.append(' ').append(relationship.symbol).append('\n') - } - } - } - - /** - * Throws if [scipSymbol] is not a syntactically valid SCIP symbol, so the - * snapshot tests fail fast on a malformed index. The parsed structure isn't - * needed, only the throw-on-invalid behaviour. - */ - private fun parseOrThrowExceptionIfInvalid(scipSymbol: String) { - if (scipSymbol.startsWith("local ")) return - val parts = scipSymbol.split(" ", limit = 5) - require(parts.size == 5) { "Invalid scip symbol: $scipSymbol" } - var current = parts[4] - while (true) { - val descriptor = SymbolDescriptor.parseFromSymbol(current) - if (descriptor.owner == ScipSymbols.ROOT_PACKAGE) return - current = descriptor.owner - } - } - - /** - * Splits text into lines, keeping each line's trailing separator (if any) - * so `\r\n`/`\n` endings round-trip exactly when reassembled. - */ - private fun linesWithSeparators(text: String): List { - val result = mutableListOf() - var start = 0 - var i = 0 - while (i < text.length) { - val c = text[i] - if (c == '\n') { - result += text.substring(start, i + 1) - start = i + 1 - } - i++ - } - if (start < text.length) result += text.substring(start) - return result - } - - /** Offset/line bookkeeping for [positionOf]. */ - private class SourceInput(text: String) { - private val chars: CharArray = text.toCharArray() - - val isEmpty: Boolean = text.isEmpty() - - // Offset of the first character of each line; a trailing sentinel - // (== chars.size) is appended when the text does not end in '\n'. - private val lineIndices: IntArray = run { - val buf = ArrayList() - buf.add(0) - var i = 0 - while (i < chars.size) { - if (chars[i] == '\n') buf.add(i + 1) - i++ - } - if (buf[buf.size - 1] != chars.size) buf.add(chars.size) - buf.toIntArray() - } - - fun lineToOffset(line: Int): Int { - require(line in 0..(lineIndices.size - 1)) { - "$line is not a valid line number, allowed [0..${lineIndices.size - 1}]" - } - return lineIndices[line] - } - - fun offsetToLine(offset: Int): Int { - require(offset in 0..chars.size) { - "$offset is not a valid offset, allowed [0..${chars.size}]" - } - // File ending in '\n': an offset at EOF is last_line+1:0. - if (offset == chars.size && chars.isNotEmpty() && chars[offset - 1] == '\n') { - return lineIndices.size - 1 - } - var lo = 0 - var hi = lineIndices.size - 1 - while (hi - lo > 1) { - val mid = (hi + lo) / 2 - when { - offset < lineIndices[mid] -> hi = mid - lineIndices[mid] == offset -> return mid - else -> lo = mid - } - } - return lo - } - } -} diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/SnapshotCommand.kt b/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/SnapshotCommand.kt index b3316f785..ef9d3bd03 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/SnapshotCommand.kt +++ b/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/SnapshotCommand.kt @@ -11,9 +11,7 @@ import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.types.path import com.sourcegraph.scip_java.ScipJavaApp -import com.sourcegraph.scip_java.ScipPrinters -import java.net.URI -import java.nio.charset.StandardCharsets +import com.sourcegraph.scip_java.buildtools.ProcessRunner import java.nio.file.FileSystems import java.nio.file.FileVisitResult import java.nio.file.Files @@ -69,22 +67,9 @@ class SnapshotCommand : CliktCommand(name = "snapshot") { // Per-source SCIP shards under META-INF/scip/ carry no Metadata; // only the aggregated index does. Skip shards so `scip-java // snapshot ` doesn't trip over them. - val projectRoot = index.metadata.projectRoot - if (projectRoot.isNotEmpty()) { + if (index.metadata.projectRoot.isNotEmpty()) { foundScipFile = true - val rootUri = URI.create(projectRoot) - for (doc in index.documentsList) { - val sourcepath = Paths.get(rootUri.resolve(doc.relativePath)) - val source = - String(Files.readAllBytes(sourcepath), StandardCharsets.UTF_8) - val document = ScipPrinters.printTextDocument(doc, source) - val snapshotOutput = output.resolve(doc.relativePath) - Files.createDirectories(snapshotOutput.parent) - Files.write( - snapshotOutput, - document.toByteArray(StandardCharsets.UTF_8), - ) - } + renderSnapshots(file, index) } } return super.visitFile(file, attrs) @@ -100,4 +85,54 @@ class SnapshotCommand : CliktCommand(name = "snapshot") { throw ProgramResult(1) } } + + /** + * Renders [scipFile] into per-document snapshot files by shelling out to + * the `scip` CLI (expected on `PATH`; provided by the nix devShell). scip + * reads each document's source from disk via the project root recorded in + * the index and writes one annotated snapshot file per document. + * + * `scip snapshot --to` wipes its output directory on each run, so render + * into a temp directory and copy the per-document files into [output]. That + * keeps snapshots from sibling indexes (across multiple target roots) + * intact and preserves the previous command's output layout. + */ + private fun renderSnapshots(scipFile: Path, index: Index) { + val tmp = Files.createTempDirectory("scip-snapshot") + try { + val result = + ProcessRunner.run( + command = + listOf( + "scip", + "snapshot", + "--from", + scipFile.toString(), + "--to", + tmp.toString(), + "--strict=false", + ), + cwd = output, + onStdout = { app.info(it) }, + onStderr = { app.warning(it) }, + ) + if (result.exitCode != 0) { + app.error( + "`scip snapshot` exited with code ${result.exitCode} for $scipFile. " + + "Make sure the `scip` CLI is installed and on your PATH.", + ) + throw ProgramResult(1) + } + for (doc in index.documentsList) { + val rendered = tmp.resolve(doc.relativePath) + if (Files.exists(rendered)) { + val snapshotOutput = output.resolve(doc.relativePath) + Files.createDirectories(snapshotOutput.parent) + Files.write(snapshotOutput, Files.readAllBytes(rendered)) + } + } + } finally { + tmp.toFile().deleteRecursively() + } + } } 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 index b50629be4..067ff851d 100644 --- 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 @@ -3,19 +3,22 @@ //⌄ 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 +// display_name ClassConsumer +// signature_documentation +// > public class ClassConsumer // ^^^^^^^^^^^^^ definition scip-java maven . . snapshots/ClassConsumer#``(). -// display_name -// signature_documentation java public ClassConsumer() // kind Constructor +// display_name +// signature_documentation +// > public ClassConsumer() // ⌄ 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 +// display_name run +// signature_documentation +// > public static void run() 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. @@ -26,3 +29,4 @@ public static void run() { // ⌃ 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 index 962c6bbce..4eaaf8075 100644 --- 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 @@ -1,25 +1,28 @@ - package snapshots; - + package snapshots; + //⌄ enclosing_range_start scip-java maven . . snapshots/CompanionConsumer# - public class CompanionConsumer { + public class CompanionConsumer { // ^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionConsumer# -// display_name CompanionConsumer -// signature_documentation java public class CompanionConsumer // kind Class +// display_name CompanionConsumer +// signature_documentation +// > public class CompanionConsumer // ⌄ enclosing_range_start scip-java maven . . snapshots/CompanionConsumer#``(). - CompanionConsumer() { + CompanionConsumer() { // ^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionConsumer#``(). -// display_name -// signature_documentation java CompanionConsumer() // kind Constructor - CompanionOwner.Companion.create(); +// display_name +// signature_documentation +// > CompanionConsumer() + 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(); + 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 index 77785c36a..6accc86c6 100644 --- 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 @@ -1,45 +1,50 @@ - package snapshots; - + package snapshots; + //⌄ enclosing_range_start scip-java maven . . snapshots/KotlinClass# - public class KotlinClass { + public class KotlinClass { // ^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinClass# -// display_name KotlinClass -// signature_documentation java public class KotlinClass // kind Class +// display_name KotlinClass +// signature_documentation +// > public class KotlinClass // ⌄ enclosing_range_start scip-java maven . . snapshots/KotlinClass#``(). - KotlinClass() throws Class { + KotlinClass() throws Class { // ^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinClass#``(). -// display_name -// signature_documentation java KotlinClass() throws Class // kind Constructor +// display_name +// signature_documentation +// > KotlinClass() throws Class // ^^^^^ reference scip-java maven . . snapshots/Class# - throw new 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 { + void test() throws Class { // ^^^^ definition scip-java maven . . snapshots/KotlinClass#test(). -// display_name test -// signature_documentation java void test() throws Class // kind Method +// display_name test +// signature_documentation +// > void test() throws Class // ^^^^^ reference scip-java maven . . snapshots/Class# - throw new Class(1, ""); + 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 { + void other() throws Class { // ^^^^^ definition scip-java maven . . snapshots/KotlinClass#other(). -// display_name other -// signature_documentation java void other() throws Class // kind Method +// display_name other +// signature_documentation +// > void other() throws Class // ^^^^^ reference scip-java maven . . snapshots/Class# - throw new Class(1); + 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 index b952e169a..7529603c6 100644 --- 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 @@ -1,43 +1,47 @@ - package snapshots; - - import kotlin.collections.CollectionsKt; + 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; + 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 { + public class KotlinLambdas { // ^^^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinLambdas# -// display_name KotlinLambdas -// signature_documentation java public class KotlinLambdas // kind Class +// display_name KotlinLambdas +// signature_documentation +// > public class KotlinLambdas // ^^^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinLambdas#``(). -// display_name -// signature_documentation java public KotlinLambdas() // kind Constructor +// display_name +// signature_documentation +// > public KotlinLambdas() // ⌄ enclosing_range_start scip-java maven . . snapshots/KotlinLambdas#test(). - public void 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 +// display_name test +// signature_documentation +// > public void test() + 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(); + + 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(""); + 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 index a9c03cefd..e0e6693de 100644 --- 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 @@ -3,19 +3,22 @@ //⌄ 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 +// display_name ObjectKtConsumer +// signature_documentation +// > public class ObjectKtConsumer // ^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/ObjectKtConsumer#``(). -// display_name -// signature_documentation java public ObjectKtConsumer() // kind Constructor +// display_name +// signature_documentation +// > public ObjectKtConsumer() // ⌄ 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 +// display_name run +// signature_documentation +// > public static void run() ObjectKt.INSTANCE.fail("boom"); // ^^^^^^^^ reference scip-java maven . . snapshots/ObjectKt# // ^^^^^^^^ reference scip-java maven . . snapshots/ObjectKt#INSTANCE. @@ -24,3 +27,4 @@ public static void run() { // ⌃ 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 index a36b57b79..7ee742752 100644 --- 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 @@ -12,31 +12,39 @@ 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# +// signature_documentation +// > public final class Class : Throwable +// relationship scip-java maven . . kotlin/Throwable# implementation // ^^^^^^^^^^^ definition scip-java maven . . snapshots/Class#``(). // display_name Class -// signature_documentation kotlin public constructor(banana: Int, apple: String): Class +// signature_documentation +// > 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) +// signature_documentation +// > banana: Int // ^^^^^^ definition scip-java maven . . snapshots/Class#banana. // display_name banana -// signature_documentation kotlin private final var banana: Int +// signature_documentation +// > private final var banana: Int +// ^^^^^^ reference scip-java maven . . snapshots/Class#``().(banana) // ^^^^^^ definition scip-java maven . . snapshots/Class#getBanana(). // display_name banana -// signature_documentation kotlin private get(): Int +// signature_documentation +// > private get(): Int // ^^^^^^ definition scip-java maven . . snapshots/Class#setBanana(). // display_name banana -// signature_documentation kotlin private set(value: Int): Unit +// signature_documentation +// > private set(value: Int): Unit // ^^^^^^ definition scip-java maven . . snapshots/Class#setBanana().(value) // display_name value -// signature_documentation kotlin value: Int +// signature_documentation +// > value: Int // ^^^ reference scip-java maven . . kotlin/Int# // ^^^^^ definition scip-java maven . . snapshots/Class#``().(apple) // display_name apple -// signature_documentation kotlin apple: String +// signature_documentation +// > 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. @@ -61,24 +69,29 @@ val asdf = // ^^^^ definition scip-java maven . . snapshots/Class#asdf. // display_name asdf -// signature_documentation kotlin public final val asdf: Any +// signature_documentation +// > public final val asdf: Any // ^^^^ definition scip-java maven . . snapshots/Class#getAsdf(). // display_name asdf -// signature_documentation kotlin public get(): Any +// signature_documentation +// > 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 +// signature_documentation +// > object : Any // ^^^^^^ definition scip-java maven . . snapshots/``#``(). // display_name -// signature_documentation kotlin private constructor(): +// signature_documentation +// > 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 +// signature_documentation +// > public final fun doStuff(): Unit // ⌃ enclosing_range_end scip-java maven . . snapshots/``#doStuff(). } // ⌃ enclosing_range_end scip-java maven . . snapshots/Class#asdf. @@ -90,7 +103,8 @@ constructor() : this(1, "") // ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/Class#``(+1). // display_name Class -// signature_documentation kotlin public constructor(): Class +// signature_documentation +// > public constructor(): Class // ⌃ enclosing_range_end scip-java maven . . snapshots/Class#``(+1). // ⌄ enclosing_range_start scip-java maven . . snapshots/Class#``(+2). @@ -98,10 +112,12 @@ constructor(banana: Int) : this(banana, "") // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/Class#``(+2). // display_name Class -// signature_documentation kotlin public constructor(banana: Int): Class +// signature_documentation +// > public constructor(banana: Int): Class // ^^^^^^ definition scip-java maven . . snapshots/Class#``(+2).(banana) // display_name banana -// signature_documentation kotlin banana: Int +// signature_documentation +// > 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) @@ -111,7 +127,8 @@ fun run() { // ^^^ definition scip-java maven . . snapshots/Class#run(). // display_name run -// signature_documentation kotlin public final fun run(): Unit +// signature_documentation +// > public final fun run(): Unit println(Class::class) // ^^^^^^^ reference scip-java maven . . kotlin/io/println(). println("I eat $banana for lunch") @@ -127,3 +144,4 @@ // ⌃ 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 index 8d7e34908..d81175cdb 100644 --- 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 @@ -6,24 +6,29 @@ class CompanionOwner { // ^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionOwner# // display_name CompanionOwner -// signature_documentation kotlin public final class CompanionOwner : Any +// signature_documentation +// > public final class CompanionOwner : Any // ^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionOwner#``(). // display_name CompanionOwner -// signature_documentation kotlin public constructor(): CompanionOwner +// signature_documentation +// > 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 +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionOwner#Companion# +// display_name Companion +// signature_documentation +// > public final companion object Companion : Any +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionOwner#Companion#``(). +// display_name Companion +// signature_documentation +// > 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 +// signature_documentation +// > 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(). @@ -34,7 +39,8 @@ fun create(): Int = CompanionOwner.create().hashCode() // ^^^^^^ definition scip-java maven . . snapshots/CompanionOwner#create(). // display_name create -// signature_documentation kotlin public final fun create(): Int +// signature_documentation +// > 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(). @@ -42,3 +48,4 @@ } //⌃ 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 index 3261f8c14..11e04754d 100644 --- 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 @@ -11,10 +11,12 @@ abstract class DocstringSuperclass // ^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/DocstringSuperclass# // display_name DocstringSuperclass -// signature_documentation kotlin public abstract class DocstringSuperclass : Any +// signature_documentation +// > public abstract class DocstringSuperclass : Any // ^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/DocstringSuperclass#``(). // display_name DocstringSuperclass -// signature_documentation kotlin public constructor(): DocstringSuperclass +// signature_documentation +// > 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# @@ -23,14 +25,18 @@ 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# +// signature_documentation +// > public final class Docstrings : DocstringSuperclass, Serializable +// documentation +// > Example class docstring. +// relationship scip-java maven . . snapshots/DocstringSuperclass# implementation +// relationship scip-java maven jdk 11 java/io/Serializable# implementation // ^^^^^^^^^^ definition scip-java maven . . snapshots/Docstrings#``(). // display_name Docstrings -// signature_documentation kotlin public constructor(): Docstrings -// documentation Example class docstring. +// signature_documentation +// > public constructor(): Docstrings +// documentation +// > Example class docstring. // ^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . snapshots/DocstringSuperclass# // ^^^^^^^^^^^^ reference scip-java maven jdk 11 java/io/Serializable# } @@ -42,6 +48,9 @@ fun docstrings() { } // ^^^^^^^^^^ definition scip-java maven . . snapshots/docstrings(). // display_name docstrings -// signature_documentation kotlin public final fun docstrings(): Unit -// documentation Example method docstring. +// signature_documentation +// > 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 index d2cf4c23b..2b9224e80 100644 --- 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 @@ -6,10 +6,12 @@ fun sampleText(x: String = "") { // ^^^^^^^^^^ definition scip-java maven . . snapshots/sampleText(). // display_name sampleText -// signature_documentation kotlin public final fun sampleText(x: String = ...): Unit +// signature_documentation +// > public final fun sampleText(x: String = ...): Unit // ^ definition scip-java maven . . snapshots/sampleText().(x) // display_name x -// signature_documentation kotlin x: String = ... +// signature_documentation +// > x: String = ... // ^^^^^^ reference scip-java maven . . kotlin/String# // ⌃ enclosing_range_end scip-java maven . . snapshots/sampleText().(x) println(x) @@ -17,3 +19,4 @@ // ^ 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 index 8de9f10f3..f2e6bd519 100644 --- 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 @@ -6,18 +6,21 @@ 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# +// signature_documentation +// > public final class Overrides : {kotlin/AutoCloseable=} AutoCloseable +// relationship scip-java maven jdk 11 java/lang/AutoCloseable# implementation // ^^^^^^^^^ definition scip-java maven . . snapshots/Overrides#``(). // display_name Overrides -// signature_documentation kotlin public constructor(): Overrides +// signature_documentation +// > 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(). +// signature_documentation +// > public open override fun close(): Unit +// relationship scip-java maven jdk 11 java/lang/AutoCloseable#close(). implementation TODO("Not yet implemented") // ^^^^ reference scip-java maven . . kotlin/TODO(+1). } @@ -30,16 +33,19 @@ interface Animal { // ^^^^^^ definition scip-java maven . . snapshots/Animal# // display_name Animal -// signature_documentation kotlin public abstract interface Animal : Any +// signature_documentation +// > 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 +// signature_documentation +// > public abstract val favoriteNumber: Int // ^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/Animal#getFavoriteNumber(). // display_name favoriteNumber -// signature_documentation kotlin public get(): Int +// signature_documentation +// > 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(). @@ -47,7 +53,9 @@ fun sound(): String // ^^^^^ definition scip-java maven . . snapshots/Animal#sound(). // display_name sound -// signature_documentation kotlin public abstract fun sound(): String\n +// signature_documentation +// > public abstract fun sound(): String +// > // ^^^^^^ reference scip-java maven . . kotlin/String# // ⌃ enclosing_range_end scip-java maven . . snapshots/Animal#sound(). } @@ -57,23 +65,27 @@ 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# +// signature_documentation +// > public open class Bird : Animal +// relationship scip-java maven . . snapshots/Animal# implementation // ^^^^ definition scip-java maven . . snapshots/Bird#``(). // display_name Bird -// signature_documentation kotlin public constructor(): Bird +// signature_documentation +// > 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 +// signature_documentation +// > 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 +// signature_documentation +// > public get(): Int // ⌃ enclosing_range_end scip-java maven . . snapshots/Bird#favoriteNumber. // ⌃ enclosing_range_end scip-java maven . . snapshots/Bird#getFavoriteNumber(). @@ -81,8 +93,9 @@ 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(). +// signature_documentation +// > public open override fun sound(): String +// relationship scip-java maven . . snapshots/Animal#sound(). implementation // ^^^^^^ reference scip-java maven . . kotlin/String# return "tweet" } @@ -95,31 +108,36 @@ 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# +// signature_documentation +// > public final class Seagull : Bird +// relationship scip-java maven . . snapshots/Bird# implementation // ^^^^^^^ definition scip-java maven . . snapshots/Seagull#``(). // display_name Seagull -// signature_documentation kotlin public constructor(): Seagull +// signature_documentation +// > 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 +// signature_documentation +// > 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 +// signature_documentation +// > 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(). +// signature_documentation +// > public open override fun sound(): String +// relationship scip-java maven . . snapshots/Bird#sound(). implementation // ^^^^^^ reference scip-java maven . . kotlin/String# return "squawk" } @@ -127,3 +145,4 @@ } //⌃ enclosing_range_end scip-java maven . . snapshots/Seagull# //⌃ enclosing_range_end scip-java maven . . snapshots/Seagull#``(). + diff --git a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt index 65909152c..0d80eb5bc 100644 --- a/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt +++ b/scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/kotlin/snapshots/Lambdas.kt @@ -6,20 +6,24 @@ // ⌄ enclosing_range_start local 0 // ⌄ enclosing_range_start local 1 val x = arrayListOf().forEachIndexed { i, s -> println("$i $s") } -// ^ definition scip-java maven . . snapshots/getX(). -// display_name x -// signature_documentation kotlin public get(): Unit // ^ definition scip-java maven . . snapshots/x. // display_name x -// signature_documentation kotlin public final val x: Unit +// signature_documentation +// > public final val x: Unit +// ^ definition scip-java maven . . snapshots/getX(). +// display_name x +// signature_documentation +// > public get(): Unit // ^^^^^^^^^^^ 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 +// signature_documentation +// > i: Int // ^ definition local 1 // display_name s -// signature_documentation kotlin s: String +// signature_documentation +// > s: String // ^^^^^^^ reference scip-java maven . . kotlin/io/println(). // ^ reference local 0 // ^ reference local 1 @@ -31,12 +35,14 @@ //⌄ enclosing_range_start scip-java maven . . snapshots/y. //⌄ enclosing_range_start scip-java maven . . snapshots/getY(). val y = "fdsa".run { this.toByteArray() } -// ^ definition scip-java maven . . snapshots/getY(). -// display_name y -// signature_documentation kotlin public get(): ByteArray // ^ definition scip-java maven . . snapshots/y. // display_name y -// signature_documentation kotlin public final val y: ByteArray +// signature_documentation +// > public final val y: ByteArray +// ^ definition scip-java maven . . snapshots/getY(). +// display_name y +// signature_documentation +// > public get(): ByteArray // ^^^ reference scip-java maven . . kotlin/run(+1). // ^^^^^^^^^^^ reference scip-java maven . . kotlin/text/toByteArray(). // ⌃ enclosing_range_end scip-java maven . . snapshots/y. @@ -46,21 +52,25 @@ //⌄ enclosing_range_start scip-java maven . . snapshots/getZ(). // ⌄ enclosing_range_start local 2 val z = y.let { it.size } -// ^ definition scip-java maven . . snapshots/getZ(). -// display_name z -// signature_documentation kotlin public get(): Int // ^ definition scip-java maven . . snapshots/z. // display_name z -// signature_documentation kotlin public final val z: Int -// ^ reference scip-java maven . . snapshots/getY(). +// signature_documentation +// > public final val z: Int +// ^ definition scip-java maven . . snapshots/getZ(). +// display_name z +// signature_documentation +// > public get(): Int // ^ reference scip-java maven . . snapshots/y. +// ^ reference scip-java maven . . snapshots/getY(). // ^^^ reference scip-java maven . . kotlin/let(). // ^^^^^^^^^^^ definition local 2 // display_name it -// signature_documentation kotlin it: ByteArray +// signature_documentation +// > it: ByteArray // ^^ reference local 2 -// ^^^^ reference scip-java maven . . kotlin/ByteArray#getSize(). // ^^^^ reference scip-java maven . . kotlin/ByteArray#size. +// ^^^^ reference scip-java maven . . kotlin/ByteArray#getSize(). // ⌃ 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 index 914e3253a..d24723a3a 100644 --- 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 @@ -11,19 +11,23 @@ object ObjectKt { // ^^^^^^^^ definition scip-java maven . . snapshots/ObjectKt# // display_name ObjectKt -// signature_documentation kotlin public final object ObjectKt : Any +// signature_documentation +// > public final object ObjectKt : Any // ^^^^^^^^ definition scip-java maven . . snapshots/ObjectKt#``(). // display_name ObjectKt -// signature_documentation kotlin private constructor(): ObjectKt +// signature_documentation +// > 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 +// signature_documentation +// > public final fun fail(message: String?): Nothing // ^^^^^^^ definition scip-java maven . . snapshots/ObjectKt#fail().(message) // display_name message -// signature_documentation kotlin message: String? +// signature_documentation +// > message: String? // ^^^^^^^ reference scip-java maven . . kotlin/String# // ^^^^^^^ reference scip-java maven . . kotlin/Nothing# // ⌃ enclosing_range_end scip-java maven . . snapshots/ObjectKt#fail().(message) @@ -35,3 +39,4 @@ } //⌃ enclosing_range_end scip-java maven . . snapshots/ObjectKt# //⌃ enclosing_range_end scip-java maven . . snapshots/ObjectKt#``(). + 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 fc494c4ac..d142fa26a 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 @@ -3,20 +3,23 @@ //⌄ enclosing_range_start scip-java maven . . minimized/AbstractClasses# public abstract class AbstractClasses { // ^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AbstractClasses# -// display_name AbstractClasses -// signature_documentation java public abstract class AbstractClasses // kind Class +// display_name AbstractClasses +// signature_documentation +// > public abstract class AbstractClasses // ^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AbstractClasses#``(). -// display_name -// signature_documentation java public AbstractClasses() // kind Constructor +// display_name +// signature_documentation +// > public AbstractClasses() // ⌄ enclosing_range_start scip-java maven . . minimized/AbstractClasses#defaultImplementation(). public String 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 +// display_name defaultImplementation +// signature_documentation +// > public String defaultImplementation() return ""; } // ⌃ enclosing_range_end scip-java maven . . minimized/AbstractClasses#defaultImplementation(). @@ -25,10 +28,12 @@ public String defaultImplementation() { public abstract String 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 scip-java maven . . minimized/SubClasses#abstractImplementation(). +// display_name abstractImplementation +// signature_documentation +// > public abstract String abstractImplementation() +// relationship scip-java maven . . minimized/SubClasses#abstractImplementation(). implementation reference // ⌃ enclosing_range_end scip-java maven . . minimized/AbstractClasses#abstractImplementation(). } //⌃ 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 9fb12c058..b5e72efbf 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 @@ -3,16 +3,18 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Bar# @interface Bar { // ^^^ definition scip-java maven . . minimized/Bar# -// display_name Bar -// signature_documentation java @interface Bar // kind Interface -// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// display_name Bar +// signature_documentation +// > @interface Bar +// relationship scip-java maven jdk 11 java/lang/annotation/Annotation# implementation // ⌄ enclosing_range_start scip-java maven . . minimized/Bar#value(). double value(); // ^^^^^ definition scip-java maven . . minimized/Bar#value(). -// display_name value -// signature_documentation java public abstract double value() // kind AbstractMethod +// display_name value +// signature_documentation +// > public abstract double value() // ⌃ enclosing_range_end scip-java maven . . minimized/Bar#value(). } //⌃ enclosing_range_end scip-java maven . . minimized/Bar# @@ -20,16 +22,18 @@ //⌄ enclosing_range_start scip-java maven . . minimized/BarB# @interface BarB { // ^^^^ definition scip-java maven . . minimized/BarB# -// display_name BarB -// signature_documentation java @interface BarB // kind Interface -// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// display_name BarB +// signature_documentation +// > @interface BarB +// relationship scip-java maven jdk 11 java/lang/annotation/Annotation# implementation // ⌄ enclosing_range_start scip-java maven . . minimized/BarB#value(). boolean value(); // ^^^^^ definition scip-java maven . . minimized/BarB#value(). -// display_name value -// signature_documentation java public abstract boolean value() // kind AbstractMethod +// display_name value +// signature_documentation +// > public abstract boolean value() // ⌃ enclosing_range_end scip-java maven . . minimized/BarB#value(). } //⌃ enclosing_range_end scip-java maven . . minimized/BarB# @@ -37,17 +41,19 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Nullable# @interface Nullable { // ^^^^^^^^ definition scip-java maven . . minimized/Nullable# -// display_name Nullable -// signature_documentation java @interface Nullable // kind Interface -// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// display_name Nullable +// signature_documentation +// > @interface Nullable +// relationship scip-java maven jdk 11 java/lang/annotation/Annotation# implementation // ⌄ enclosing_range_start scip-java maven . . minimized/Nullable#value(). String value() default ""; // ^^^^^^ 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 +// display_name value +// signature_documentation +// > public abstract String value() // ⌃ enclosing_range_end scip-java maven . . minimized/Nullable#value(). } //⌃ enclosing_range_end scip-java maven . . minimized/Nullable# @@ -56,17 +62,19 @@ //⌄ enclosing_range_start scip-java maven . . minimized/BarRef# @interface BarRef{ // ^^^^^^ definition scip-java maven . . minimized/BarRef# -// display_name BarRef -// signature_documentation java @interface BarRef // kind Interface -// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// display_name BarRef +// signature_documentation +// > @interface BarRef +// relationship scip-java maven jdk 11 java/lang/annotation/Annotation# implementation // ⌄ enclosing_range_start scip-java maven . . minimized/BarRef#value(). SuppressWarnings 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 +// display_name value +// signature_documentation +// > public abstract SuppressWarnings value() // ⌃ enclosing_range_end scip-java maven . . minimized/BarRef#value(). } //⌃ enclosing_range_end scip-java maven . . minimized/BarRef# @@ -74,17 +82,20 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Foo# interface Foo { // ^^^ definition scip-java maven . . minimized/Foo# -// display_name Foo -// signature_documentation java interface Foo // kind Interface +// display_name Foo +// signature_documentation +// > interface Foo // ⌄ enclosing_range_start scip-java maven . . minimized/Foo#test(). @Bar(-1d) // ^^^ reference scip-java maven . . minimized/Bar# double test(); // ^^^^ definition scip-java maven . . minimized/Foo#test(). -// display_name test -// signature_documentation java @Bar(-1.0)\npublic abstract double test() // kind AbstractMethod +// display_name test +// signature_documentation +// > @Bar(-1.0) +// > public abstract double test() // ⌃ enclosing_range_end scip-java maven . . minimized/Foo#test(). // ⌄ enclosing_range_start scip-java maven . . minimized/Foo#test2(). @@ -95,9 +106,12 @@ interface Foo { // ^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings#value(). double 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 +// display_name test2 +// signature_documentation +// > @Bar(~5) +// > @SuppressWarnings("unchecked") +// > public abstract double test2() // ⌃ enclosing_range_end scip-java maven . . minimized/Foo#test2(). // ⌄ enclosing_range_start scip-java maven . . minimized/Foo#test3(). @@ -105,9 +119,11 @@ interface Foo { // ^^^^ reference scip-java maven . . minimized/BarB# double test3(); // ^^^^^ definition scip-java maven . . minimized/Foo#test3(). -// display_name test3 -// signature_documentation java @BarB(!true)\npublic abstract double test3() // kind AbstractMethod +// display_name test3 +// signature_documentation +// > @BarB(!true) +// > public abstract double test3() // ⌃ enclosing_range_end scip-java maven . . minimized/Foo#test3(). // ⌄ enclosing_range_start scip-java maven . . minimized/Foo#test4(). @@ -116,9 +132,11 @@ interface Foo { 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 +// display_name test4 +// signature_documentation +// > @Nullable("what") +// > public abstract Foo test4() // ⌃ enclosing_range_end scip-java maven . . minimized/Foo#test4(). // ⌄ enclosing_range_start scip-java maven . . minimized/Foo#testCast(). @@ -126,9 +144,11 @@ interface Foo { // ^^^ reference scip-java maven . . minimized/Bar# double testCast(); // ^^^^^^^^ definition scip-java maven . . minimized/Foo#testCast(). -// display_name testCast -// signature_documentation java @Bar((double) -1)\npublic abstract double testCast() // kind AbstractMethod +// display_name testCast +// signature_documentation +// > @Bar((double) -1) +// > public abstract double testCast() // ⌃ enclosing_range_end scip-java maven . . minimized/Foo#testCast(). } //⌃ enclosing_range_end scip-java maven . . minimized/Foo# @@ -136,9 +156,10 @@ interface Foo { //⌄ enclosing_range_start scip-java maven . . minimized/TestRef# interface TestRef { // ^^^^^^^ definition scip-java maven . . minimized/TestRef# -// display_name TestRef -// signature_documentation java interface TestRef // kind Interface +// display_name TestRef +// signature_documentation +// > interface TestRef // ⌄ enclosing_range_start scip-java maven . . minimized/TestRef#testCase(). @BarRef(@SuppressWarnings(value = "unchecked")) // ^^^^^^ reference scip-java maven . . minimized/BarRef# @@ -146,9 +167,12 @@ interface TestRef { // ^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings#value(). abstract double testCase(); // ^^^^^^^^ definition scip-java maven . . minimized/TestRef#testCase(). -// display_name testCase -// signature_documentation java @BarRef(@SuppressWarnings("unchecked"))\npublic abstract double testCase() // kind AbstractMethod +// display_name testCase +// signature_documentation +// > @BarRef(@SuppressWarnings("unchecked")) +// > public abstract double testCase() // ⌃ enclosing_range_end scip-java maven . . minimized/TestRef#testCase(). } //⌃ 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 509abc875..3d7fc32df 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 @@ -29,13 +29,13 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Annotations# @Documented -// ^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Documented# +// ^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Documented# @Retention(RetentionPolicy.RUNTIME) -// ^^^^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Retention# +// ^^^^^^^^^ 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 scip-java maven jdk 11 java/lang/annotation/Target# +// ^^^^^^ 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, @@ -53,27 +53,34 @@ ) public @interface 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 scip-java maven jdk 11 java/lang/annotation/Annotation# +// display_name Annotations +// signature_documentation +// > @Documented +// > @Retention(RetentionPolicy.RUNTIME) +// > @Target({CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE}) +// > public @interface Annotations +// relationship scip-java maven jdk 11 java/lang/annotation/Annotation# implementation // ⌄ enclosing_range_start scip-java maven . . minimized/Annotations#value(). String value() default ""; // ^^^^^^ 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 +// display_name value +// signature_documentation +// > public abstract String value() // ⌃ enclosing_range_end scip-java maven . . minimized/Annotations#value(). // ⌄ enclosing_range_start scip-java maven . . minimized/Annotations#format(). String format() default ""; // ^^^^^^ 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 +// display_name format +// signature_documentation +// > public abstract String format() // ⌃ enclosing_range_end scip-java maven . . minimized/Annotations#format(). } //⌃ 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 48ca2d0d0..b554da46a 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 @@ -29,17 +29,19 @@ //⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypes# public interface AnnotationsOnParameterizedTypes { // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypes# -// display_name AnnotationsOnParameterizedTypes -// signature_documentation java public interface AnnotationsOnParameterizedTypes // kind Interface +// display_name AnnotationsOnParameterizedTypes +// signature_documentation +// > public interface AnnotationsOnParameterizedTypes // ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypes#getInstance(). public static 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 +// display_name getInstance +// signature_documentation +// > public static AnnotationsOnParameterizedTypes getInstance() return new AnnotationsOnParameterizedTypesImpl(); // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#``(). } @@ -52,33 +54,36 @@ public static AnnotationsOnParameterizedTypes getInstance() { // ⌄ enclosing_range_start local 1 Function adapter(Class contract, Class wrappedClass); // ^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] -// display_name C -// signature_documentation java C // kind TypeParameter +// display_name C +// signature_documentation +// > C // ^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[W] -// display_name W -// signature_documentation java W // kind TypeParameter +// display_name W +// signature_documentation +// > W // ^^^^^^^^ 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 scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). +// display_name adapter +// signature_documentation +// > public abstract Function adapter(Class contract, Class wrappedClass) +// relationship scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). implementation reference // ^^^^^ 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 scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). +// signature_documentation +// > Class contract // ^^^^^ 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 scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). +// signature_documentation +// > Class wrappedClass // ⌃ enclosing_range_end local 0 // ⌃ enclosing_range_end local 1 // ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter().[C] @@ -91,14 +96,16 @@ public static AnnotationsOnParameterizedTypes getInstance() { //⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl# class AnnotationsOnParameterizedTypesImpl implements AnnotationsOnParameterizedTypes { // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl# -// display_name AnnotationsOnParameterizedTypesImpl -// signature_documentation java class AnnotationsOnParameterizedTypesImpl implements AnnotationsOnParameterizedTypes // kind Class -// relationship is_implementation scip-java maven . . minimized/AnnotationsOnParameterizedTypes# +// display_name AnnotationsOnParameterizedTypesImpl +// signature_documentation +// > class AnnotationsOnParameterizedTypesImpl implements AnnotationsOnParameterizedTypes +// relationship scip-java maven . . minimized/AnnotationsOnParameterizedTypes# implementation // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#``(). -// display_name -// signature_documentation java AnnotationsOnParameterizedTypesImpl() // kind Constructor +// display_name +// signature_documentation +// > AnnotationsOnParameterizedTypesImpl() // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypes# // ⌄ enclosing_range_start scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors. private ConcurrentMap, Constructor> proxyConstructors = new ConcurrentHashMap<>(); @@ -106,9 +113,10 @@ class AnnotationsOnParameterizedTypesImpl implements AnnotationsOnParameterizedT // ^^^^^ 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 +// display_name proxyConstructors +// signature_documentation +// > private ConcurrentMap, Constructor> proxyConstructors // ^^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/concurrent/ConcurrentHashMap#``(). // ⌃ enclosing_range_end scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors. @@ -121,33 +129,37 @@ class AnnotationsOnParameterizedTypesImpl implements AnnotationsOnParameterizedT // ⌄ enclosing_range_start local 3 public Function adapter(Class contract, Class wrappedClass) { // ^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C] -// display_name C -// signature_documentation java C // kind TypeParameter +// display_name C +// signature_documentation +// > C // ^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W] -// display_name W -// signature_documentation java W // kind TypeParameter +// display_name W +// signature_documentation +// > W // ^^^^^^^^ 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 scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). +// display_name adapter +// signature_documentation +// > @Override +// > public Function adapter(Class contract, Class wrappedClass) +// relationship scip-java maven . . minimized/AnnotationsOnParameterizedTypes#adapter(). implementation reference // ^^^^^ 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 scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). +// signature_documentation +// > Class contract // ^^^^^ 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 scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). +// signature_documentation +// > Class wrappedClass // ⌃ enclosing_range_end local 2 // ⌃ enclosing_range_end local 3 @@ -157,10 +169,10 @@ public Function adapter(Class contract, Class wrappedClass) { // ^^^^^^^^^^^^^^^^^ 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 scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter(). // kind Variable +// display_name constructor +// signature_documentation +// > Function constructor // ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). // ^^^^^^^^ reference local 2 // ⌃ enclosing_range_end local 4 @@ -182,22 +194,24 @@ public Function adapter(Class contract, Class wrappedClass) { // ⌄ enclosing_range_start local 5 private Function getConstructor(Class contract) { // ^ definition scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T] -// display_name T -// signature_documentation java T // kind TypeParameter +// display_name T +// signature_documentation +// > T // ^^^^^^^^ 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 +// display_name getConstructor +// signature_documentation +// > private Function getConstructor(Class contract) // ^^^^^ 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 scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). +// signature_documentation +// > Class contract // ⌃ enclosing_range_end local 5 // ⌄ enclosing_range_start local 6 @SuppressWarnings("unchecked") @@ -207,10 +221,11 @@ private Function getConstructor(Class contract) { // ^^^^^^^^^^^ 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 scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). // kind Variable +// display_name constructor +// signature_documentation +// > @SuppressWarnings("unchecked") +// > Constructor constructor // ^^^^^^^^^^^ 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. @@ -218,8 +233,8 @@ private Function getConstructor(Class contract) { // ^^^^^^^^ reference local 5 // ^ definition local 7 // display_name c -// signature_documentation java Class c -// enclosing_symbol scip-java maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor(). +// signature_documentation +// > Class c // ⌃ enclosing_range_end local 7 return null; }); @@ -235,4 +250,5 @@ private Function getConstructor(Class contract) { } // ⌃ 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# + } +//⌃ 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 e804e3e5c..6b363e904 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 @@ -8,27 +8,31 @@ //⌄ enclosing_range_start scip-java maven . . minimized/AnonymousClasses# @SuppressWarnings("ALL") -// ^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# +// ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# public class AnonymousClasses { // ^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnonymousClasses# -// display_name AnonymousClasses -// signature_documentation java @SuppressWarnings("ALL")\npublic class AnonymousClasses // kind Class +// display_name AnonymousClasses +// signature_documentation +// > @SuppressWarnings("ALL") +// > public class AnonymousClasses // ^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/AnonymousClasses#``(). -// display_name -// signature_documentation java public AnonymousClasses() // kind Constructor +// display_name +// signature_documentation +// > public AnonymousClasses() // ⌄ enclosing_range_start scip-java maven . . minimized/AnonymousClasses#app(). // ⌄ enclosing_range_start local 0 public static int app(int n) { // ^^^ definition scip-java maven . . minimized/AnonymousClasses#app(). -// display_name app -// signature_documentation java public static int app(int n) // kind StaticMethod +// display_name app +// signature_documentation +// > public static int app(int n) // ^ definition local 0 // display_name n -// signature_documentation java int n -// enclosing_symbol scip-java maven . . minimized/AnonymousClasses#app(). +// signature_documentation +// > int n // ⌃ enclosing_range_end local 0 // ⌄ enclosing_range_start local 1 Function fn = @@ -36,10 +40,10 @@ public static int app(int n) { // ^^^^^^^ 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 scip-java maven . . minimized/AnonymousClasses#app(). // kind Variable +// display_name fn +// signature_documentation +// > Function fn new Function() { // ^^^^^^^^ reference scip-java maven jdk 11 java/util/function/Function# // ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# @@ -51,16 +55,17 @@ public static int app(int n) { public Integer apply(Integer 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 scip-java maven jdk 11 java/util/function/Function#apply(). +// display_name apply +// signature_documentation +// > @Override +// > public Integer apply(Integer integer) +// relationship scip-java maven jdk 11 java/util/function/Function#apply(). implementation reference // ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# // ^^^^^^^ definition local 4 // display_name integer -// signature_documentation java Integer integer -// enclosing_symbol local 3 +// signature_documentation +// > Integer integer // ⌃ enclosing_range_end local 4 return integer + n; // ^^^^^^^ reference local 4 @@ -78,3 +83,4 @@ public Integer apply(Integer integer) { // ⌃ enclosing_range_end scip-java maven . . minimized/AnonymousClasses#app(). } //⌃ 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 b788cf026..b19e6cd82 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 @@ -3,53 +3,56 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Arrays# public class Arrays { // ^^^^^^ definition scip-java maven . . minimized/Arrays# -// display_name Arrays -// signature_documentation java public class Arrays // kind Class +// display_name Arrays +// signature_documentation +// > public class Arrays // ^^^^^^ definition scip-java maven . . minimized/Arrays#``(). -// display_name -// signature_documentation java public Arrays() // kind Constructor +// display_name +// signature_documentation +// > public Arrays() // ⌄ enclosing_range_start scip-java maven . . minimized/Arrays#app(). public static String 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 +// display_name app +// signature_documentation +// > public static String app() // ⌄ enclosing_range_start local 0 int[] a = {1, 2, 3}; // ^ definition local 0 -// display_name a -// signature_documentation java int[] a -// enclosing_symbol scip-java maven . . minimized/Arrays#app(). // kind Variable +// display_name a +// signature_documentation +// > int[] a // ⌃ enclosing_range_end local 0 // ⌄ enclosing_range_start local 1 String[] b = {"1", "2", "3"}; // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 1 -// display_name b -// signature_documentation java String[] b -// enclosing_symbol scip-java maven . . minimized/Arrays#app(). // kind Variable +// display_name b +// signature_documentation +// > String[] b // ⌃ enclosing_range_end local 1 // ⌄ enclosing_range_start local 2 int[][] c = {{1}, {2}, {3}}; // ^ definition local 2 -// display_name c -// signature_documentation java int[][] c -// enclosing_symbol scip-java maven . . minimized/Arrays#app(). // kind Variable +// display_name c +// signature_documentation +// > int[][] c // ⌃ enclosing_range_end local 2 // ⌄ enclosing_range_start local 3 String[][] d = {{"1"}, {"2"}, {"3"}}; // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 3 -// display_name d -// signature_documentation java String[][] d -// enclosing_symbol scip-java maven . . minimized/Arrays#app(). // kind Variable +// display_name d +// signature_documentation +// > String[][] d // ⌃ enclosing_range_end local 3 return b[0] + a[0] + c[1][0] + d[1][0]; // ^ reference local 1 @@ -60,3 +63,4 @@ public static String app() { // ⌃ enclosing_range_end scip-java maven . . minimized/Arrays#app(). } //⌃ 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 e69bec052..444e2a23b 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 @@ -3,20 +3,23 @@ //⌄ enclosing_range_start scip-java maven . . minimized/ClassOf# public class ClassOf { // ^^^^^^^ definition scip-java maven . . minimized/ClassOf# -// display_name ClassOf -// signature_documentation java public class ClassOf // kind Class +// display_name ClassOf +// signature_documentation +// > public class ClassOf // ^^^^^^^ definition scip-java maven . . minimized/ClassOf#``(). -// display_name -// signature_documentation java public ClassOf() // kind Constructor +// display_name +// signature_documentation +// > public ClassOf() // ⌄ enclosing_range_start scip-java maven . . minimized/ClassOf#app(). public static String 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 +// display_name app +// signature_documentation +// > public static String app() return ClassOf.class.getName(); // ^^^^^^^ reference scip-java maven . . minimized/ClassOf# // ^^^^^ reference scip-java maven . . minimized/ClassOf#class. @@ -25,3 +28,4 @@ public static String app() { // ⌃ enclosing_range_end scip-java maven . . minimized/ClassOf#app(). } //⌃ 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 f402eafbf..460420049 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 @@ -4,23 +4,28 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Docstrings# public class Docstrings { // ^^^^^^^^^^ definition scip-java maven . . minimized/Docstrings# -// display_name Docstrings -// signature_documentation java public class Docstrings // kind Class -// documentation Example class docstring. +// display_name Docstrings +// signature_documentation +// > public class Docstrings +// documentation +// > Example class docstring. // ^^^^^^^^^^ definition scip-java maven . . minimized/Docstrings#``(). -// display_name -// signature_documentation java public Docstrings() // kind Constructor +// display_name +// signature_documentation +// > public Docstrings() /** Example field docstring. */ // ⌄ enclosing_range_start scip-java maven . . minimized/Docstrings#field. public static int field = 42; // ^^^^^ definition scip-java maven . . minimized/Docstrings#field. -// display_name field -// signature_documentation java public static int field // kind StaticField -// documentation Example field docstring. +// display_name field +// signature_documentation +// > public static int field +// documentation +// > Example field docstring. // ⌃ enclosing_range_end scip-java maven . . minimized/Docstrings#field. /** @@ -31,10 +36,14 @@ public class Docstrings { // ⌄ enclosing_range_start scip-java maven . . minimized/Docstrings#method(). public static int 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 +// display_name method +// signature_documentation +// > public static int method() +// documentation +// > Example method docstring. +// > +// > @return 42. return 42; } // ⌃ enclosing_range_end scip-java maven . . minimized/Docstrings#method(). @@ -49,14 +58,19 @@ public static int method() { // ⌄ enclosing_range_start local 0 public static int methodParameter(int n) { // ^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Docstrings#methodParameter(). -// display_name methodParameter -// signature_documentation java public static int methodParameter(int n) // kind StaticMethod -// documentation Example method parameter docstring.\n\n @param n The parameter.\n @return The number + 42.\n +// display_name methodParameter +// signature_documentation +// > public static int methodParameter(int n) +// documentation +// > Example method parameter docstring. +// > +// > @param n The parameter. +// > @return The number + 42. // ^ definition local 0 // display_name n -// signature_documentation java int n -// enclosing_symbol scip-java maven . . minimized/Docstrings#methodParameter(). +// signature_documentation +// > int n // ⌃ enclosing_range_end local 0 return n + 42; // ^ reference local 0 @@ -67,9 +81,10 @@ public static int methodParameter(int n) { public static String 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 +// display_name app +// signature_documentation +// > public static String app() return String.format("%s%s%s", field, method(), methodParameter(42)); // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^^^ reference scip-java maven jdk 11 java/lang/String#format(). @@ -80,3 +95,4 @@ public static String app() { // ⌃ enclosing_range_end scip-java maven . . minimized/Docstrings#app(). } //⌃ 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 bd64a49ed..b29df5329 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 @@ -8,30 +8,35 @@ //⌄ enclosing_range_start scip-java maven . . minimized/EnumImplementsInterface# enum EnumImplementsInterface implements Serializable { // ^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/EnumImplementsInterface# -// display_name EnumImplementsInterface -// signature_documentation java enum EnumImplementsInterface implements Serializable // kind Enum -// 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# +// display_name EnumImplementsInterface +// signature_documentation +// > enum EnumImplementsInterface implements Serializable +// relationship scip-java maven jdk 11 java/io/Serializable# implementation +// relationship scip-java maven jdk 11 java/lang/Comparable# implementation +// relationship scip-java maven jdk 11 java/lang/Enum# implementation // ^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/EnumImplementsInterface#``(). -// display_name -// signature_documentation java private EnumImplementsInterface() // kind Constructor +// display_name +// signature_documentation +// > private EnumImplementsInterface() // ^^^^^^^^^^^^ reference scip-java maven jdk 11 java/io/Serializable# // ⌄ enclosing_range_start scip-java maven . . minimized/EnumImplementsInterface#A. A, // ^ definition scip-java maven . . minimized/EnumImplementsInterface#A. // display_name A -// signature_documentation java EnumImplementsInterface.A /* ordinal 0 */ +// signature_documentation +// > EnumImplementsInterface.A /* ordinal 0 */ // ^ 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 scip-java maven . . minimized/EnumImplementsInterface#B. // display_name B -// signature_documentation java EnumImplementsInterface.B /* ordinal 1 */ +// signature_documentation +// > EnumImplementsInterface.B /* ordinal 1 */ // ^ reference scip-java maven . . minimized/EnumImplementsInterface#``(). // ⌃ enclosing_range_end scip-java maven . . minimized/EnumImplementsInterface#B. } //⌃ 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 f4fcf9524..a59e8dcd9 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 @@ -13,40 +13,45 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Enums# enum Enums { // ^^^^^ definition scip-java maven . . minimized/Enums# -// display_name Enums -// signature_documentation java enum Enums // kind Enum -// 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# +// display_name Enums +// signature_documentation +// > enum Enums +// relationship scip-java maven jdk 11 java/io/Serializable# implementation +// relationship scip-java maven jdk 11 java/lang/Comparable# implementation +// relationship scip-java maven jdk 11 java/lang/Enum# implementation // ⌄ enclosing_range_start scip-java maven . . minimized/Enums#A. A("A", 420), // ^ definition scip-java maven . . minimized/Enums#A. // display_name A("A", 420) -// signature_documentation java Enums.A("A", 420) /* ordinal 0 */ +// signature_documentation +// > Enums.A("A", 420) /* ordinal 0 */ // ^ 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 scip-java maven . . minimized/Enums#B. // display_name B("B", 1) -// signature_documentation java Enums.B("B", 1) /* ordinal 1 */ +// signature_documentation +// > Enums.B("B", 1) /* ordinal 1 */ // ^ 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 scip-java maven . . minimized/Enums#C. // display_name C("C", 5) -// signature_documentation java Enums.C("C", 5) /* ordinal 2 */ +// signature_documentation +// > Enums.C("C", 5) /* ordinal 2 */ // ^ 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 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 +// display_name value +// signature_documentation +// > public String value // ⌃ enclosing_range_end scip-java maven . . minimized/Enums#value. // ⌄ enclosing_range_start scip-java maven . . minimized/Enums#``(). @@ -54,18 +59,19 @@ enum Enums { // ⌄ enclosing_range_start local 1 Enums(String value, int a) { // ^^^^^ definition scip-java maven . . minimized/Enums#``(). -// display_name -// signature_documentation java private Enums(String value, int a) // kind Constructor +// display_name +// signature_documentation +// > private Enums(String value, int a) // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^^ definition local 0 // display_name value -// signature_documentation java String value -// enclosing_symbol scip-java maven . . minimized/Enums#``(). +// signature_documentation +// > String value // ^ definition local 1 // display_name a -// signature_documentation java int a -// enclosing_symbol scip-java maven . . minimized/Enums#``(). +// signature_documentation +// > int a // ⌃ enclosing_range_end local 0 // ⌃ enclosing_range_end local 1 this.value = value; @@ -78,26 +84,27 @@ enum Enums { public static String 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 +// display_name app +// signature_documentation +// > public static String app() // ⌄ 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 scip-java maven jdk 11 java/lang/String# // ^^^ definition local 2 -// display_name all -// signature_documentation java String all -// enclosing_symbol scip-java maven . . minimized/Enums#app(). // kind Variable +// display_name all +// signature_documentation +// > String all // ^^^^^^ 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 scip-java maven . . minimized/Enums#app(). +// signature_documentation +// > Enums e // ^ reference local 3 // ^^^^^ reference scip-java maven . . minimized/Enums#value. // ^^^ reference scip-java maven jdk 11 java/util/stream/Stream#map(). @@ -121,3 +128,4 @@ public static String app() { // ⌃ enclosing_range_end scip-java maven . . minimized/Enums#app(). } //⌃ 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 903159eb0..4abd851c7 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 @@ -3,72 +3,83 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Fields# public class Fields { // ^^^^^^ definition scip-java maven . . minimized/Fields# -// display_name Fields -// signature_documentation java public class Fields // kind Class +// display_name Fields +// signature_documentation +// > public class Fields // ^^^^^^ definition scip-java maven . . minimized/Fields#``(). -// display_name -// signature_documentation java public Fields() // kind Constructor +// display_name +// signature_documentation +// > public Fields() // ⌄ enclosing_range_start scip-java maven . . minimized/Fields#privateField. private final int privateField = 0; // ^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#privateField. -// display_name privateField -// signature_documentation java private final int privateField // kind Field +// display_name privateField +// signature_documentation +// > private final int privateField // ⌃ enclosing_range_end scip-java maven . . minimized/Fields#privateField. // ⌄ enclosing_range_start scip-java maven . . minimized/Fields#protectedField. protected int protectedField = 0; // ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#protectedField. -// display_name protectedField -// signature_documentation java protected int protectedField // kind Field +// display_name protectedField +// signature_documentation +// > protected int protectedField // ⌃ enclosing_range_end scip-java maven . . minimized/Fields#protectedField. // ⌄ enclosing_range_start scip-java maven . . minimized/Fields#publicField. public int publicField = 0; // ^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#publicField. -// display_name publicField -// signature_documentation java public int publicField // kind Field +// display_name publicField +// signature_documentation +// > public int publicField // ⌃ 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 scip-java maven . . minimized/Fields#staticPrivateField. -// display_name staticPrivateField -// signature_documentation java private static final int staticPrivateField // kind StaticField +// display_name staticPrivateField +// signature_documentation +// > private static final int staticPrivateField // ⌃ enclosing_range_end scip-java maven . . minimized/Fields#staticPrivateField. // ⌄ enclosing_range_start scip-java maven . . minimized/Fields#staticProtectedFields. protected static int staticProtectedFields = 0; // ^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#staticProtectedFields. -// display_name staticProtectedFields -// signature_documentation java protected static int staticProtectedFields // kind StaticField +// display_name staticProtectedFields +// signature_documentation +// > protected static int staticProtectedFields // ⌃ enclosing_range_end scip-java maven . . minimized/Fields#staticProtectedFields. // ⌄ enclosing_range_start scip-java maven . . minimized/Fields#staticPublicField. public static int staticPublicField = 0; // ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#staticPublicField. -// display_name staticPublicField -// signature_documentation java public static int staticPublicField // kind StaticField +// display_name staticPublicField +// signature_documentation +// > public static int staticPublicField // ⌃ enclosing_range_end scip-java maven . . minimized/Fields#staticPublicField. // ⌄ enclosing_range_start scip-java maven . . minimized/Fields#InnerFields# public class InnerFields { // ^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerFields# -// display_name InnerFields -// signature_documentation java public class InnerFields // kind Class +// display_name InnerFields +// signature_documentation +// > public class InnerFields // ^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerFields#``(). -// display_name -// signature_documentation java public InnerFields() // kind Constructor +// display_name +// signature_documentation +// > public InnerFields() // ⌄ enclosing_range_start scip-java maven . . minimized/Fields#InnerFields#publicInnerField. public int publicInnerField = publicField; // ^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerFields#publicInnerField. -// display_name publicInnerField -// signature_documentation java public int publicInnerField // kind Field +// display_name publicInnerField +// signature_documentation +// > public int publicInnerField // ^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#publicField. // ⌃ enclosing_range_end scip-java maven . . minimized/Fields#InnerFields#publicInnerField. } @@ -77,26 +88,30 @@ public class InnerFields { // ⌄ enclosing_range_start scip-java maven . . minimized/Fields#InnerStaticFields# public static class InnerStaticFields { // ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerStaticFields# -// display_name InnerStaticFields -// signature_documentation java public static class InnerStaticFields // kind Class +// display_name InnerStaticFields +// signature_documentation +// > public static class InnerStaticFields // ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerStaticFields#``(). -// display_name -// signature_documentation java public InnerStaticFields() // kind Constructor +// display_name +// signature_documentation +// > public InnerStaticFields() // ⌄ enclosing_range_start scip-java maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField. public int publicNonStaticInnerField = 0; // ^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField. -// display_name publicNonStaticInnerField -// signature_documentation java public int publicNonStaticInnerField // kind Field +// display_name publicNonStaticInnerField +// signature_documentation +// > public int publicNonStaticInnerField // ⌃ 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 scip-java maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField. -// display_name publicStaticInnerField -// signature_documentation java public static int publicStaticInnerField // kind StaticField +// display_name publicStaticInnerField +// signature_documentation +// > public static int publicStaticInnerField // ⌃ enclosing_range_end scip-java maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField. } // ⌃ enclosing_range_end scip-java maven . . minimized/Fields#InnerStaticFields# @@ -105,27 +120,28 @@ public static class InnerStaticFields { public static String 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 +// display_name app +// signature_documentation +// > public static String app() // ⌄ enclosing_range_start local 0 Fields fields = new Fields(); // ^^^^^^ reference scip-java maven . . minimized/Fields# // ^^^^^^ definition local 0 -// display_name fields -// signature_documentation java Fields fields -// enclosing_symbol scip-java maven . . minimized/Fields#app(). // kind Variable +// display_name fields +// signature_documentation +// > Fields fields // ^^^^^^ reference scip-java maven . . minimized/Fields#``(). // ⌃ enclosing_range_end local 0 // ⌄ enclosing_range_start local 1 InnerFields innerFields = fields.new InnerFields(); // ^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerFields# // ^^^^^^^^^^^ definition local 1 -// display_name innerFields -// signature_documentation java InnerFields innerFields -// enclosing_symbol scip-java maven . . minimized/Fields#app(). // kind Variable +// display_name innerFields +// signature_documentation +// > InnerFields innerFields // ^^^^^^ reference local 0 // ^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerFields#``(). // ⌃ enclosing_range_end local 1 @@ -133,10 +149,10 @@ public static String app() { InnerStaticFields innerStaticFields = new InnerStaticFields(); // ^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerStaticFields# // ^^^^^^^^^^^^^^^^^ definition local 2 -// display_name innerStaticFields -// signature_documentation java InnerStaticFields innerStaticFields -// enclosing_symbol scip-java maven . . minimized/Fields#app(). // kind Variable +// display_name innerStaticFields +// signature_documentation +// > InnerStaticFields innerStaticFields // ^^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Fields#InnerStaticFields#``(). // ⌃ enclosing_range_end local 2 return String.valueOf(fields.privateField) @@ -169,3 +185,4 @@ public static String app() { // ⌃ enclosing_range_end scip-java maven . . minimized/Fields#app(). } //⌃ 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 6ecc398d0..24ae3bdc6 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 @@ -12,34 +12,37 @@ //⌄ enclosing_range_start scip-java maven . . minimized/ForComprehensions# public class ForComprehensions { // ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ForComprehensions# -// display_name ForComprehensions -// signature_documentation java public class ForComprehensions // kind Class +// display_name ForComprehensions +// signature_documentation +// > public class ForComprehensions // ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ForComprehensions#``(). -// display_name -// signature_documentation java public ForComprehensions() // kind Constructor +// display_name +// signature_documentation +// > public ForComprehensions() // ⌄ enclosing_range_start scip-java maven . . minimized/ForComprehensions#app(). // ⌄ enclosing_range_start local 0 public static int app(int n) { // ^^^ definition scip-java maven . . minimized/ForComprehensions#app(). -// display_name app -// signature_documentation java public static int app(int n) // kind StaticMethod +// display_name app +// signature_documentation +// > public static int app(int n) // ^ definition local 0 // display_name n -// signature_documentation java int n -// enclosing_symbol scip-java maven . . minimized/ForComprehensions#app(). +// signature_documentation +// > int n // ⌃ enclosing_range_end local 0 // ⌄ enclosing_range_start local 1 List integers = Collections.singletonList(n); // ^^^^ 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 scip-java maven . . minimized/ForComprehensions#app(). // kind Variable +// display_name integers +// signature_documentation +// > List integers // ^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Collections# // ^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Collections#singletonList(). // ^ reference local 0 @@ -47,18 +50,18 @@ public static int app(int n) { // ⌄ enclosing_range_start local 2 int result = 0; // ^^^^^^ definition local 2 -// display_name result -// signature_documentation java int result -// enclosing_symbol scip-java maven . . minimized/ForComprehensions#app(). // kind Variable +// display_name result +// signature_documentation +// > int result // ⌃ enclosing_range_end local 2 // ⌄ enclosing_range_start local 3 for (int i : integers) { // ^ definition local 3 -// display_name i -// signature_documentation java int i -// enclosing_symbol scip-java maven . . minimized/ForComprehensions#app(). // kind Variable +// display_name i +// signature_documentation +// > int i // ^^^^^^^^ reference local 1 // ⌃ enclosing_range_end local 3 result += i; @@ -71,3 +74,4 @@ public static int app(int n) { // ⌃ enclosing_range_end scip-java maven . . minimized/ForComprehensions#app(). } //⌃ 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 878777e00..75246422b 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 @@ -3,53 +3,59 @@ //⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses# public class InnerClasses { // ^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses# -// display_name InnerClasses -// signature_documentation java public class InnerClasses // kind Class +// display_name InnerClasses +// signature_documentation +// > public class InnerClasses // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#exampleField. private final int exampleField; // ^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#exampleField. -// display_name exampleField -// signature_documentation java private final int exampleField // kind Field +// display_name exampleField +// signature_documentation +// > private final int exampleField // ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#exampleField. // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#STRING. private static final String STRING = "asdf"; // ^^^^^^ 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 +// display_name STRING +// signature_documentation +// > private static final String STRING // ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#STRING. // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#top. private static final int top = 5; // ^^^ definition scip-java maven . . minimized/InnerClasses#top. -// display_name top -// signature_documentation java private static final int top // kind StaticField +// display_name top +// signature_documentation +// > private static final int top // ⌃ 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 scip-java maven . . minimized/InnerClasses#bottom. -// display_name bottom -// signature_documentation java private static final int bottom // kind StaticField +// display_name bottom +// signature_documentation +// > private static final int bottom // ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#bottom. // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#``(). // ⌄ enclosing_range_start local 0 public InnerClasses(int exampleField) { // ^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#``(). -// display_name -// signature_documentation java public InnerClasses(int exampleField) // kind Constructor +// display_name +// signature_documentation +// > public InnerClasses(int exampleField) // ^^^^^^^^^^^^ definition local 0 // display_name exampleField -// signature_documentation java int exampleField -// enclosing_symbol scip-java maven . . minimized/InnerClasses#``(). +// signature_documentation +// > int exampleField // ⌃ enclosing_range_end local 0 this.exampleField = exampleField; // ^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#exampleField. @@ -60,35 +66,40 @@ public InnerClasses(int exampleField) { // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerEnum# public enum InnerEnum { // ^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerEnum# -// display_name InnerEnum -// signature_documentation java public enum InnerEnum // kind Enum -// 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# +// display_name InnerEnum +// signature_documentation +// > public enum InnerEnum +// relationship scip-java maven jdk 11 java/io/Serializable# implementation +// relationship scip-java maven jdk 11 java/lang/Comparable# implementation +// relationship scip-java maven jdk 11 java/lang/Enum# implementation // ^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerEnum#``(). -// display_name -// signature_documentation java private InnerEnum() // kind Constructor +// display_name +// signature_documentation +// > private InnerEnum() // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerEnum#A. A, // ^ definition scip-java maven . . minimized/InnerClasses#InnerEnum#A. // display_name A -// signature_documentation java InnerEnum.A /* ordinal 0 */ +// signature_documentation +// > InnerEnum.A /* ordinal 0 */ // ^ 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 scip-java maven . . minimized/InnerClasses#InnerEnum#B. // display_name B -// signature_documentation java InnerEnum.B /* ordinal 1 */ +// signature_documentation +// > InnerEnum.B /* ordinal 1 */ // ^ 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 scip-java maven . . minimized/InnerClasses#InnerEnum#C. // display_name C -// signature_documentation java InnerEnum.C /* ordinal 2 */ +// signature_documentation +// > InnerEnum.C /* ordinal 2 */ // ^ reference scip-java maven . . minimized/InnerClasses#InnerEnum#``(). // ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerEnum#C. } @@ -99,31 +110,35 @@ public enum InnerEnum { // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerInterface#[B] public interface InnerInterface { // ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerInterface# -// display_name InnerInterface -// signature_documentation java public interface InnerInterface // kind Interface +// display_name InnerInterface +// signature_documentation +// > public interface InnerInterface // ^ definition scip-java maven . . minimized/InnerClasses#InnerInterface#[A] -// display_name A -// signature_documentation java A // kind TypeParameter +// display_name A +// signature_documentation +// > A // ^ definition scip-java maven . . minimized/InnerClasses#InnerInterface#[B] -// display_name B -// signature_documentation java B // kind TypeParameter +// display_name B +// signature_documentation +// > B // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). // ⌄ enclosing_range_start local 1 B apply(A a); // ^ 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 scip-java maven . . minimized/InnerClasses#InnerClass#apply(). +// display_name apply +// signature_documentation +// > public abstract B apply(A a) +// relationship scip-java maven . . minimized/InnerClasses#InnerClass#apply(). implementation reference // ^ reference scip-java maven . . minimized/InnerClasses#InnerInterface#[A] // ^ definition local 1 // display_name a -// signature_documentation java A a -// enclosing_symbol scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). +// signature_documentation +// > A a // ⌃ enclosing_range_end local 1 // ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). } @@ -134,16 +149,18 @@ public interface InnerInterface { // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerAnnotation# public @interface InnerAnnotation { // ^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerAnnotation# -// display_name InnerAnnotation -// signature_documentation java public @interface InnerAnnotation // kind Interface -// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// display_name InnerAnnotation +// signature_documentation +// > public @interface InnerAnnotation +// relationship scip-java maven jdk 11 java/lang/annotation/Annotation# implementation // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerAnnotation#value(). int value(); // ^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerAnnotation#value(). -// display_name value -// signature_documentation java public abstract int value() // kind AbstractMethod +// display_name value +// signature_documentation +// > public abstract int value() // ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerAnnotation#value(). } // ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerAnnotation# @@ -158,20 +175,25 @@ public interface InnerInterface { // ^^^^^^ reference scip-java maven . . minimized/InnerClasses#bottom. public static class 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 +// display_name InnerStaticClass +// signature_documentation +// > @SuppressWarnings(STRING + " ") +// > @InnerAnnotation(top / bottom) +// > public static class InnerStaticClass // ^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerStaticClass#``(). -// display_name -// signature_documentation java public InnerStaticClass() // kind Constructor +// display_name +// signature_documentation +// > public InnerStaticClass() // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). public static void innerStaticMethod() {} // ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). -// display_name innerStaticMethod -// signature_documentation java public static void innerStaticMethod() // kind StaticMethod +// display_name innerStaticMethod +// signature_documentation +// > public static void innerStaticMethod() // ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). } // ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerStaticClass# @@ -179,32 +201,35 @@ public static void innerStaticMethod() {} // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerClass# public class InnerClass implements InnerInterface { // ^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerClass# -// display_name InnerClass -// signature_documentation java public class InnerClass implements InnerInterface // kind Class -// relationship is_implementation scip-java maven . . minimized/InnerClasses#InnerInterface# +// display_name InnerClass +// signature_documentation +// > public class InnerClass implements InnerInterface +// relationship scip-java maven . . minimized/InnerClasses#InnerInterface# implementation // ^^^^^^^^^^^^^^ 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 scip-java maven . . minimized/InnerClasses#InnerClass#field. -// display_name field -// signature_documentation java private final int field // kind Field +// display_name field +// signature_documentation +// > private final int field // ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#InnerClass#field. // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerClass#``(). // ⌄ enclosing_range_start local 2 public InnerClass(int field) { // ^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerClass#``(). -// display_name -// signature_documentation java public InnerClass(int field) // kind Constructor +// display_name +// signature_documentation +// > public InnerClass(int field) // ^^^^^ definition local 2 // display_name field -// signature_documentation java int field -// enclosing_symbol scip-java maven . . minimized/InnerClasses#InnerClass#``(). +// signature_documentation +// > int field // ⌃ enclosing_range_end local 2 this.field = field; // ^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerClass#field. @@ -215,9 +240,10 @@ public InnerClass(int field) { // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#InnerClass#innerMethod(). public void innerMethod() { // ^^^^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#InnerClass#innerMethod(). -// display_name innerMethod -// signature_documentation java public void innerMethod() // kind Method +// display_name innerMethod +// signature_documentation +// > public void innerMethod() System.out.println(field + exampleField); // ^^^^^^ reference scip-java maven jdk 11 java/lang/System# // ^^^ reference scip-java maven jdk 11 java/lang/System#out. @@ -234,15 +260,17 @@ public void innerMethod() { public Integer apply(Integer integer) { // ^^^^^^^ 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 scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). +// display_name apply +// signature_documentation +// > @Override +// > public Integer apply(Integer integer) +// relationship scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). implementation reference // ^^^^^^^ reference scip-java maven jdk 11 java/lang/Integer# // ^^^^^^^ definition local 3 // display_name integer -// signature_documentation java Integer integer -// enclosing_symbol scip-java maven . . minimized/InnerClasses#InnerClass#apply(). +// signature_documentation +// > Integer integer // ⌃ enclosing_range_end local 3 return field * integer; // ^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerClass#field. @@ -259,30 +287,33 @@ public Integer apply(Integer integer) { // ⌄ enclosing_range_start local 5 private static B runInnerInterface(InnerInterface fn, A a) { // ^ definition scip-java maven . . minimized/InnerClasses#runInnerInterface().[A] -// display_name A -// signature_documentation java A // kind TypeParameter +// display_name A +// signature_documentation +// > A // ^ definition scip-java maven . . minimized/InnerClasses#runInnerInterface().[B] -// display_name B -// signature_documentation java B // kind TypeParameter +// display_name B +// signature_documentation +// > B // ^ 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 +// display_name runInnerInterface +// signature_documentation +// > private static B runInnerInterface(InnerInterface fn, A a) // ^^^^^^^^^^^^^^ 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 scip-java maven . . minimized/InnerClasses#runInnerInterface(). +// signature_documentation +// > InnerInterface fn // ^ reference scip-java maven . . minimized/InnerClasses#runInnerInterface().[A] // ^ definition local 5 // display_name a -// signature_documentation java A a -// enclosing_symbol scip-java maven . . minimized/InnerClasses#runInnerInterface(). +// signature_documentation +// > A a // ⌃ enclosing_range_end local 4 // ⌃ enclosing_range_end local 5 return fn.apply(a); @@ -298,14 +329,15 @@ private static B runInnerInterface(InnerInterface fn, A a) { // ⌄ enclosing_range_start local 6 public static void testEnum(InnerEnum magicEnum) { // ^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#testEnum(). -// display_name testEnum -// signature_documentation java public static void testEnum(InnerEnum magicEnum) // kind StaticMethod +// display_name testEnum +// signature_documentation +// > public static void testEnum(InnerEnum magicEnum) // ^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerEnum# // ^^^^^^^^^ definition local 6 // display_name magicEnum -// signature_documentation java InnerEnum magicEnum -// enclosing_symbol scip-java maven . . minimized/InnerClasses#testEnum(). +// signature_documentation +// > InnerEnum magicEnum // ⌃ enclosing_range_end local 6 if (System.nanoTime() > System.currentTimeMillis()) { // ^^^^^^ reference scip-java maven jdk 11 java/lang/System# @@ -360,19 +392,20 @@ public static void testEnum(InnerEnum magicEnum) { // ⌄ enclosing_range_start scip-java maven . . minimized/InnerClasses#testAnon(). public static void testAnon() { // ^^^^^^^^ definition scip-java maven . . minimized/InnerClasses#testAnon(). -// display_name testAnon -// signature_documentation java public static void testAnon() // kind StaticMethod +// display_name testAnon +// signature_documentation +// > public static void testAnon() // ⌄ enclosing_range_start local 7 InnerInterface fn = // ^^^^^^^^^^^^^^ 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 scip-java maven . . minimized/InnerClasses#testAnon(). // kind Variable +// display_name fn +// signature_documentation +// > InnerInterface fn new InnerInterface() { // ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerInterface# // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# @@ -384,16 +417,17 @@ public static void testAnon() { public String apply(String s) { // ^^^^^^ 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 scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). +// display_name apply +// signature_documentation +// > @Override +// > public String apply(String s) +// relationship scip-java maven . . minimized/InnerClasses#InnerInterface#apply(). implementation reference // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 10 // display_name s -// signature_documentation java String s -// enclosing_symbol local 9 +// signature_documentation +// > String s // ⌃ enclosing_range_end local 10 return s + "b"; // ^ reference local 10 @@ -414,16 +448,17 @@ public String apply(String s) { public static String 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 +// display_name app +// signature_documentation +// > public static String app() // ⌄ enclosing_range_start local 11 int a = 42; // ^ definition local 11 -// display_name a -// signature_documentation java int a -// enclosing_symbol scip-java maven . . minimized/InnerClasses#app(). // kind Variable +// display_name a +// signature_documentation +// > int a // ⌃ enclosing_range_end local 11 InnerStaticClass.innerStaticMethod(); // ^^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerStaticClass# @@ -432,10 +467,10 @@ public static String app() { InnerClasses innerClasses = new InnerClasses(a); // ^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses# // ^^^^^^^^^^^^ definition local 12 -// display_name innerClasses -// signature_documentation java InnerClasses innerClasses -// enclosing_symbol scip-java maven . . minimized/InnerClasses#app(). // kind Variable +// display_name innerClasses +// signature_documentation +// > InnerClasses innerClasses // ^^^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#``(). // ^ reference local 11 // ⌃ enclosing_range_end local 12 @@ -443,10 +478,10 @@ public static String app() { InnerClass innerClass = innerClasses.new InnerClass(a); // ^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerClass# // ^^^^^^^^^^ definition local 13 -// display_name innerClass -// signature_documentation java InnerClass innerClass -// enclosing_symbol scip-java maven . . minimized/InnerClasses#app(). // kind Variable +// display_name innerClass +// signature_documentation +// > InnerClass innerClass // ^^^^^^^^^^^^ reference local 12 // ^^^^^^^^^^ reference scip-java maven . . minimized/InnerClasses#InnerClass#``(). // ^ reference local 11 @@ -472,3 +507,4 @@ public static String app() { // ⌃ enclosing_range_end scip-java maven . . minimized/InnerClasses#app(). } //⌃ 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 77b47e809..d1b8da77c 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 @@ -3,34 +3,38 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Interfaces# public interface Interfaces { // ^^^^^^^^^^ definition scip-java maven . . minimized/Interfaces# -// display_name Interfaces -// signature_documentation java public interface Interfaces // kind Interface +// display_name Interfaces +// signature_documentation +// > public interface Interfaces // ⌄ enclosing_range_start scip-java maven . . minimized/Interfaces#staticInterfaceMethod(). static void staticInterfaceMethod() {} // ^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Interfaces#staticInterfaceMethod(). -// display_name staticInterfaceMethod -// signature_documentation java public static void staticInterfaceMethod() // kind StaticMethod +// display_name staticInterfaceMethod +// signature_documentation +// > public static void staticInterfaceMethod() // ⌃ enclosing_range_end scip-java maven . . minimized/Interfaces#staticInterfaceMethod(). // ⌄ enclosing_range_start scip-java maven . . minimized/Interfaces#abstractInterfaceMethod(). String 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 scip-java maven . . minimized/SubClasses#abstractInterfaceMethod(). +// display_name abstractInterfaceMethod +// signature_documentation +// > public abstract String abstractInterfaceMethod() +// relationship scip-java maven . . minimized/SubClasses#abstractInterfaceMethod(). implementation reference // ⌃ enclosing_range_end scip-java maven . . minimized/Interfaces#abstractInterfaceMethod(). // ⌄ enclosing_range_start scip-java maven . . minimized/Interfaces#defaultInterfaceMethod(). default String 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 +// display_name defaultInterfaceMethod +// signature_documentation +// > public default String defaultInterfaceMethod() return "default"; } // ⌃ enclosing_range_end scip-java maven . . minimized/Interfaces#defaultInterfaceMethod(). @@ -40,15 +44,17 @@ default String defaultInterfaceMethod() { //⌄ enclosing_range_start scip-java maven . . minimized/BookService# interface BookService { // ^^^^^^^^^^^ definition scip-java maven . . minimized/BookService# -// display_name BookService -// signature_documentation java interface BookService // kind Interface +// display_name BookService +// signature_documentation +// > interface BookService // ⌄ enclosing_range_start scip-java maven . . minimized/BookService#checkPages(). void checkPages(); // ^^^^^^^^^^ definition scip-java maven . . minimized/BookService#checkPages(). -// display_name checkPages -// signature_documentation java public abstract void checkPages() // kind AbstractMethod +// display_name checkPages +// signature_documentation +// > public abstract void checkPages() // ⌃ enclosing_range_end scip-java maven . . minimized/BookService#checkPages(). } //⌃ enclosing_range_end scip-java maven . . minimized/BookService# @@ -56,24 +62,27 @@ interface BookService { //⌄ enclosing_range_start scip-java maven . . minimized/MyService# interface MyService { // ^^^^^^^^^ definition scip-java maven . . minimized/MyService# -// display_name MyService -// signature_documentation java interface MyService // kind Interface +// display_name MyService +// signature_documentation +// > interface MyService // ⌄ enclosing_range_start scip-java maven . . minimized/MyService#bookService(). BookService 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 +// display_name bookService +// signature_documentation +// > public abstract BookService bookService() // ⌃ enclosing_range_end scip-java maven . . minimized/MyService#bookService(). // ⌄ enclosing_range_start scip-java maven . . minimized/MyService#example(). default void example() { // ^^^^^^^ definition scip-java maven . . minimized/MyService#example(). -// display_name example -// signature_documentation java public default void example() // kind Method +// display_name example +// signature_documentation +// > public default void example() bookService().checkPages(); // ^^^^^^^^^^^ reference scip-java maven . . minimized/MyService#bookService(). // ^^^^^^^^^^ reference scip-java maven . . minimized/BookService#checkPages(). @@ -81,3 +90,4 @@ default void example() { // ⌃ enclosing_range_end scip-java maven . . minimized/MyService#example(). } //⌃ 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 46e8fb915..4e0469bc4 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,10 +1,10 @@ package minimized; -//⌄ 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#HelloBuilder#toString(). +//⌄ 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# //⌄ enclosing_range_start scip-java maven . . minimized/Hello#``(). //⌄ enclosing_range_start local 0 @@ -12,47 +12,25 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Hello#HelloBuilder#message(). //⌄ enclosing_range_start local 1 @lombok.Builder -//^^^^^^^^^^^^^^^ reference local 0 -//^^^^^^^^^^^^^^^ reference local 1 -//^^^^^^^^^^^^^^^ reference scip-java maven . . java/ +//^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# //^^^^^^^^^^^^^^^ reference scip-java maven . . java/lang/ -//^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Hello# +//^^^^^^^^^^^^^^^ reference scip-java maven . . java/ +//^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/String# +//^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Hello#message. +//^^^^^^^^^^^^^^^ reference local 0 +//^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings#value(). //^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Hello#HelloBuilder# +//^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Hello# //^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Hello#HelloBuilder#message. -//^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Hello#message. +//^^^^^^^^^^^^^^^ reference local 1 //^^^^^^^^^^^^^^^ 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/ // ^^^^^^^ 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 scip-java maven . . minimized/Hello#builder(). 1:6 -// display_name builder -// signature_documentation java @SuppressWarnings("all")\npublic static HelloBuilder builder() -// kind StaticMethod -// 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 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 scip-java maven . . minimized/Hello#HelloBuilder#``(). 1:11 -// display_name -// signature_documentation java @SuppressWarnings("all")\nHelloBuilder() -// kind Constructor -// 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#HelloBuilder#toString(). +// ⌃ 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#``(). // ⌃ enclosing_range_end local 0 // ⌃ enclosing_range_end scip-java maven . . minimized/Hello#HelloBuilder#message. @@ -60,38 +38,49 @@ // ⌃ enclosing_range_end local 1 class Hello { // ^^^^^ definition scip-java maven . . minimized/Hello# -// display_name Hello -// signature_documentation java @Builder\nclass Hello // kind Class +// display_name Hello +// signature_documentation +// > @Builder +// > class Hello // ^^^^^ definition scip-java maven . . minimized/Hello#``(). -// display_name -// signature_documentation java @SuppressWarnings("all")\nHello(String message) // kind Constructor +// display_name +// signature_documentation +// > @SuppressWarnings("all") +// > Hello(String message) // ^^^^^ reference scip-java maven . . minimized/Hello#``(). // ⌄ enclosing_range_start scip-java maven . . minimized/Hello#message. private String message; // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# +// ^^^^^^^ definition scip-java maven . . minimized/Hello#message. +// kind Field +// display_name message +// signature_documentation +// > private String message // ^^^^^^^ definition local 0 // display_name message -// signature_documentation java final String message -// enclosing_symbol scip-java maven . . minimized/Hello#``(). -// ^^^^^^^ definition local 1 +// signature_documentation +// > final String message +// ^^^^^^^ definition scip-java maven . . minimized/Hello#HelloBuilder#message. +// kind Field // display_name message -// signature_documentation java final String message -// enclosing_symbol scip-java maven . . minimized/Hello#HelloBuilder#message(). +// signature_documentation +// > @SuppressWarnings("all") +// > private String 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 scip-java maven . . minimized/Hello#HelloBuilder#message. // display_name message -// signature_documentation java @SuppressWarnings("all")\nprivate String message -// kind Field -// ^^^^^^^ definition scip-java maven . . minimized/Hello#message. +// signature_documentation +// > @SuppressWarnings("all") +// > public HelloBuilder message(String message) +// documentation +// > @return {@code this}. +// ^^^^^^^ definition local 1 // display_name message -// signature_documentation java private String message -// kind Field +// signature_documentation +// > final String message // ⌃ enclosing_range_end scip-java maven . . minimized/Hello#message. } //⌃ 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 729d76ad0..0f59d22c2 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 @@ -3,24 +3,27 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Methods# public class Methods { // ^^^^^^^ definition scip-java maven . . minimized/Methods# -// display_name Methods -// signature_documentation java public class Methods // kind Class +// display_name Methods +// signature_documentation +// > public class Methods // ^^^^^^^ definition scip-java maven . . minimized/Methods#``(). -// display_name -// signature_documentation java public Methods() // kind Constructor +// display_name +// signature_documentation +// > public Methods() // ⌄ enclosing_range_start scip-java maven . . minimized/Methods#overload(). // ⌄ enclosing_range_start local 0 private int overload(int value) { // ^^^^^^^^ definition scip-java maven . . minimized/Methods#overload(). -// display_name overload -// signature_documentation java private int overload(int value) // kind Method +// display_name overload +// signature_documentation +// > private int overload(int value) // ^^^^^ definition local 0 // display_name value -// signature_documentation java int value -// enclosing_symbol scip-java maven . . minimized/Methods#overload(). +// signature_documentation +// > int value // ⌃ enclosing_range_end local 0 return value + 1; // ^^^^^ reference local 0 @@ -32,14 +35,15 @@ private int overload(int value) { private String overload(String value) { // ^^^^^^ 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 +// display_name overload +// signature_documentation +// > private String overload(String value) // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^^ definition local 1 // display_name value -// signature_documentation java String value -// enclosing_symbol scip-java maven . . minimized/Methods#overload(+1). +// signature_documentation +// > String value // ⌃ enclosing_range_end local 1 return value + "1"; // ^^^^^ reference local 1 @@ -50,13 +54,14 @@ private String overload(String value) { // ⌄ enclosing_range_start local 2 private static int staticOverload(int value) { // ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/Methods#staticOverload(). -// display_name staticOverload -// signature_documentation java private static int staticOverload(int value) // kind StaticMethod +// display_name staticOverload +// signature_documentation +// > private static int staticOverload(int value) // ^^^^^ definition local 2 // display_name value -// signature_documentation java int value -// enclosing_symbol scip-java maven . . minimized/Methods#staticOverload(). +// signature_documentation +// > int value // ⌃ enclosing_range_end local 2 return value + 1; // ^^^^^ reference local 2 @@ -68,14 +73,15 @@ private static int staticOverload(int value) { private static String staticOverload(String value) { // ^^^^^^ 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 +// display_name staticOverload +// signature_documentation +// > private static String staticOverload(String value) // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^^ definition local 3 // display_name value -// signature_documentation java String value -// enclosing_symbol scip-java maven . . minimized/Methods#staticOverload(+1). +// signature_documentation +// > String value // ⌃ enclosing_range_end local 3 return value + "1"; // ^^^^^ reference local 3 @@ -88,18 +94,19 @@ private static String staticOverload(String value) { public static String app(int n, String m) throws RuntimeException, IndexOutOfBoundsException { // ^^^^^^ 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 +// display_name app +// signature_documentation +// > public static String app(int n, String m) throws RuntimeException, IndexOutOfBoundsException // ^ definition local 4 // display_name n -// signature_documentation java int n -// enclosing_symbol scip-java maven . . minimized/Methods#app(). +// signature_documentation +// > int n // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 5 // display_name m -// signature_documentation java String m -// enclosing_symbol scip-java maven . . minimized/Methods#app(). +// signature_documentation +// > String m // ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/RuntimeException# // ^^^^^^^^^^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/IndexOutOfBoundsException# // ⌃ enclosing_range_end local 4 @@ -108,19 +115,19 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou Methods methods = new Methods(); // ^^^^^^^ reference scip-java maven . . minimized/Methods# // ^^^^^^^ definition local 6 -// display_name methods -// signature_documentation java Methods methods -// enclosing_symbol scip-java maven . . minimized/Methods#app(). // kind Variable +// display_name methods +// signature_documentation +// > Methods 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 scip-java maven . . minimized/Methods#app(). // kind Variable +// display_name a +// signature_documentation +// > int a // ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Methods#staticOverload(). // ^ reference local 4 // ⌃ enclosing_range_end local 7 @@ -128,20 +135,20 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou String b = staticOverload(m); // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 8 -// display_name b -// signature_documentation java String b -// enclosing_symbol scip-java maven . . minimized/Methods#app(). // kind Variable +// display_name b +// signature_documentation +// > String b // ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/Methods#staticOverload(+1). // ^ reference local 5 // ⌃ enclosing_range_end local 8 // ⌄ enclosing_range_start local 9 int c = methods.overload(n); // ^ definition local 9 -// display_name c -// signature_documentation java int c -// enclosing_symbol scip-java maven . . minimized/Methods#app(). // kind Variable +// display_name c +// signature_documentation +// > int c // ^^^^^^^ reference local 6 // ^^^^^^^^ reference scip-java maven . . minimized/Methods#overload(). // ^ reference local 4 @@ -150,10 +157,10 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou String d = methods.overload(m); // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 10 -// display_name d -// signature_documentation java String d -// enclosing_symbol scip-java maven . . minimized/Methods#app(). // kind Variable +// display_name d +// signature_documentation +// > String d // ^^^^^^^ reference local 6 // ^^^^^^^^ reference scip-java maven . . minimized/Methods#overload(+1). // ^ reference local 5 @@ -167,3 +174,4 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou // ⌃ enclosing_range_end scip-java maven . . minimized/Methods#app(). } //⌃ 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 ecc0a1506..b2c50842c 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 @@ -2,30 +2,34 @@ //⌄ enclosing_range_start scip-java maven . . minimized/MinimizedJavaMain# @Annotations(value = "value", format = "format") -// ^^^^^^^^^^ reference scip-java maven . . minimized/Annotations# +// ^^^^^^^^^^^ reference scip-java maven . . minimized/Annotations# // ^^^^^ reference scip-java maven . . minimized/Annotations#value(). // ^^^^^^ reference scip-java maven . . minimized/Annotations#format(). public class MinimizedJavaMain { // ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/MinimizedJavaMain# -// display_name MinimizedJavaMain -// signature_documentation java @Annotations(value = "value", format = "format")\npublic class MinimizedJavaMain // kind Class +// display_name MinimizedJavaMain +// signature_documentation +// > @Annotations(value = "value", format = "format") +// > public class MinimizedJavaMain // ^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/MinimizedJavaMain#``(). -// display_name -// signature_documentation java public MinimizedJavaMain() // kind Constructor +// display_name +// signature_documentation +// > public MinimizedJavaMain() // ⌄ enclosing_range_start scip-java maven . . minimized/MinimizedJavaMain#main(). // ⌄ enclosing_range_start local 0 public static void main(String[] args) { // ^^^^ definition scip-java maven . . minimized/MinimizedJavaMain#main(). -// display_name main -// signature_documentation java public static void main(String[] args) // kind StaticMethod +// display_name main +// signature_documentation +// > public static void main(String[] args) // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^ definition local 0 // display_name args -// signature_documentation java String[] args -// enclosing_symbol scip-java maven . . minimized/MinimizedJavaMain#main(). +// signature_documentation +// > String[] args // ⌃ enclosing_range_end local 0 TypeVariables.app(new TypeVariables.CT()); // ^^^^^^^^^^^^^ reference scip-java maven . . minimized/TypeVariables# @@ -79,3 +83,4 @@ public static void main(String[] args) { // ⌃ enclosing_range_end scip-java maven . . minimized/MinimizedJavaMain#main(). } //⌃ 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 d5eae2dd7..1b33b6787 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 @@ -22,44 +22,50 @@ //⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#[B] public class ParameterizedTypes { // ^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ParameterizedTypes# -// display_name ParameterizedTypes -// signature_documentation java public class ParameterizedTypes // kind Class +// display_name ParameterizedTypes +// signature_documentation +// > public class ParameterizedTypes // ^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ParameterizedTypes#``(). -// display_name -// signature_documentation java public ParameterizedTypes() // kind Constructor +// display_name +// signature_documentation +// > public ParameterizedTypes() // ^ definition scip-java maven . . minimized/ParameterizedTypes#[A] -// display_name A -// signature_documentation java A // kind TypeParameter +// display_name A +// signature_documentation +// > A // ^ definition scip-java maven . . minimized/ParameterizedTypes#[B] -// display_name B -// signature_documentation java B extends String // kind TypeParameter +// display_name B +// signature_documentation +// > B extends String // ^^^^^^ 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 scip-java maven . . minimized/ParameterizedTypes#iteratorable().[T] -// display_name T -// signature_documentation java T extends Iterable & Iterator // kind TypeParameter +// display_name T +// signature_documentation +// > T extends Iterable & Iterator // ^^^^^^^^ 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 +// display_name iteratorable +// signature_documentation +// > public & Iterator> void iteratorable(List list) // ^^^^ 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 scip-java maven . . minimized/ParameterizedTypes#iteratorable(). +// signature_documentation +// > List list // ⌃ enclosing_range_end local 0 // ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#iteratorable().[T] // ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#iteratorable(). @@ -70,19 +76,20 @@ public & Iterator> void iteratorable(List list) {} public String app(A a, B b) { // ^^^^^^ 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 +// display_name app +// signature_documentation +// > public String app(A a, B b) // ^ reference scip-java maven . . minimized/ParameterizedTypes#[A] // ^ definition local 1 // display_name a -// signature_documentation java A a -// enclosing_symbol scip-java maven . . minimized/ParameterizedTypes#app(). +// signature_documentation +// > A a // ^ reference scip-java maven . . minimized/ParameterizedTypes#[B] // ^ definition local 2 // display_name b -// signature_documentation java B b -// enclosing_symbol scip-java maven . . minimized/ParameterizedTypes#app(). +// signature_documentation +// > B b // ⌃ enclosing_range_end local 1 // ⌃ enclosing_range_end local 2 return a.toString() + b; @@ -97,9 +104,10 @@ public String app(A a, B b) { // ^^^ 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 +// display_name doStuff +// signature_documentation +// > public Map doStuff() // ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#doStuff(). // ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#createQuadruplet(). @@ -109,9 +117,10 @@ public String app(A a, B b) { // ^^^^^^ 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 +// display_name createQuadruplet +// signature_documentation +// > public Quadruplet createQuadruplet() // ⌃ enclosing_range_end scip-java maven . . minimized/ParameterizedTypes#createQuadruplet(). // ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#Quadruplet# @@ -121,29 +130,35 @@ public String app(A a, B b) { // ⌄ enclosing_range_start scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[Y] public static class Quadruplet {} // ^^^^^^^^^^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet# -// display_name Quadruplet -// signature_documentation java public static class Quadruplet // kind Class +// display_name Quadruplet +// signature_documentation +// > public static class Quadruplet // ^^^^^^^^^^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet#``(). -// display_name -// signature_documentation java public Quadruplet() // kind Constructor +// display_name +// signature_documentation +// > public Quadruplet() // ^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[T] -// display_name T -// signature_documentation java T // kind TypeParameter +// display_name T +// signature_documentation +// > T // ^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[S] -// display_name S -// signature_documentation java S // kind TypeParameter +// display_name S +// signature_documentation +// > S // ^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[X] -// display_name X -// signature_documentation java X // kind TypeParameter +// display_name X +// signature_documentation +// > X // ^ definition scip-java maven . . minimized/ParameterizedTypes#Quadruplet#[Y] -// display_name Y -// signature_documentation java Y // kind TypeParameter +// display_name Y +// signature_documentation +// > 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] @@ -153,3 +168,4 @@ public static class Quadruplet {} //⌃ 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 83e5de549..668cae4b6 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 @@ -8,107 +8,110 @@ //⌄ enclosing_range_start scip-java maven . . minimized/Primitives# public class Primitives { // ^^^^^^^^^^ definition scip-java maven . . minimized/Primitives# -// display_name Primitives -// signature_documentation java public class Primitives // kind Class +// display_name Primitives +// signature_documentation +// > public class Primitives // ^^^^^^^^^^ definition scip-java maven . . minimized/Primitives#``(). -// display_name -// signature_documentation java public Primitives() // kind Constructor +// display_name +// signature_documentation +// > public Primitives() // ⌄ enclosing_range_start scip-java maven . . minimized/Primitives#app(). public static String 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 +// display_name app +// signature_documentation +// > public static String app() // ⌄ enclosing_range_start local 0 Random random = new Random(); // ^^^^^^ reference scip-java maven jdk 11 java/util/Random# // ^^^^^^ definition local 0 -// display_name random -// signature_documentation java Random random -// enclosing_symbol scip-java maven . . minimized/Primitives#app(). // kind Variable +// display_name random +// signature_documentation +// > Random 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 scip-java maven . . minimized/Primitives#app(). // kind Variable +// display_name a +// signature_documentation +// > byte a // ^^^^^^ reference local 0 // ^^^^^^^ 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 scip-java maven . . minimized/Primitives#app(). // kind Variable +// display_name b +// signature_documentation +// > short b // ^^^^^^ reference local 0 // ^^^^^^^ 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 scip-java maven . . minimized/Primitives#app(). // kind Variable +// display_name c +// signature_documentation +// > int c // ^^^^^^ reference local 0 // ^^^^^^^ 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 scip-java maven . . minimized/Primitives#app(). // kind Variable +// display_name d +// signature_documentation +// > long d // ^^^^^^ reference local 0 // ^^^^^^^^ 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 scip-java maven . . minimized/Primitives#app(). // kind Variable +// display_name e +// signature_documentation +// > char e // ^^^^^^ reference local 0 // ^^^^^^^ 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 scip-java maven . . minimized/Primitives#app(). // kind Variable +// display_name f +// signature_documentation +// > float f // ^^^^^^ reference local 0 // ^^^^^^^^^^ 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 scip-java maven . . minimized/Primitives#app(). // kind Variable +// display_name g +// signature_documentation +// > double g // ^^^^^^ reference local 0 // ^^^^^^^^^^ 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 scip-java maven . . minimized/Primitives#app(). // kind Variable +// display_name h +// signature_documentation +// > boolean h // ^^^^^^ reference local 0 // ^^^^^^^^^^^ reference scip-java maven jdk 11 java/util/Random#nextBoolean(). // ⌃ enclosing_range_end local 8 @@ -127,9 +130,11 @@ public static String app() { // ⌄ enclosing_range_start scip-java maven . . minimized/Primitives#test(). public static void test() {} // ^^^^ definition scip-java maven . . minimized/Primitives#test(). -// display_name test -// signature_documentation java public static void test() // kind StaticMethod +// display_name test +// signature_documentation +// > public static void test() // ⌃ enclosing_range_end scip-java maven . . minimized/Primitives#test(). } //⌃ 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 de176c3a4..39b5e343e 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 @@ -11,25 +11,30 @@ //⌄ enclosing_range_start scip-java maven . . minimized/RawTypes# @SuppressWarnings("ALL") -// ^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# +// ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/SuppressWarnings# public class RawTypes { // ^^^^^^^^ definition scip-java maven . . minimized/RawTypes# -// display_name RawTypes -// signature_documentation java @SuppressWarnings("ALL")\npublic class RawTypes // kind Class +// display_name RawTypes +// signature_documentation +// > @SuppressWarnings("ALL") +// > public class RawTypes // ^^^^^^^^ definition scip-java maven . . minimized/RawTypes#``(). -// display_name -// signature_documentation java public RawTypes() // kind Constructor +// display_name +// signature_documentation +// > public RawTypes() // ⌄ enclosing_range_start scip-java maven . . minimized/RawTypes#x. public static final List x = Collections.singletonList(42); // ^^^^ 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 +// display_name x +// signature_documentation +// > public static final List 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 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 cb9210521..cafa839ae 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 @@ -3,15 +3,17 @@ //⌄ enclosing_range_start scip-java maven . . minimized/SubClasses# public class SubClasses extends AbstractClasses implements Interfaces { // ^^^^^^^^^^ definition scip-java maven . . minimized/SubClasses# -// display_name SubClasses -// signature_documentation java public class SubClasses extends AbstractClasses implements Interfaces // kind Class -// relationship is_implementation scip-java maven . . minimized/AbstractClasses# -// relationship is_implementation scip-java maven . . minimized/Interfaces# +// display_name SubClasses +// signature_documentation +// > public class SubClasses extends AbstractClasses implements Interfaces +// relationship scip-java maven . . minimized/AbstractClasses# implementation +// relationship scip-java maven . . minimized/Interfaces# implementation // ^^^^^^^^^^ definition scip-java maven . . minimized/SubClasses#``(). -// display_name -// signature_documentation java public SubClasses() // kind Constructor +// display_name +// signature_documentation +// > public SubClasses() // ^^^^^^^^^^^^^^^ reference scip-java maven . . minimized/AbstractClasses# // ^^^^^^^^^^ reference scip-java maven . . minimized/Interfaces# @@ -21,10 +23,12 @@ public class SubClasses extends AbstractClasses implements Interfaces { public String 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 scip-java maven . . minimized/AbstractClasses#abstractImplementation(). +// display_name abstractImplementation +// signature_documentation +// > @Override +// > public String abstractImplementation() +// relationship scip-java maven . . minimized/AbstractClasses#abstractImplementation(). implementation reference return "abstract"; } // ⌃ enclosing_range_end scip-java maven . . minimized/SubClasses#abstractImplementation(). @@ -35,10 +39,12 @@ public String abstractImplementation() { public String 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 scip-java maven . . minimized/Interfaces#abstractInterfaceMethod(). +// display_name abstractInterfaceMethod +// signature_documentation +// > @Override +// > public String abstractInterfaceMethod() +// relationship scip-java maven . . minimized/Interfaces#abstractInterfaceMethod(). implementation reference return "abstractInterface"; } // ⌃ enclosing_range_end scip-java maven . . minimized/SubClasses#abstractInterfaceMethod(). @@ -47,17 +53,18 @@ public String abstractInterfaceMethod() { public static String 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 +// display_name app +// signature_documentation +// > public static String app() // ⌄ enclosing_range_start local 0 SubClasses s = new SubClasses(); // ^^^^^^^^^^ reference scip-java maven . . minimized/SubClasses# // ^ definition local 0 -// display_name s -// signature_documentation java SubClasses s -// enclosing_symbol scip-java maven . . minimized/SubClasses#app(). // kind Variable +// display_name s +// signature_documentation +// > SubClasses s // ^^^^^^^^^^ reference scip-java maven . . minimized/SubClasses#``(). // ⌃ enclosing_range_end local 0 return s.abstractImplementation() @@ -76,3 +83,4 @@ public static String app() { // ⌃ enclosing_range_end scip-java maven . . minimized/SubClasses#app(). } //⌃ 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 b4833cb53..1d2a80251 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 @@ -3,27 +3,30 @@ //⌄ enclosing_range_start scip-java maven . . minimized/TabIndented# public class TabIndented { // ^^^^^^^^^^^ definition scip-java maven . . minimized/TabIndented# -// display_name TabIndented -// signature_documentation java public class TabIndented // kind Class +// display_name TabIndented +// signature_documentation +// > public class TabIndented // ^^^^^^^^^^^ definition scip-java maven . . minimized/TabIndented#``(). -// display_name -// signature_documentation java public TabIndented() // kind Constructor +// display_name +// signature_documentation +// > public TabIndented() // ⌄ enclosing_range_start scip-java maven . . minimized/TabIndented#app(). public void app() { // ^^^ definition scip-java maven . . minimized/TabIndented#app(). -// display_name app -// signature_documentation java public void app() // kind Method +// display_name app +// signature_documentation +// > public void app() // ⌄ enclosing_range_start local 0 Object o = new Object() { // ^^^^^^ reference scip-java maven jdk 11 java/lang/Object# // ^ definition local 0 -// display_name o -// signature_documentation java Object o -// enclosing_symbol scip-java maven . . minimized/TabIndented#app(). // kind Variable +// display_name o +// signature_documentation +// > Object o // ^^^^^^ reference scip-java maven jdk 11 java/lang/Object# // ⌄ enclosing_range_start local 2 @Override @@ -31,16 +34,17 @@ public void app() { // ⌄ enclosing_range_start local 3 public boolean equals(Object other) { // ^^^^^^ definition local 2 -// display_name equals -// signature_documentation java @Override\npublic boolean equals(Object other) -// enclosing_symbol local 1 // kind Method -// relationship is_reference is_implementation scip-java maven jdk 11 java/lang/Object#equals(). +// display_name equals +// signature_documentation +// > @Override +// > public boolean equals(Object other) +// relationship scip-java maven jdk 11 java/lang/Object#equals(). implementation reference // ^^^^^^ reference scip-java maven jdk 11 java/lang/Object# // ^^^^^ definition local 3 // display_name other -// signature_documentation java Object other -// enclosing_symbol local 2 +// signature_documentation +// > Object other // ⌃ enclosing_range_end local 3 return false; } @@ -51,11 +55,12 @@ public boolean equals(Object other) { // ^^^^^^^^ 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 scip-java maven jdk 11 java/lang/Object#hashCode(). +// display_name hashCode +// signature_documentation +// > @Override +// > public int hashCode() +// relationship scip-java maven jdk 11 java/lang/Object#hashCode(). implementation reference return System.identityHashCode(this); // ^^^^^^ reference scip-java maven jdk 11 java/lang/System# // ^^^^^^^^^^^^^^^^ reference scip-java maven jdk 11 java/lang/System#identityHashCode(). @@ -68,11 +73,12 @@ public int hashCode() { public String toString() { // ^^^^^^ 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 scip-java maven jdk 11 java/lang/Object#toString(). +// display_name toString +// signature_documentation +// > @Override +// > public String toString() +// relationship scip-java maven jdk 11 java/lang/Object#toString(). implementation reference return ""; } // ⌃ enclosing_range_end local 5 @@ -82,3 +88,4 @@ public String toString() { // ⌃ enclosing_range_end scip-java maven . . minimized/TabIndented#app(). } //⌃ 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 692b31e9a..02d62db90 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 @@ -13,21 +13,24 @@ //⌄ enclosing_range_start scip-java maven . . minimized/TypeAnnotation# @Target({ ElementType.TYPE_USE }) -// ^^^^^ reference scip-java maven jdk 11 java/lang/annotation/Target# +// ^^^^^^ 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 scip-java maven . . minimized/TypeAnnotation# -// display_name TypeAnnotation -// signature_documentation java @Target({ElementType.TYPE_USE})\n@interface TypeAnnotation // kind Interface -// relationship is_implementation scip-java maven jdk 11 java/lang/annotation/Annotation# +// display_name TypeAnnotation +// signature_documentation +// > @Target({ElementType.TYPE_USE}) +// > @interface TypeAnnotation +// relationship scip-java maven jdk 11 java/lang/annotation/Annotation# implementation // ⌄ enclosing_range_start scip-java maven . . minimized/TypeAnnotation#integer(). int integer() default 1; // ^^^^^^^ definition scip-java maven . . minimized/TypeAnnotation#integer(). -// display_name integer -// signature_documentation java public abstract int integer() // kind AbstractMethod +// display_name integer +// signature_documentation +// > public abstract int integer() // ⌃ enclosing_range_end scip-java maven . . minimized/TypeAnnotation#integer(). } //⌃ enclosing_range_end scip-java maven . . minimized/TypeAnnotation# @@ -37,36 +40,40 @@ //⌄ enclosing_range_start scip-java maven . . minimized/ClassProcessed#[T] class ClassProcessed<@TypeAnnotation T extends Number> { // ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ClassProcessed# -// display_name ClassProcessed -// signature_documentation java class ClassProcessed // kind Class +// display_name ClassProcessed +// signature_documentation +// > class ClassProcessed // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ClassProcessed#[T] -// display_name T -// signature_documentation java T extends Number // kind TypeParameter +// display_name T +// signature_documentation +// > T extends Number // ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/TypeAnnotation# // ^^^^^^ reference scip-java maven jdk 11 java/lang/Number# // ⌄ enclosing_range_start scip-java maven . . minimized/ClassProcessed#``(). public ClassProcessed() { // ^^^^^^^^^^^^^^ definition scip-java maven . . minimized/ClassProcessed#``(). -// display_name -// signature_documentation java public ClassProcessed() // kind Constructor +// display_name +// signature_documentation +// > public ClassProcessed() // ⌄ enclosing_range_start local 0 String s = new @TypeAnnotation String(); // ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^ definition local 0 -// display_name s -// signature_documentation java String s -// enclosing_symbol scip-java maven . . minimized/ClassProcessed#``(). // kind Variable +// display_name s +// signature_documentation +// > String s // ^^^^^^^^^^^^^^ reference scip-java maven . . minimized/TypeAnnotation# -// ^^^^^^ reference scip-java maven jdk 11 java/lang/String# // ^^^^^^ 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 scip-java maven . . minimized/ClassProcessed#``(). } //⌃ 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 187fc61f3..bd0ed2a02 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 @@ -4,46 +4,54 @@ //⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables# public class 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 +// display_name TypeVariables +// signature_documentation +// > public class TypeVariables +// documentation +// > Example from https://docs.oracle.com/javase/specs/jls/se8/html/jls-4.html#jls-4.4 // ^^^^^^^^^^^^^ definition scip-java maven . . minimized/TypeVariables#``(). -// display_name -// signature_documentation java public TypeVariables() // kind Constructor +// display_name +// signature_documentation +// > public TypeVariables() // ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#C# static class C { // ^ definition scip-java maven . . minimized/TypeVariables#C# -// display_name C -// signature_documentation java static class C // kind Class +// display_name C +// signature_documentation +// > static class C // ^ definition scip-java maven . . minimized/TypeVariables#C#``(). -// display_name -// signature_documentation java C() // kind Constructor +// display_name +// signature_documentation +// > C() // ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#C#mCPublic(). public void mCPublic() {} // ^^^^^^^^ definition scip-java maven . . minimized/TypeVariables#C#mCPublic(). -// display_name mCPublic -// signature_documentation java public void mCPublic() // kind Method +// display_name mCPublic +// signature_documentation +// > public void mCPublic() // ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#C#mCPublic(). // ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#C#mCProtected(). protected void mCProtected() {} // ^^^^^^^^^^^ definition scip-java maven . . minimized/TypeVariables#C#mCProtected(). -// display_name mCProtected -// signature_documentation java protected void mCProtected() // kind Method +// display_name mCProtected +// signature_documentation +// > protected void mCProtected() // ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#C#mCProtected(). // ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#C#mCPackage(). void mCPackage() {} // ^^^^^^^^^ definition scip-java maven . . minimized/TypeVariables#C#mCPackage(). -// display_name mCPackage -// signature_documentation java void mCPackage() // kind Method +// display_name mCPackage +// signature_documentation +// > void mCPackage() // ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#C#mCPackage(). } // ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#C# @@ -51,16 +59,18 @@ void mCPackage() {} // ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#I# interface I { // ^ definition scip-java maven . . minimized/TypeVariables#I# -// display_name I -// signature_documentation java interface I // kind Interface +// display_name I +// signature_documentation +// > interface I // ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#I#mI(). void 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 scip-java maven . . minimized/TypeVariables#CT#mI(). +// display_name mI +// signature_documentation +// > public abstract void mI() +// relationship scip-java maven . . minimized/TypeVariables#CT#mI(). implementation reference // ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#I#mI(). } // ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#I# @@ -68,24 +78,27 @@ interface I { // ⌄ enclosing_range_start scip-java maven . . minimized/TypeVariables#CT# static class CT extends C implements I { // ^^ 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 scip-java maven . . minimized/TypeVariables#C# -// relationship is_implementation scip-java maven . . minimized/TypeVariables#I# +// display_name CT +// signature_documentation +// > static class CT extends C implements I +// relationship scip-java maven . . minimized/TypeVariables#C# implementation +// relationship scip-java maven . . minimized/TypeVariables#I# implementation // ^^ definition scip-java maven . . minimized/TypeVariables#CT#``(). -// display_name -// signature_documentation java CT() // kind Constructor +// display_name +// signature_documentation +// > CT() // ^ 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 scip-java maven . . minimized/TypeVariables#CT#mI(). -// display_name mI -// signature_documentation java public void mI() // kind Method -// relationship is_reference is_implementation scip-java maven . . minimized/TypeVariables#I#mI(). +// display_name mI +// signature_documentation +// > public void mI() +// relationship scip-java maven . . minimized/TypeVariables#I#mI(). implementation reference // ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#CT#mI(). } // ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#CT# @@ -95,20 +108,22 @@ public void mI() {} // ⌄ enclosing_range_start local 0 public static void app(T t) { // ^ definition scip-java maven . . minimized/TypeVariables#app().[T] -// display_name T -// signature_documentation java T extends C & I // kind TypeParameter +// display_name T +// signature_documentation +// > T extends C & I // ^ 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 +// display_name app +// signature_documentation +// > public static void app(T t) // ^ reference scip-java maven . . minimized/TypeVariables#app().[T] // ^ definition local 0 // display_name t -// signature_documentation java T t -// enclosing_symbol scip-java maven . . minimized/TypeVariables#app(). +// signature_documentation +// > T t // ⌃ enclosing_range_end local 0 t.mI(); // ^ reference local 0 @@ -127,3 +142,4 @@ public static void app(T t) { // ⌃ enclosing_range_end scip-java maven . . minimized/TypeVariables#app(). } //⌃ 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 92a319913..f996ec053 100644 --- a/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala +++ b/tests/snapshots/src/main/scala/tests/MinimizedSnapshotScipGenerator.scala @@ -1,6 +1,5 @@ package tests -import java.net.URI import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.Paths @@ -8,11 +7,9 @@ import java.nio.file.Paths import scala.jdk.CollectionConverters.CollectionHasAsScala import scala.jdk.CollectionConverters.SeqHasAsJava -import scala.meta.internal.io.FileIO import scala.meta.io.AbsolutePath import com.sourcegraph.scip_java.ScipJava -import com.sourcegraph.scip_java.ScipPrinters import org.scip_code.scip.Index class MinimizedSnapshotScipGenerator { @@ -49,6 +46,20 @@ class MinimizedSnapshotScipGenerator { ) ) val index = Index.parseFrom(Files.readAllBytes(scipOutput)) + // Render the index into golden snapshots with the `scip` CLI (provided on + // PATH by the nix devShell). scip reads each document's source from disk + // via the project root recorded in the index metadata and writes one + // annotated snapshot file per document under `snapshotOutput`. + os.proc( + "scip", + "snapshot", + "--from", + scipOutput.toString, + "--to", + snapshotOutput.toString, + "--strict=false" + ) + .call(stdout = os.Inherit, stderr = os.Inherit) try { index .getDocumentsList @@ -57,22 +68,17 @@ class MinimizedSnapshotScipGenerator { val expectOutput = context .expectDirectory .resolve(Paths.get(document.getRelativePath)) - handler.onSnapshotTest( - context, - expectOutput, - () => { - val uri = URI.create( - List( - index.getMetadata.getProjectRoot.stripSuffix("/"), - document.getRelativePath - ).mkString("/") - ) - - val absolutePath = AbsolutePath(Paths.get(uri)) - val text = FileIO.slurp(absolutePath, StandardCharsets.UTF_8) - ScipPrinters.printTextDocument(document, text) - } - ) + // Read the rendered snapshot eagerly: some handlers evaluate + // `obtainedOutput` lazily (the assertion suite defers it to munit), + // and by then the `finally` block below has deleted the temp dir. + val obtained = + new String( + Files.readAllBytes( + snapshotOutput.toNIO.resolve(document.getRelativePath) + ), + StandardCharsets.UTF_8 + ) + handler.onSnapshotTest(context, expectOutput, () => obtained) } } finally { os.remove.all(os.Path(scipOutput)) diff --git a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala b/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala deleted file mode 100644 index ccca20925..000000000 --- a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala +++ /dev/null @@ -1,92 +0,0 @@ -package tests - -import java.nio.file.Files - -import scala.meta.inputs.Input - -import com.sourcegraph.scip_java.ScipJava - -class SnapshotCommandSuite extends ScipJavaSuite(ScipJava.app) { - test("snapshot") { - FileLayout.fromString( - """/main/Sample.java - |package main; - | /** - | * Sample class - | */ - |public class Sample { - | /** - | * Main application entry point - | */ - | public static void main(String[] asdf) {} - |} - |""".stripMargin, - workingDirectory - ) - - val targetroot = workingDirectory.resolve("target/main") - val sourcepath = workingDirectory.resolve("main/Sample.java") - val code = new String(Files.readAllBytes(sourcepath)) - new TestCompiler(targetroot).compileScip( - List(Input.VirtualFile("main/Sample.java", code)) - ) - - val generatedpath = workingDirectory.resolve("generated") - - val indexExit = app.run( - List( - "aggregate", - "--output", - targetroot.resolve("index.scip").toString, - targetroot.toString - ) - ) - - assertEquals(indexExit, 0, clues(app.capturedOutput)) - - val snapshotExit = app.run( - List("snapshot", "--output", generatedpath.toString, targetroot.toString) - ) - assertEquals(snapshotExit, 0, clues(app.capturedOutput)) - assertNoDiff( - FileLayout.asString(generatedpath), - """|/main/Sample.java - | package main; - | /** - | * Sample class - | */ - |//⌄ enclosing_range_start scip-java maven . . main/Sample# - | public class Sample { - |// ^^^^^^ definition scip-java maven . . main/Sample# - |// display_name Sample - |// signature_documentation java public class Sample - |// kind Class - |// documentation Sample class\n - |// ^^^^^^ definition scip-java maven . . main/Sample#``(). - |// display_name - |// signature_documentation java public Sample() - |// kind Constructor - | /** - | * Main application entry point - | */ - |// ⌄ enclosing_range_start scip-java maven . . main/Sample#main(). - |// ⌄ enclosing_range_start local 0 - | public static void main(String[] asdf) {} - |// ^^^^ 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 scip-java maven jdk 11 java/lang/String# - |// ^^^^ definition local 0 - |// display_name asdf - |// signature_documentation java String[] asdf - |// enclosing_symbol scip-java maven . . main/Sample#main(). - |// ⌃ enclosing_range_end local 0 - |// ⌃ enclosing_range_end scip-java maven . . main/Sample#main(). - | } - |//⌃ enclosing_range_end scip-java maven . . main/Sample# - |""".stripMargin - ) - } -}