8000 SI-4700 Types with symbolic names print in infix by default · Pull Request #5589 · scala/scala · GitHub
[go: up one dir, main page]
Skip to content

SI-4700 Types with symbolic names print in infix by default #5589

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 &l 8000 dquo;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 3 commits into from Feb 16, 2017
Merged

SI-4700 Types with symbolic names print in infix by default #5589

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e60768b
SI-4700 Add `@infix` annotation for type printing
VladUreche Sep 14, 2016
8badcad
SI-4700 Show infix types with as few parentheses as needed.
Dec 8, 2016
fab1db5
SI-4700 Make infix notation default for symbolic types.
Dec 8, 2016
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
Prev Previous commit
Next Next commit
SI-4700 Show infix types with as few parentheses as needed.
  • Loading branch information
allisonhb committed Dec 14, 2016
commit 8badcadbe51f4a02e495f462f5f2666a24d79cb0
30 changes: 21 additions & 9 deletions src/reflect/scala/reflect/internal/Types.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2101,7 +2101,9 @@ trait Types
toBoolean(trivial)
}

override def isShowAsInfixType: Boolean = sym.hasAnnotation(ShowAsInfixAnnotationClass)
/* It only makes sense to show 2-ary type constructors infix. */
override def isShowAsInfixType: Boolean =
sym.hasAnnotation(ShowAsInfixAnnotationClass) && hasLength(args, 2)

private[Types] def invalidateTypeRefCaches(): Unit = {
parentsCache = null
Expand Down Expand Up @@ -2328,6 +2330,22 @@ trait Types
case arg :: Nil => s"($arg,)"
case _ => args.mkString("(", ", ", ")")
}
private def infixTypeString: String = {
/* SLS 3.2.8: all infix types have the same precedence.
* In A op B op' C, op and op' need the same associativity.
* Therefore, if op is left associative, anything on its right
* needs to be parenthesized if it's an infix type, and vice versa. */
// we should only get here after `isShowInfixType` says we have 2 args
val l :: r :: Nil = args

val isRightAssoc = typeSymbol.decodedName endsWith ":"

val lstr = if (isRightAssoc && l.isShowAsInfixType) s"($l)" else l.toString

val rstr = if (!isRightAssoc && r.isShowAsInfixType) s"($r)" else r.toString

s"$lstr ${sym.decodedName} $rstr"
}
private def customToString = sym match {
case RepeatedParamClass | JavaRepeatedParamClass => args.head + "*"
case ByNameParamClass => "=> " + args.head
Expand All @@ -2351,14 +2369,8 @@ trait Types
xs.init.mkString("(", ", ", ")") + " => " + xs.last
}
}
else if (isShowAsInfixType && args.length == 2)
args(0) + " " + sym.decodedName + " " +
(
if (args(1).isShowAsInfixType)
"(" + args(1) + ")"
else
args(1)
)
else if (isShowAsInfixType)
infixTypeString
else if (isTupleTypeDirect(this))
tupleTypeString
else if (sym.isAliasType && prefixChain.exists(_.termSymbol.isSynthetic) && (this ne dealias))
Expand Down
15 changes: 15 additions & 0 deletions test/files/run/t4700.check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,19 @@ defined type alias Mappy
scala> def foo: Int Mappy (Boolean && String) = ???
foo: Int Mappy (Boolean && String)

scala> @showAsInfix class &:[L, R]
defined class $amp$colon

scala> def foo: Int &: String = ???
foo: Int &: String

scala> def foo: Int &: Boolean &: String = ???
foo: Int &: Boolean &: String

scala> def foo: (Int || String) &: Boolean = ???
foo: (Int || String) &: Boolean

scala> def foo: Int || (Boolean &: String) = ???
foo: Int || (Boolean &: String)

scala> :quit
5 changes: 5 additions & 0 deletions test/files/run/t4700.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ object Test extends ReplTest {
|def foo: Int && (Boolean && String) = ???
|@showAsInfix type Mappy[T, U] = Map[T, U]
|def foo: Int Mappy (Boolean && String) = ???
|@showAsInfix class &:[L, R]
|def foo: Int &: String = ???
|def foo: Int &: Boolean &: String = ???
|def foo: (Int || String) &: Boolean = ???
|def foo: Int || (Boolean &: String) = ???
|""".stripMargin
}

0