Skip to content

Commit 4ae44d6

Browse files
committed
use package name for pkg object namespan
1 parent 2f87059 commit 4ae44d6

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

compiler/src/dotty/tools/dotc/ast/Trees.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,8 @@ object Trees {
376376
val point = span.point
377377
if (rawMods.is(Synthetic) || span.isSynthetic || name.toTermName == nme.ERROR) Span(point)
378378
else {
379-
val realName = name.stripModuleClassSuffix.lastPart
379+
val srcName = if symbol.isPackageObject then symbol.owner.name else name
380+
val realName = srcName.stripModuleClassSuffix.lastPart
380381
Span(point, point + realName.length, point)
381382
}
382383
}

tests/semanticdb/expect/EndMarkers2.expect.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package object endmark/*<-endmarkers2::package.*/ers2:
1+
package object endmarkers2/*<-endmarkers2::package.*/:
22

33
type Foo/*<-endmarkers2::package.Foo#*/ =
44
Unit/*->scala::Unit#*/

tests/semanticdb/expect/semanticdb-Flags.expect.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package flags
22

33
import scala.language/*->scala::language.*/.experimental/*->scala::language.experimental.*/.macros/*->scala::language.experimental.macros.*/
44

5-
package object p {
6-
p/*<-flags::p::package.*/rivate lazy val x/*<-flags::p::package.x.*/ = 1
5+
package object p/*<-flags::p::package.*/ {
6+
private lazy val x/*<-flags::p::package.x.*/ = 1
77
protected implicit var y/*<-flags::p::package.y().*/: Int/*->scala::Int#*/ = 2
88
def z/*<-flags::p::package.z().*/(pp/*<-flags::p::package.z().(pp)*/: Int/*->scala::Int#*/) = 3
99
def m/*<-flags::p::package.m().*/[TT/*<-flags::p::package.m().[TT]*/]: Int/*->scala::Int#*/ = macro ???/*->scala::Predef.`???`().*/

tests/semanticdb/metac.expect

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ endmarkers2/package. => final package object endmarkers2
756756
endmarkers2/package.Foo# => type Foo
757757

758758
Occurrences:
759-
[0:15..0:22): endmark <- endmarkers2/package.
759+
[0:15..0:26): endmarkers2 <- endmarkers2/package.
760760
[2:7..2:10): Foo <- endmarkers2/package.Foo#
761761
[3:4..3:8): Unit -> scala/Unit#
762762
[4:6..4:9): Foo -> endmarkers2/package.Foo#
@@ -3833,7 +3833,7 @@ Occurrences:
38333833
[2:13..2:21): language -> scala/language.
38343834
[2:22..2:34): experimental -> scala/language.experimental.
38353835
[2:35..2:41): macros -> scala/language.experimental.macros.
3836-
[4:15..5:3): <- flags/p/package.
3836+
[4:15..4:16): p <- flags/p/package.
38373837
[5:2..5:3): p -> flags/p/
38383838
[5:19..5:20): x <- flags/p/package.x.
38393839
[6:25..6:26): y <- flags/p/package.y().

0 commit comments

Comments
 (0)