Skip to content

Commit 3794e99

Browse files
olafurpgolafurpg
committed
Update to the latest lsif-java to render signatures in the snapshot tests
1 parent ae2e880 commit 3794e99

File tree

8 files changed

+39
-40
lines changed

8 files changed

+39
-40
lines changed

‎semanticdb-kotlinc/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies {
4646
testImplementation(kotlin("reflect"))
4747
testImplementation(kotlin("script-runtime", "1.5.0"))
4848

49-
snapshotsImplementation("com.sourcegraph", "lsif-java_2.13", "0.5.6")
49+
snapshotsImplementation("com.sourcegraph", "lsif-java_2.13", "0.6.12")
5050
}
5151

5252
tasks.withType<KotlinCompile> {

‎semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/kotlin/snapshots/Class.kt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ package snapshots
22
// ^^^^^^^^^ reference snapshots/
33

44
class Class constructor(private var banana: Int, apple: String) :
5-
// ^^^^^ definition snapshots/Class# Class
6-
// ^^^^^^^^^^^ definition snapshots/Class#`<init>`(). Class
7-
// ^^^^^^ definition snapshots/Class#banana. banana
8-
// ^^^^^^ definition snapshots/Class#getBanana(). banana
9-
// ^^^^^^ definition snapshots/Class#setBanana(). banana
10-
// ^^^^^^ definition snapshots/Class#`<init>`().(banana) banana
5+
// ^^^^^ definition snapshots/Class# class Class : kotlin.Throwable
6+
// ^^^^^^^^^^^ definition snapshots/Class#`<init>`(). constructor Class(banana: kotlin.Int, apple: kotlin.String)
7+
// ^^^^^^ definition snapshots/Class#banana. var banana: kotlin.Int
8+
// ^^^^^^ definition snapshots/Class#getBanana(). var banana: kotlin.Int
9+
// ^^^^^^ definition snapshots/Class#setBanana(). var banana: kotlin.Int
10+
// ^^^^^^ definition snapshots/Class#`<init>`().(banana) value-parameter banana: kotlin.Int
1111
// ^^^ reference kotlin/Int#
12-
// ^^^^^ definition snapshots/Class#`<init>`().(apple) apple
12+
// ^^^^^ definition snapshots/Class#`<init>`().(apple) value-parameter apple: kotlin.String
1313
// ^^^^^^ reference kotlin/String#
1414
Throwable(banana.toString() + apple) {
1515
// ^^^^^^^^^ reference kotlin/Throwable#`<init>`().
@@ -23,25 +23,25 @@ class Class constructor(private var banana: Int, apple: String) :
2323
}
2424

2525
val asdf =
26-
// ^^^^ definition snapshots/Class#asdf. asdf
27-
// ^^^^ definition snapshots/Class#getAsdf(). asdf
26+
// ^^^^ definition snapshots/Class#asdf. val asdf: kotlin.Any
27+
// ^^^^ definition snapshots/Class#getAsdf(). val asdf: kotlin.Any
2828
object {
2929
fun doStuff() = Unit
30-
// ^^^^^^^ definition local0 doStuff
30+
// ^^^^^^^ definition local0 fun doStuff(): kotlin.Unit
3131
// ^^^^ reference kotlin/Unit#
3232
}
3333

3434
constructor() : this(1, "")
35-
//^^^^^^^^^^^ definition snapshots/Class#`<init>`(+1). Class
35+
//^^^^^^^^^^^ definition snapshots/Class#`<init>`(+1). constructor Class()
3636

3737
constructor(banana: Int) : this(banana, "")
38-
//^^^^^^^^^^^ definition snapshots/Class#`<init>`(+2). Class
39-
// ^^^^^^ definition snapshots/Class#`<init>`(+2).(banana) banana
38+
//^^^^^^^^^^^ definition snapshots/Class#`<init>`(+2). constructor Class(banana: kotlin.Int)
39+
// ^^^^^^ definition snapshots/Class#`<init>`(+2).(banana) value-parameter banana: kotlin.Int
4040
// ^^^ reference kotlin/Int#
4141
// ^^^^^^ reference snapshots/Class#`<init>`(+2).(banana)
4242

4343
fun run() {
44-
// ^^^ definition snapshots/Class#run(). run
44+
// ^^^ definition snapshots/Class#run(). fun run(): kotlin.Unit
4545
println(Class::class)
4646
// ^^^^^^^ reference kotlin/io/ConsoleKt#println(+1).
4747
// ^^^^^ reference snapshots/Class#

‎semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/kotlin/snapshots/CompanionOwner.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ package snapshots
22
// ^^^^^^^^^ reference snapshots/
33

44
class CompanionOwner {
5-
// ^^^^^^^^^^^^^^ definition snapshots/CompanionOwner# CompanionOwner
6-
// ^^^^^^^^^^^^^^ definition snapshots/CompanionOwner#`<init>`(). CompanionOwner
5+
// ^^^^^^^^^^^^^^ definition snapshots/CompanionOwner# class CompanionOwner
6+
// ^^^^^^^^^^^^^^ definition snapshots/CompanionOwner#`<init>`(). constructor CompanionOwner()
77
companion object {
8-
// ^^^^^^^^^ definition snapshots/CompanionOwner#Companion# Companion
8+
// ^^^^^^^^^ definition snapshots/CompanionOwner#Companion# companion object
99
fun create(): CompanionOwner = CompanionOwner()
10-
// ^^^^^^ definition snapshots/CompanionOwner#Companion#create(). create
10+
// ^^^^^^ definition snapshots/CompanionOwner#Companion#create(). fun create(): snapshots.CompanionOwner
1111
// ^^^^^^^^^^^^^^ reference snapshots/CompanionOwner#
1212
// ^^^^^^^^^^^^^^ reference snapshots/CompanionOwner#`<init>`().
1313
}
1414
fun create(): Int = CompanionOwner.create().hashCode()
15-
// ^^^^^^ definition snapshots/CompanionOwner#create(). create
15+
// ^^^^^^ definition snapshots/CompanionOwner#create(). fun create(): kotlin.Int
1616
// ^^^ reference kotlin/Int#
1717
// ^^^^^^^^^^^^^^ reference snapshots/CompanionOwner#Companion#
1818
// ^^^^^^ reference snapshots/CompanionOwner#Companion#create().

‎semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/kotlin/snapshots/Docstrings.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ import java.io.Serializable
77
// ^^^^^^^^^^^^ reference java/io/Serializable#
88

99
abstract class DocstringSuperclass
10-
// ^^^^^^^^^^^^^^^^^^^ definition snapshots/DocstringSuperclass# DocstringSuperclass
11-
// ^^^^^^^^^^^^^^^^^^^ definition snapshots/DocstringSuperclass#`<init>`(). DocstringSuperclass
10+
// ^^^^^^^^^^^^^^^^^^^ definition snapshots/DocstringSuperclass# class DocstringSuperclass
11+
// ^^^^^^^^^^^^^^^^^^^ definition snapshots/DocstringSuperclass#`<init>`(). constructor DocstringSuperclass()
1212
/** Example class docstring. */
1313
class Docstrings : DocstringSuperclass(), Serializable {
14-
// ^^^^^^^^^^ definition snapshots/Docstrings# Docstrings
15-
// ^^^^^^^^^^ definition snapshots/Docstrings#`<init>`(). Docstrings
14+
// ^^^^^^^^^^ definition snapshots/Docstrings# class Docstrings : snapshots.DocstringSuperclass, java.io.Serializable
15+
// ^^^^^^^^^^ definition snapshots/Docstrings#`<init>`(). constructor Docstrings()
1616
// ^^^^^^^^^^^^^^^^^^^ reference snapshots/DocstringSuperclass#`<init>`().
1717
// ^^^^^^^^^^^^ reference java/io/Serializable#
1818
}
1919

2020
/** Example method docstring. */
2121
fun docstrings() { }
22-
// ^^^^^^^^^^ definition snapshots/DocstringsKt#docstrings(). docstrings
22+
// ^^^^^^^^^^ definition snapshots/DocstringsKt#docstrings(). fun docstrings(): kotlin.Unit

‎semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/kotlin/snapshots/Functions.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package snapshots
22
// ^^^^^^^^^ reference snapshots/
33

44
fun sampleText(x: String = "") {
5-
// ^^^^^^^^^^ definition snapshots/FunctionsKt#sampleText(). sampleText
6-
// ^ definition snapshots/FunctionsKt#sampleText().(x) x
5+
// ^^^^^^^^^^ definition snapshots/FunctionsKt#sampleText(). fun sampleText(x: kotlin.String = ...): kotlin.Unit
6+
// ^ definition snapshots/FunctionsKt#sampleText().(x) value-parameter x: kotlin.String = ...
77
// ^^^^^^ reference kotlin/String#
88
println(x)
99
//^^^^^^^ reference kotlin/io/ConsoleKt#println(+1).

‎semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/kotlin/snapshots/Lambdas.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@ package snapshots
22
// ^^^^^^^^^ reference snapshots/
33

44
val x = arrayListOf<String>().forEachIndexed { i, s -> println("$i $s") }
5-
// ^ definition snapshots/LambdasKt#x. x
6-
// ^ definition snapshots/LambdasKt#getX(). x
5+
// ^ definition snapshots/LambdasKt#x. val x: kotlin.Unit
6+
// ^ definition snapshots/LambdasKt#getX(). val x: kotlin.Unit
77
// ^^^^^^^^^^^ reference kotlin/collections/CollectionsKt#arrayListOf().
88
// ^^^^^^ reference kotlin/String#
99
// ^^^^^^^^^^^^^^ reference kotlin/collections/CollectionsKt#forEachIndexed(+9).
10-
// ^ definition local0 i
11-
// ^ definition local1 s
10+
// ^ definition local0 value-parameter i: kotlin.Int
11+
// ^ definition local1 value-parameter s: kotlin.String
1212
// ^^^^^^^ reference kotlin/io/ConsoleKt#println(+1).
1313
// ^ reference local0
1414
// ^ reference local1
1515

1616
val y = "fdsa".run { this.toByteArray() }
17-
// ^ definition snapshots/LambdasKt#y. y
18-
// ^ definition snapshots/LambdasKt#getY(). y
17+
// ^ definition snapshots/LambdasKt#y. val y: kotlin.ByteArray
18+
// ^ definition snapshots/LambdasKt#getY(). val y: kotlin.ByteArray
1919
// ^^^ reference kotlin/StandardKt#run(+1).
20-
// ^^^^ reference
20+
// ^^^^ reference
2121
// ^^^^^^^^^^^ reference kotlin/text/StringsKt#toByteArray().
2222

2323
val z = y.let { it.size }
24-
// ^ definition snapshots/LambdasKt#z. z
25-
// ^ definition snapshots/LambdasKt#getZ(). z
24+
// ^ definition snapshots/LambdasKt#z. val z: kotlin.Int
25+
// ^ definition snapshots/LambdasKt#getZ(). val z: kotlin.Int
2626
// ^ reference snapshots/LambdasKt#y.
2727
// ^ reference snapshots/LambdasKt#getY().
2828
// ^^^ reference kotlin/StandardKt#let().

‎semanticdb-kotlinc/minimized/src/generatedSnapshots/resources/kotlin/snapshots/ObjectKt.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import java.lang.RuntimeException
77
// ^^^^^^^^^^^^^^^^ reference java/lang/RuntimeException#
88

99
object ObjectKt {
10-
// ^^^^^^^^ definition snapshots/ObjectKt# ObjectKt
10+
// ^^^^^^^^ definition snapshots/ObjectKt# object ObjectKt
1111
fun fail(message: String?): Nothing {
12-
// ^^^^ definition snapshots/ObjectKt#fail(). fail
13-
// ^^^^^^^ definition snapshots/ObjectKt#fail().(message) message
12+
// ^^^^ definition snapshots/ObjectKt#fail(). fun fail(message: kotlin.String?): kotlin.Nothing
13+
// ^^^^^^^ definition snapshots/ObjectKt#fail().(message) value-parameter message: kotlin.String?
1414
// ^^^^^^ reference kotlin/String#
1515
// ^^^^^^^ reference kotlin/Nothing#
1616
throw RuntimeException(message)

‎semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/AnalyzerTest.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,6 @@ sample/TestKt#docstrings().(msg)
623623
value-parameter msg: kotlin.String
624624
```
625625
""".trim()
626-
println(obtainedSymbols)
627626
assertEquals(expectedSymbols, obtainedSymbols)
628627
}
629628
}

0 commit comments

Comments
 (0)