Skip to content

Ignore ending $ when looking at end marker names #22798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 19, 2025
Merged

Ignore ending $ when looking at end marker names #22798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a50e89b
Add a test for renaming local objects
natsukagami Mar 13, 2025
7f10cf2
Drop ending `$` marker when looking for end marker names
natsukagami Mar 13, 2025
e2a708c
Add test for semantic highlighting `end` marker of local object
natsukagami Mar 13, 2025
2f9c53b
Update structural-types semantics token test
natsukagami Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion presentation-compiler/src/main/dotty/tools/pc/PcCollector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ object EndMarker:
def getPosition(df: NamedDefTree, pos: SourcePosition, sourceText: String)(
implicit ct: Context
): Option[SourcePosition] =
val name = df.name.toString()
val name = df.name.toString().stripSuffix("$")
val endMarkerLine =
sourceText.slice(df.span.start, df.span.end).split('\n').last
val index = endMarkerLine.length() - name.length()
Expand Down
11 changes: 11 additions & 0 deletions presentation-compiler/test/dotty/tools/pc/tests/edit/PcRenameSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,3 +534,14 @@ class PcRenameSuite extends BasePcRenameSuite:
|""".stripMargin,
wrap = false
)

@Test def `local-object-with-end-rename` =
check(
"""|def bar =
| object <<fo@@o>>:
| def aaa = ???
| end <<foo>>
| 1
|""".stripMargin,
wrap = false
)
13 changes: 11 additions & 2 deletions presentation-compiler/test/dotty/tools/pc/tests/tokens/SemanticTokensSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite:
| } = new:
| def <<scalameta>>/*method,definition*/ = "4.0"
| <<V>>/*variable,readonly*/.<<scalameta>>/*method*/
|end StructuralTypes
|end <<StructuralTypes>>/*class,definition*/
|""".stripMargin
)

Expand Down Expand Up @@ -435,4 +435,13 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite:
| <<usage>>/*method*/[<<Option>>/*class,abstract*/[<<Int>>/*class,abstract*/]](<<_>>/*parameter,readonly*/.<<typeArg>>/*method*/[<<Some>>/*class*/[<<Int>>/*class,abstract*/]].<<value>>/*variable,readonly*/.<<inferredTypeArg>>/*method*/[<<String>>/*type*/]("str"))
|}
|""".stripMargin
)
)

@Test def `local-object-with-end-i7246` =
check(
"""|def <<bar>>/*method,definition*/ =
| object <<foo>>/*class*/:
| def <<aaa>>/*method,definition*/ = <<???>>/*method*/
| end <<foo>>/*class,definition*/
|""".stripMargin
)