Skip to content
Snippets Groups Projects
Commit 6d9d8dd5 authored by Etienne Kneuss's avatar Etienne Kneuss
Browse files

Fix pretty-printer indenting and braces

parent 1506a713
No related branches found
No related tags found
No related merge requests found
...@@ -254,7 +254,7 @@ class PrettyPrinter(sb: StringBuffer = new StringBuffer) { ...@@ -254,7 +254,7 @@ class PrettyPrinter(sb: StringBuffer = new StringBuffer) {
pp(pat, p) pp(pat, p)
sb.append(" =>\n") sb.append(" =>\n")
ind(lvl+1) ind(lvl+1)
pp(rhs, p)(lvl+2) pp(rhs, p)(lvl+1)
case GuardedCase(pat, guard, rhs) => case GuardedCase(pat, guard, rhs) =>
sb.append("case ") sb.append("case ")
pp(pat, p) pp(pat, p)
...@@ -262,7 +262,7 @@ class PrettyPrinter(sb: StringBuffer = new StringBuffer) { ...@@ -262,7 +262,7 @@ class PrettyPrinter(sb: StringBuffer = new StringBuffer) {
pp(guard, p) pp(guard, p)
sb.append(" =>\n") sb.append(" =>\n")
ind(lvl+1) ind(lvl+1)
pp(rhs, p)(lvl+2) pp(rhs, p)(lvl+1)
// Patterns // Patterns
case CaseClassPattern(bndr, ccd, subps) => case CaseClassPattern(bndr, ccd, subps) =>
......
...@@ -393,7 +393,7 @@ class ScalaPrinter(sb: StringBuffer = new StringBuffer) extends PrettyPrinter(sb ...@@ -393,7 +393,7 @@ class ScalaPrinter(sb: StringBuffer = new StringBuffer) extends PrettyPrinter(sb
private def requiresBraces(ex: Tree, within: Option[Tree]): Boolean = (ex, within) match { private def requiresBraces(ex: Tree, within: Option[Tree]): Boolean = (ex, within) match {
case (_, None) => false case (_, None) => false
case (_, Some(_: Definition)) => false case (_, Some(_: Definition)) => false
case (_, Some(_: MatchExpr | _: Let | _: LetTuple | _: LetDef)) => false case (_, Some(_: MatchExpr | _: MatchCase | _: Let | _: LetTuple | _: LetDef)) => false
case (_, _) => true case (_, _) => true
} }
...@@ -411,7 +411,7 @@ class ScalaPrinter(sb: StringBuffer = new StringBuffer) extends PrettyPrinter(sb ...@@ -411,7 +411,7 @@ class ScalaPrinter(sb: StringBuffer = new StringBuffer) extends PrettyPrinter(sb
private def requiresParentheses(ex: Tree, within: Option[Tree]): Boolean = (ex, within) match { private def requiresParentheses(ex: Tree, within: Option[Tree]): Boolean = (ex, within) match {
case (_, None) => false case (_, None) => false
case (_, Some(_: Definition)) => false case (_, Some(_: Definition)) => false
case (_, Some(_: MatchExpr | _: Let | _: LetTuple | _: LetDef | _: IfExpr)) => false case (_, Some(_: MatchExpr | _: MatchCase | _: Let | _: LetTuple | _: LetDef | _: IfExpr)) => false
case (_, Some(_: FunctionInvocation)) => false case (_, Some(_: FunctionInvocation)) => false
case (ie: IfExpr, _) => true case (ie: IfExpr, _) => true
case (e1: Expr, Some(e2: Expr)) if precedence(e1) > precedence(e2) => false case (e1: Expr, Some(e2: Expr)) if precedence(e1) > precedence(e2) => false
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment