From 7827682f41e679b3b1da2ab9377b975c8ac6b394 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 12 Oct 2014 10:44:09 -0500 Subject: [PATCH] Remove DefDef and check rhs - lhs pattern matching occurs only for vals. - def also breaks due to proc notation. - instead of pretty printing, we can just check rhs. --- main/src/main/scala/sbt/internals/parser/SbtParser.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/internals/parser/SbtParser.scala b/main/src/main/scala/sbt/internals/parser/SbtParser.scala index 6050d08be..583375f88 100644 --- a/main/src/main/scala/sbt/internals/parser/SbtParser.scala +++ b/main/src/main/scala/sbt/internals/parser/SbtParser.scala @@ -98,10 +98,9 @@ private[sbt] case class SbtParser(file: File, lines: Seq[String]) extends Parsed // Check No val (a,b) = foo *or* val a,b = foo as these are problematic to range positions and the WHOLE architecture. def isBadValDef(t: Tree): Boolean = t match { - case (x @ (toolbox.u.ValDef(_, _, _, _) | toolbox.u.DefDef(_, _, _, _, _, _))) => + case x @ toolbox.u.ValDef(_, _, _, rhs) if rhs != toolbox.u.EmptyTree => val content = modifiedContent.substring(x.pos.start, x.pos.end) - val prettyPrint = x.toString - (!(content contains "=") && (prettyPrint contains "=")) + !(content contains "=") case _ => false } parsedTrees.filter(isBadValDef).foreach { badTree =>