rebase with master

kiszk · kiszk · commit a489938b3f12 · 2017-10-04T19:31:52.000+01:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeFormatter.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeFormatter.scala
@@ -89,6 +89,14 @@ object CodeFormatter {
     }
     new CodeAndComment(code.result().trim(), map)
   }
+
+  def stripExtraNewLinesAndComments(input: String): String = {
+    val commentReg =
+      ("""([ |\t]*?\/\*[\s|\S]*?\*\/[ |\t]*?)|""" +    // strip /*comment*/
+       """([ |\t]*?\/\/[\s\S]*?\n)""").r               // strip //comment
+    val codeWithoutComment = commentReg.replaceAllIn(input, "")
+    codeWithoutComment.replaceAll("""\n\s*\n""", "\n") // strip ExtraNewLines
+  }
 }
 
 private class CodeFormatter {

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,14 @@ object CodeFormatter {`
`89`	`89`	`}`
`90`	`90`	`new CodeAndComment(code.result().trim(), map)`
`91`	`91`	`}`
	`92`	`+`
	`93`	`+ def stripExtraNewLinesAndComments(input: String): String = {`
	`94`	`+ val commentReg =`
	`95`	`+ ("""([ \|\t]?\/\[\s\|\S]?\\/[ \|\t]?)\|""" + // strip /comment*/`
	`96`	`+ """([ \|\t]?\/\/[\s\S]?\n)""").r // strip //comment`
	`97`	`+ val codeWithoutComment = commentReg.replaceAllIn(input, "")`
	`98`	`+ codeWithoutComment.replaceAll("""\n\s*\n""", "\n") // strip ExtraNewLines`
	`99`	`+ }`
`92`	`100`	`}`
`93`	`101`
`94`	`102`	`private class CodeFormatter {`