diff options
author | Sandeep <sandeep@techaddict.me> | 2014-04-24 15:07:23 -0700 |
---|---|---|
committer | Reynold Xin <rxin@apache.org> | 2014-04-24 15:07:23 -0700 |
commit | a03ac222d84025a1036750e1179136a13f75dea7 (patch) | |
tree | cc7f041b35b7804b7d62520f279cc6e53e40d73c /repl/src/main | |
parent | c5c1916dd1b77e22759d58b5b361c56672983e3e (diff) | |
download | spark-a03ac222d84025a1036750e1179136a13f75dea7.tar.gz spark-a03ac222d84025a1036750e1179136a13f75dea7.tar.bz2 spark-a03ac222d84025a1036750e1179136a13f75dea7.zip |
Fix Scala Style
Any comments are welcome
Author: Sandeep <sandeep@techaddict.me>
Closes #531 from techaddict/stylefix-1 and squashes the following commits:
7492730 [Sandeep] Pass 4
98b2428 [Sandeep] fix rxin suggestions
b5e2e6f [Sandeep] Pass 3
05932d7 [Sandeep] fix if else styling 2
08690e5 [Sandeep] fix if else styling
Diffstat (limited to 'repl/src/main')
-rw-r--r-- | repl/src/main/scala/org/apache/spark/repl/SparkExprTyper.scala | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkExprTyper.scala b/repl/src/main/scala/org/apache/spark/repl/SparkExprTyper.scala index dcc139544e..f8432c8af6 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkExprTyper.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkExprTyper.scala @@ -47,9 +47,13 @@ trait SparkExprTyper extends Logging { var isIncomplete = false reporter.withIncompleteHandler((_, _) => isIncomplete = true) { val trees = codeParser.stmts(line) - if (reporter.hasErrors) Some(Nil) - else if (isIncomplete) None - else Some(trees) + if (reporter.hasErrors) { + Some(Nil) + } else if (isIncomplete) { + None + } else { + Some(trees) + } } } // def parsesAsExpr(line: String) = { @@ -70,8 +74,7 @@ trait SparkExprTyper extends Logging { val sym0 = symbolOfTerm(name) // drop NullaryMethodType val sym = sym0.cloneSymbol setInfo afterTyper(sym0.info.finalResultType) - if (sym.info.typeSymbol eq UnitClass) NoSymbol - else sym + if (sym.info.typeSymbol eq UnitClass) NoSymbol else sym case _ => NoSymbol } } |