Skip to content
Snippets Groups Projects
Commit 044583a2 authored by prudhvi's avatar prudhvi Committed by Patrick Wendell
Browse files

[Core] Upgrading ScalaStyle version to 0.5 and removing SparkSpaceAfterCommentStartChecker.

Author: prudhvi <prudhvi953@gmail.com>

Closes #2799 from prudhvije/ScalaStyle/space-after-comment-start and squashes the following commits:

fc263a1 [prudhvi] [Core] Using scalastyle to check the space after comment start
parent 293a0b5d
No related branches found
No related tags found
No related merge requests found
......@@ -17,7 +17,7 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.4.0")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.5.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")
......
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.spark.scalastyle
import java.util.regex.Pattern
import org.scalastyle.{PositionError, ScalariformChecker, ScalastyleError}
import scalariform.lexer.{MultiLineComment, ScalaDocComment, SingleLineComment, Token}
import scalariform.parser.CompilationUnit
class SparkSpaceAfterCommentStartChecker extends ScalariformChecker {
val errorKey: String = "insert.a.single.space.after.comment.start.and.before.end"
private def multiLineCommentRegex(comment: Token) =
Pattern.compile( """/\*\S+.*""", Pattern.DOTALL).matcher(comment.text.trim).matches() ||
Pattern.compile( """/\*.*\S\*/""", Pattern.DOTALL).matcher(comment.text.trim).matches()
private def scalaDocPatternRegex(comment: Token) =
Pattern.compile( """/\*\*\S+.*""", Pattern.DOTALL).matcher(comment.text.trim).matches() ||
Pattern.compile( """/\*\*.*\S\*/""", Pattern.DOTALL).matcher(comment.text.trim).matches()
private def singleLineCommentRegex(comment: Token): Boolean =
comment.text.trim.matches( """//\S+.*""") && !comment.text.trim.matches( """///+""")
override def verify(ast: CompilationUnit): List[ScalastyleError] = {
ast.tokens
.filter(hasComment)
.map {
_.associatedWhitespaceAndComments.comments.map {
case x: SingleLineComment if singleLineCommentRegex(x.token) => Some(x.token.offset)
case x: MultiLineComment if multiLineCommentRegex(x.token) => Some(x.token.offset)
case x: ScalaDocComment if scalaDocPatternRegex(x.token) => Some(x.token.offset)
case _ => None
}.flatten
}.flatten.map(PositionError(_))
}
private def hasComment(x: Token) =
x.associatedWhitespaceAndComments != null && !x.associatedWhitespaceAndComments.comments.isEmpty
}
......@@ -141,5 +141,5 @@
<check level="error" class="org.scalastyle.file.NewLineAtEofChecker" enabled="true"></check>
<check level="error" class="org.scalastyle.file.NoNewLineAtEofChecker" enabled="false"></check>
<check level="error" class="org.apache.spark.scalastyle.NonASCIICharacterChecker" enabled="true"></check>
<check level="error" class="org.apache.spark.scalastyle.SparkSpaceAfterCommentStartChecker" enabled="true"></check>
<check level="error" class="org.scalastyle.scalariform.SpaceAfterCommentStartChecker" enabled="true"></check>
</scalastyle>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment