Skip to content

Commit aee3230

Browse files
committed
backport: include inline when printing param names
1 parent 5e7ab15 commit aee3230

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

Diff for: presentation-compiler/src/main/dotty/tools/pc/printer/ShortenedTypePrinter.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,8 @@ class ShortenedTypePrinter(
527527
else if includeDefaultParam == ShortenedTypePrinter.IncludeDefaultParam.ResolveLater && isDefaultParam
528528
then " = ..."
529529
else "" // includeDefaultParam == Never or !isDefaultParam
530-
s"$keywordName: ${paramTypeString}$default"
530+
val inline = if(param.is(Flags.Inline)) "inline " else ""
531+
s"$inline$keywordName: ${paramTypeString}$default"
531532
end if
532533
end paramLabel
533534

Diff for: presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionArgSuite.scala

+6-6
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ class CompletionArgSuite extends BaseCompletionSuite:
796796
| def k: Int = m(1, a@@)
797797
|""".stripMargin,
798798
"""|aaa = : Int
799-
|assert(assertion: Boolean): Unit
799+
|assert(inline assertion: Boolean): Unit
800800
|""".stripMargin,
801801
topLines = Some(2),
802802
)
@@ -810,7 +810,7 @@ class CompletionArgSuite extends BaseCompletionSuite:
810810
| def k: Int = m(inn = 1, a@@)
811811
|""".stripMargin,
812812
"""|aaa = : Int
813-
|assert(assertion: Boolean): Unit
813+
|assert(inline assertion: Boolean): Unit
814814
|""".stripMargin,
815815
topLines = Some(2),
816816
)
@@ -912,7 +912,7 @@ class CompletionArgSuite extends BaseCompletionSuite:
912912
|""".stripMargin,
913913
"""|aaa = : Int
914914
|abb = : Option[Int]
915-
|assert(assertion: Boolean): Unit
915+
|assert(inline assertion: Boolean): Unit
916916
|""".stripMargin,
917917
topLines = Some(3),
918918
)
@@ -927,7 +927,7 @@ class CompletionArgSuite extends BaseCompletionSuite:
927927
|""".stripMargin,
928928
"""|aaa = : Int
929929
|abb = : Option[Int]
930-
|assert(assertion: Boolean): Unit
930+
|assert(inline assertion: Boolean): Unit
931931
|""".stripMargin,
932932
topLines = Some(3),
933933
)
@@ -945,7 +945,7 @@ class CompletionArgSuite extends BaseCompletionSuite:
945945
|""".stripMargin,
946946
"""|aaa = : Int
947947
|abb = : Option[Int]
948-
|assert(assertion: Boolean): Unit
948+
|assert(inline assertion: Boolean): Unit
949949
|""".stripMargin,
950950
topLines = Some(3),
951951
)
@@ -963,7 +963,7 @@ class CompletionArgSuite extends BaseCompletionSuite:
963963
|""".stripMargin,
964964
"""|abb = : Option[Int]
965965
|acc = : List[Int]
966-
|assert(assertion: Boolean): Unit
966+
|assert(inline assertion: Boolean): Unit
967967
|""".stripMargin,
968968
topLines = Some(3),
969969
)

Diff for: presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionCancelSuite.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ class CompletionCancelSuite extends BaseCompletionSuite:
9090
| val x = asser@@
9191
|}
9292
""".stripMargin,
93-
"""|assert(assertion: Boolean): Unit
94-
|assert(assertion: Boolean, message: => Any): Unit
93+
"""|assert(inline assertion: Boolean): Unit
94+
|assert(inline assertion: Boolean, inline message: => Any): Unit
9595
|""".stripMargin
9696
)
9797

0 commit comments

Comments
 (0)