Skip to content

Commit 5ddba9d

Browse files
committed
Added scalastyle:on/off for the specific rule
1 parent 1de98a6 commit 5ddba9d

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

scalastyle-config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ This file is divided into 3 sections:
218218
<check level="error" class="org.scalastyle.scalariform.EqualsHashCodeChecker" enabled="false"></check>
219219

220220
<!-- Should turn this on, but we have a few places that need to be fixed first -->
221-
<check level="warning" class="org.scalastyle.scalariform.DisallowSpaceBeforeTokenChecker" enabled="true">
221+
<check customId="whitespacebeforetoken" level="warning" class="org.scalastyle.scalariform.DisallowSpaceBeforeTokenChecker" enabled="true">
222222
<parameters>
223223
<parameter name="tokens">COLON, COMMA</parameter>
224224
</parameters>

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ package object dsl {
6161
trait ImplicitOperators {
6262
def expr: Expression
6363

64-
// scalastyle:off
64+
// scalastyle:off whitespacebeforetoken
6565
def unary_- : Expression = UnaryMinus(expr)
6666
def unary_! : Predicate = Not(expr)
6767
def unary_~ : Expression = BitwiseNot(expr)
68-
// scalastyle:on
68+
// scalastyle:on whitespacebeforetoken
6969

7070
def + (other: Expression): Expression = Add(expr, other)
7171
def - (other: Expression): Expression = Subtract(expr, other)

sql/catalyst/src/main/scala/org/apache/spark/sql/types/Decimal.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,15 +310,15 @@ final class Decimal extends Ordered[Decimal] with Serializable {
310310

311311
def remainder(that: Decimal): Decimal = this % that
312312

313-
// scalastyle:off
313+
// scalastyle:off whitespacebeforetoken
314314
def unary_- : Decimal = {
315315
if (decimalVal.ne(null)) {
316316
Decimal(-decimalVal, precision, scale)
317317
} else {
318318
Decimal(-longVal, precision, scale)
319319
}
320320
}
321-
// scalastyle:on
321+
// scalastyle:on whitespacebeforetoken
322322

323323
def abs: Decimal = if (this.compare(Decimal.ZERO) < 0) this.unary_- else this
324324

sql/core/src/main/scala/org/apache/spark/sql/Column.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class Column(protected[sql] val expr: Expression) extends Logging {
171171
UnresolvedExtractValue(expr, lit(extraction).expr)
172172
}
173173

174-
// scalastyle:off
174+
// scalastyle:off whitespacebeforetoken
175175
/**
176176
* Unary minus, i.e. negate the expression.
177177
* {{{
@@ -203,7 +203,7 @@ class Column(protected[sql] val expr: Expression) extends Logging {
203203
* @since 1.3.0
204204
*/
205205
def unary_! : Column = withExpr { Not(expr) }
206-
// scalastyle:on
206+
// scalastyle:on whitespacebeforetoken
207207

208208
/**
209209
* Equality test.

sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ class SQLContext private[sql](
945945
}
946946
}
947947

948-
// Register a succesfully instantiatd context to the singleton. This should be at the end of
948+
// Register a successfully instantiated context to the singleton. This should be at the end of
949949
// the class definition so that the singleton is updated only if there is no exception in the
950950
// construction of the instance.
951951
sparkContext.addSparkListener(new SparkListener {

0 commit comments

Comments
 (0)