Commit 17f1803

authored

pc: completions - do not add [] for ... derives TC@@ (#23811)

Currently it incorectly adds completion members with square brackets. Exmaple: ```scala class X derives CanEqua@@ // returns `CanEqual[@@]` and `CanEqual` // should return only `CanEqual` ```

1 parent a431d3a commit 17f1803Copy full SHA for 17f1803

File tree

2 files changed

+17

-1

lines changed

presentation-compiler
- src/main/dotty/tools/pc/completions
  - Completions.scala
- test/dotty/tools/pc/tests/completion
  - CompletionSuite.scala

2 files changed

+17

-1

lines changed

`‎presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala‎`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,15 @@ class Completions(`
`74`	`74`	`case tpe :: (appl: AppliedTypeTree) :: _ if appl.tpt == tpe => false`
`75`	`75`	`case sel :: (funSel @ Select(fun, name)) :: (appl: GenericApply) :: _`
`76`	`76`	`if appl.fun == funSel && sel == fun => false`
`77`		`- case _ => true)`
	`77`	`+ case _ => true) &&`
	`78`	`+ (adjustedPath match`
	`79`	+ /* In case of `class X derives TC@@` we shouldn't add `[]`
	`80`	`+ */`
	`81`	`+ case Ident(_) :: (templ: untpd.DerivingTemplate) :: _ =>`
	`82`	`+ val pos = completionPos.toSourcePosition`
	`83`	`+ !templ.derived.exists(_.sourcePos.contains(pos))`
	`84`	`+ case _ => true`
	`85`	`+ )`
`78`	`86`
`79`	`87`	`private lazy val isNew: Boolean = Completion.isInNewContext(adjustedPath)`
`80`	`88`

`‎presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala‎`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2285,3 +2285,11 @@ class CompletionSuite extends BaseCompletionSuite:`
`2285`	`2285`	`\|""".stripMargin,`
`2286`	`2286`	`"asTerm: Term"`
`2287`	`2287`	`)`
	`2288`	`+`
	`2289`	+ @Test def `derives-no-square-brackets` =
	`2290`	`+ check(`
	`2291`	`+ """`
	`2292`	`+ \|case class Miau(y: Int) derives Ordering, CanEqu@@`
	`2293`	`+ \|""".stripMargin,`
	`2294`	`+ "CanEqual scala"`
	`2295`	`+ )`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 17f1803

File tree

2 files changed

2 files changed

`‎presentation-compiler/src/main/dotty/tools/pc/completions/Completions.scala‎`

`‎presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala‎`

0 commit comments