Skip to content
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

Jump to bottom

bugfix: Completions for extension methods with name conflict #19225

Merged
merged 1 commit into from
Dec 8, 2023
Merged

bugfix: Completions for extension methods with name conflict #19225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions presentation-compiler/src/main/dotty/tools/pc/completions/CompletionProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,10 @@ class CompletionProvider(
mkItem(
"{" + sym.fullNameBackticked + completionTextSuffix + "}"
)
case _ if v.isExtensionMethod =>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can just write v.isInstanceOf[Extension] without adding new fields

mkItem(
ident.backticked(backtickSoftKeyword) + completionTextSuffix
)
case _ =>
mkItem(
sym.fullNameBackticked(
Expand Down
2 changes: 2 additions & 0 deletions presentation-compiler/src/main/dotty/tools/pc/completions/CompletionValue.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ object CompletionValue:
def symbol: Symbol
def isFromWorkspace: Boolean = false
override def completionItemDataKind = CompletionItemData.None
def isExtensionMethod: Boolean = false

override def completionData(
buildTargetIdentifier: String
Expand Down Expand Up @@ -153,6 +154,7 @@ object CompletionValue:
override def completionItemKind(using Context): CompletionItemKind =
CompletionItemKind.Method
override def completionItemDataKind: Integer = CompletionSource.ExtensionKind.ordinal
override def isExtensionMethod: Boolean = true
override def description(printer: ShortenedTypePrinter)(using Context): String =
s"${printer.completionSymbol(symbol)} (extension)"

Expand Down
32 changes: 32 additions & 0 deletions presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionExtensionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,35 @@ class CompletionExtensionSuite extends BaseCompletionSuite:
|increment2: Int (extension)
|""".stripMargin
)

@Test def `name-conflict` =
checkEdit(
"""
|package example
|
|import example.enrichments.*
|
|object enrichments:
| extension (num: Int)
| def plus(other: Int): Int = num + other
|
|def main = {
| val plus = 100.plus(19)
| val y = 19.pl@@
|}
|""".stripMargin,
"""
|package example
|
|import example.enrichments.*
|
|object enrichments:
| extension (num: Int)
| def plus(other: Int): Int = num + other
|
|def main = {
| val plus = 100.plus(19)
| val y = 19.plus($0)
|}
|""".stripMargin
)
24 changes: 24 additions & 0 deletions presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionWorkspaceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,3 +825,27 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite:
|MyType - demo.other""".stripMargin,
)

@Test def `method-name-conflict` =
checkEdit(
"""|package demo
|
|object O {
| def mmmm(x: Int) = x + 3
| class Test {
| val mmmm = "abc"
| val foo = mmmm@@
| }
|}
|""".stripMargin,
"""|package demo
|
|object O {
| def mmmm(x: Int) = x + 3
| class Test {
| val mmmm = "abc"
| val foo = demo.O.mmmm($0)
| }
|}
|""".stripMargin,
filter = _.contains("mmmm(x: Int)")
)
Loading