Skip to content

Commit c4af1d2

Browse files
olafurpgolafurpg
committed
Use stable order for occurrences in the same range
1 parent 927cd0a commit c4af1d2

38 files changed

+875
-873
lines changed

‎scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ object ScipPrinters {
5959
val occurrences = occurrencesByLine
6060
.getOrElse(i, Nil)
6161
.toSeq
62-
.sortBy(o => o.getRangeList.asScala.toList.map(_.toInt))
62+
.sortBy(o =>
63+
(o.getRangeList.asScala.toList.map(_.toInt), o.getSymbol)
64+
)
6365
occurrences.foreach { occ =>
6466
formatOccurrence(input, out, occ, line, symtab, commentSyntax)
6567
if ((occ.getSymbolRoles & SymbolRole.Definition_VALUE) > 0) {

‎tests/snapshots/src/main/generated/BaseByteRenderer.scala‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
3333
// ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.
3434
// ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.Output#
3535
(out: T,
36-
// ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#out.
37-
// documentation ```scala\nprivate[this] val out: T\n```
3836
// ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(out)
3937
// documentation ```scala\nout: T \n```
38+
// ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#out.
39+
// documentation ```scala\nprivate[this] val out: T\n```
4040
// ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
4141
indent: Int = -1,
42-
// ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
43-
// documentation ```scala\nprivate[this] val indent: Int\n```
4442
// ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(indent)
4543
// documentation ```scala\ndefault indent: Int \n```
44+
// ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
45+
// documentation ```scala\nprivate[this] val indent: Int\n```
4646
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
4747
escapeUnicode: Boolean = false) extends JsVisitor[T, T]{
48-
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#escapeUnicode.
49-
// documentation ```scala\nprivate[this] val escapeUnicode: Boolean\n```
5048
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(escapeUnicode)
5149
// documentation ```scala\ndefault escapeUnicode: Boolean \n```
50+
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#escapeUnicode.
51+
// documentation ```scala\nprivate[this] val escapeUnicode: Boolean\n```
5252
// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
5353
// ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
5454
// ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
@@ -80,18 +80,18 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
8080
}
8181

8282
private[this] var depth: Int = 0
83-
// ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
84-
// documentation ```scala\nprivate[this] var depth: Int\n```
8583
// ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`depth_=`().
8684
// documentation ```scala\nprivate[this] var depth_=(x$1: Int): Unit\n```
85+
// ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
86+
// documentation ```scala\nprivate[this] var depth: Int\n```
8787
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
8888

8989

9090
private[this] var commaBuffered = false
91-
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
92-
// documentation ```scala\nprivate[this] var commaBuffered: Boolean\n```
9391
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`commaBuffered_=`().
9492
// documentation ```scala\nprivate[this] var commaBuffered_=(x$1: Boolean): Unit\n```
93+
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
94+
// documentation ```scala\nprivate[this] var commaBuffered: Boolean\n```
9595

9696
def flushBuffer() = {
9797
// ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().

‎tests/snapshots/src/main/generated/BaseCharRenderer.scala‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
3333
// ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.
3434
// ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.Output#
3535
(out: T,
36-
// ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#out.
37-
// documentation ```scala\nprivate[this] val out: T\n```
3836
// ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(out)
3937
// documentation ```scala\nout: T \n```
38+
// ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#out.
39+
// documentation ```scala\nprivate[this] val out: T\n```
4040
// ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
4141
indent: Int = -1,
42-
// ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
43-
// documentation ```scala\nprivate[this] val indent: Int\n```
4442
// ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(indent)
4543
// documentation ```scala\ndefault indent: Int \n```
44+
// ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
45+
// documentation ```scala\nprivate[this] val indent: Int\n```
4646
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
4747
escapeUnicode: Boolean = false) extends JsVisitor[T, T]{
48-
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#escapeUnicode.
49-
// documentation ```scala\nprivate[this] val escapeUnicode: Boolean\n```
5048
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(escapeUnicode)
5149
// documentation ```scala\ndefault escapeUnicode: Boolean \n```
50+
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#escapeUnicode.
51+
// documentation ```scala\nprivate[this] val escapeUnicode: Boolean\n```
5252
// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
5353
// ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
5454
// ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
@@ -80,18 +80,18 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
8080
}
8181

8282
private[this] var depth: Int = 0
83-
// ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
84-
// documentation ```scala\nprivate[this] var depth: Int\n```
8583
// ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`depth_=`().
8684
// documentation ```scala\nprivate[this] var depth_=(x$1: Int): Unit\n```
85+
// ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
86+
// documentation ```scala\nprivate[this] var depth: Int\n```
8787
// ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
8888

8989

9090
private[this] var commaBuffered = false
91-
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
92-
// documentation ```scala\nprivate[this] var commaBuffered: Boolean\n```
9391
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`commaBuffered_=`().
9492
// documentation ```scala\nprivate[this] var commaBuffered_=(x$1: Boolean): Unit\n```
93+
// ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
94+
// documentation ```scala\nprivate[this] var commaBuffered: Boolean\n```
9595

9696
def flushBuffer() = {
9797
// ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().

‎tests/snapshots/src/main/generated/ByteParser.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import java.io.StringWriter
88
import upickle.core.{Abort, AbortException, ObjArrVisitor, ObjVisitor, Visitor}
99
// ^^^^^^^ reference semanticdb maven . . upickle/
1010
// ^^^^ reference semanticdb maven . . upickle/core/
11-
// ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort.
1211
// ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort#
13-
// ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/AbortException.
12+
// ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort.
1413
// ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/AbortException#
14+
// ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/AbortException.
1515
// ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
1616
// ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
17-
// ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor.
1817
// ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
18+
// ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor.
1919
import java.nio.charset.Charset
2020
// ^^^^ reference semanticdb maven . . java/
2121
// ^^^ reference semanticdb maven . . java/nio/

‎tests/snapshots/src/main/generated/CharParser.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import java.io.StringWriter
88
import upickle.core.{Abort, AbortException, ObjArrVisitor, ObjVisitor, Visitor}
99
// ^^^^^^^ reference semanticdb maven . . upickle/
1010
// ^^^^ reference semanticdb maven . . upickle/core/
11-
// ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort.
1211
// ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort#
13-
// ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/AbortException.
12+
// ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort.
1413
// ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/AbortException#
14+
// ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/AbortException.
1515
// ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
1616
// ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
17-
// ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor.
1817
// ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
18+
// ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor.
1919
import java.nio.charset.Charset
2020
// ^^^^ reference semanticdb maven . . java/
2121
// ^^^ reference semanticdb maven . . java/nio/

0 commit comments

Comments
 (0)