Github user sarutak commented on a diff in the pull request:
https://github.com/apache/spark/pull/13273#discussion_r64470756
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeFormatter.scala
---
@@ -17,22 +17,24 @@
package org.apache.spark.sql.catalyst.expressions.codegen
-import org.apache.commons.lang3.StringUtils
-
/**
* An utility class that indents a block of code based on the curly braces
and parentheses.
* This is used to prettify generated code when in debug mode (or
exceptions).
*
* Written by Matei Zaharia.
*/
object CodeFormatter {
+ val commentHolder = """\/\*(.+?)\*\/""".r
+
def format(code: CodeAndComment): String = {
- new CodeFormatter().addLines(
- StringUtils.replaceEach(
- code.body,
- code.comment.keys.toArray,
- code.comment.values.toArray)
- ).result
+ val formatter = new CodeFormatter
+ code.body.split("\n").foreach { line =>
+ val comment = commentHolder.replaceAllIn(
+ line.trim,
+ m => code.comment.getOrElse(m.group(1), m.group(0)))
+ formatter.addLine(comment)
+ }
+ formatter.result()
--- End diff --
Thanks, SGTM!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
