Skip to content

Commit 2af6c1e

Browse files
matthewfarwellmatthewfarwell
committed
Fixed scalastyle problems, optimized imports, removed semi colons, intellij inspections
1 parent 8c588ca commit 2af6c1e

File tree

110 files changed

+685
-856
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+685
-856
lines changed

‎src/main/scala/org/scalastyle/Checker.scala

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,19 @@
1616

1717
package org.scalastyle
1818

19-
import _root_.scalariform.parser.CompilationUnit
19+
import java.nio.charset.MalformedInputException
20+
21+
import _root_.scalariform.lexer.Comment
2022
import _root_.scalariform.lexer.HiddenToken
2123
import _root_.scalariform.lexer.ScalaLexer
22-
import _root_.scalariform.lexer.Comment
23-
import _root_.scalariform.parser.ScalaParser
2424
import _root_.scalariform.lexer.Token
25-
import scala.io.Source
26-
import java.nio.charset.MalformedInputException
27-
import scala.io.Codec
28-
import scala.collection.JavaConversions.seqAsJavaList
29-
import scala.collection.JavaConversions.collectionAsScalaIterable
25+
import _root_.scalariform.parser.CompilationUnit
26+
import _root_.scalariform.parser.ScalaParser
3027
import scala.annotation.tailrec
28+
import scala.collection.JavaConversions.collectionAsScalaIterable
29+
import scala.collection.JavaConversions.seqAsJavaList
30+
import scala.io.Codec
31+
import scala.io.Source
3132

3233
case class Line(text: String, start: Int, end: Int)
3334

@@ -197,14 +198,14 @@ class CheckerUtils(classLoader: Option[ClassLoader] = None) {
197198
}
198199

199200
trait Checker[A] {
200-
protected val errorKey: String;
201-
var parameters = Map[String, String]();
202-
var level: Level = WarningLevel;
201+
protected val errorKey: String
202+
var parameters = Map[String, String]()
203+
var level: Level = WarningLevel
203204
var customMessage: Option[String] = None
204205
var customErrorKey: Option[String] = None
205206

206-
def setParameters(parameters: Map[String, String]): Unit = this.parameters = parameters;
207-
def setLevel(level: Level): Unit = this.level = level;
207+
def setParameters(parameters: Map[String, String]): Unit = this.parameters = parameters
208+
def setLevel(level: Level): Unit = this.level = level
208209
def setCustomErrorKey(customErrorKey: Option[String]): Unit = this.customErrorKey = customErrorKey
209210
def setCustomMessage(customMessage: Option[String]): Unit = this.customMessage = customMessage
210211
protected def getInt(parameter: String, defaultValue: Int): Int = Integer.parseInt(parameters.getOrElse(parameter, "" + defaultValue))

‎src/main/scala/org/scalastyle/Directory.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ package org.scalastyle
1818

1919
import java.io.File
2020
import java.io.FileFilter
21-
import scala.collection.JavaConversions.seqAsJavaList
21+
2222
import scala.collection.JavaConversions.collectionAsScalaIterable
23+
import scala.collection.JavaConversions.seqAsJavaList
2324

2425
class Directory
2526

‎src/main/scala/org/scalastyle/Main.scala

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
package org.scalastyle
1818

1919
import java.io.File
20+
import java.net.URLClassLoader
2021
import java.util.Date
21-
import scala.io.Codec
22+
2223
import com.typesafe.config.ConfigFactory
23-
import java.net.URLClassLoader
24-
import java.net.URL
24+
25+
import scala.io.Codec
2526

2627
case class MainConfig(error: Boolean,
2728
config: Option[String] = None,
@@ -80,7 +81,7 @@ object Main {
8081
}
8182
}
8283

83-
if (!config.config.isDefined || config.directories.isEmpty) {
84+
if (config.config.isEmpty || config.directories.isEmpty) {
8485
config = config.copy(error = true)
8586
}
8687

@@ -103,16 +104,17 @@ object Main {
103104
System.exit(exitVal)
104105
}
105106

106-
private[this] def now(): Long = new Date().getTime()
107+
private[this] def now(): Long = new Date().getTime
107108

108109
private[this] def execute(mc: MainConfig)(implicit codec: Codec): Boolean = {
109110
val start = now()
110111
val configuration = ScalastyleConfiguration.readFromXml(mc.config.get)
111-
val cl = mc.externalJar.flatMap(j => Some(new URLClassLoader(Array(new java.io.File(j).toURI().toURL()))))
112-
val messages = new ScalastyleChecker(cl).checkFiles(configuration, Directory.getFiles(mc.inputEncoding, mc.directories.map(new File(_)).toSeq, excludedFiles=mc.excludedFiles))
112+
val cl = mc.externalJar.flatMap(j => Some(new URLClassLoader(Array(new java.io.File(j).toURI.toURL))))
113+
val files = Directory.getFiles(mc.inputEncoding, mc.directories.map(new File(_)), excludedFiles = mc.excludedFiles)
114+
val messages = new ScalastyleChecker(cl).checkFiles(configuration, files)
113115

114116
// scalastyle:off regex
115-
val config = ConfigFactory.load(cl.getOrElse(this.getClass().getClassLoader()))
117+
val config = ConfigFactory.load(cl.getOrElse(this.getClass.getClassLoader))
116118
val outputResult = new TextOutput(config, mc.verbose, mc.quiet).output(messages)
117119
mc.xmlFile match {
118120
case Some(x) => {

‎src/main/scala/org/scalastyle/Message.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.scalastyle
1818

1919
import java.text.MessageFormat
20+
2021
import com.typesafe.config.Config
21-
import java.io.FileWriter
2222

2323
trait FileSpec {
2424
def name: String

‎src/main/scala/org/scalastyle/Output.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
package org.scalastyle
1818

19-
import scala.xml.Elem
20-
import scala.collection.JavaConversions.collectionAsScalaIterable
21-
import com.typesafe.config.ConfigFactory
2219
import com.typesafe.config.Config
2320

21+
import scala.collection.JavaConversions.collectionAsScalaIterable
22+
import scala.xml.Elem
23+
2424
object Output {
2525
def findMessage(messageHelper: MessageHelper, key: String, args: List[String], customMessage: Option[String]): String = {
2626
customMessage match {
@@ -63,7 +63,7 @@ trait Output[T <: FileSpec] {
6363
def message(m: Message[T]): Unit
6464
}
6565

66-
case class OutputResult(val files: Int, val errors: Int, val warnings: Int, val infos: Int)
66+
case class OutputResult(files: Int, errors: Int, warnings: Int, infos: Int)
6767

6868
class TextOutput[T <: FileSpec](config: Config, verbose: Boolean = false, quiet: Boolean = false) extends Output[T] {
6969
private val messageHelper = new MessageHelper(config)
@@ -113,9 +113,9 @@ object XmlOutput {
113113
}
114114

115115
private def printToFile(f: java.io.File, encoding: String)(op: java.io.PrintWriter => Unit): Unit = {
116-
val parent = f.getParentFile();
116+
val parent = f.getParentFile
117117
if (!parent.exists() && !parent.mkdirs()) {
118-
throw new IllegalStateException("Couldn't create dir: " + parent);
118+
throw new IllegalStateException("Couldn't create dir: " + parent)
119119
}
120120

121121
val p = new java.io.PrintWriter(f, encoding)
@@ -143,9 +143,9 @@ object XmlOutput {
143143
case (filename, alerts) =>
144144
<file name={filename}>
145145
{alerts.map {
146-
case Alert(filename, severity, message, source, line, column) => {
146+
case Alert(fn, severity, message, source, line, column) => {
147147
val s = source.collect {
148-
case x: Class[_] => x.getName()
148+
case x: Class[_] => x.getName
149149
}
150150
<error severity={severity} message={message}/> % attr("source", s) % attr("line", line) % attr("column", column)
151151
}

‎src/main/scala/org/scalastyle/PrintAst.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
// limitations under the License.
1616

1717
package org.scalastyle
18-
import _root_.scalariform.parser.CompilationUnit
1918
import _root_.scalariform.lexer.Token
19+
import _root_.scalariform.parser.CompilationUnit
2020

2121
// scalastyle:off regex
2222

‎src/main/scala/org/scalastyle/ScalastyleConfiguration.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717
package org.scalastyle
1818

1919
import scala.Option.option2Iterable
20-
import scala.xml.NodeSeq.seqToNodeSeq
2120
import scala.xml.Atom
21+
import scala.xml.Attribute
2222
import scala.xml.Comment
2323
import scala.xml.Elem
2424
import scala.xml.EntityRef
2525
import scala.xml.Group
26+
import scala.xml.MinimizeMode
2627
import scala.xml.NamespaceBinding
2728
import scala.xml.Node
29+
import scala.xml.NodeSeq.seqToNodeSeq
2830
import scala.xml.PrettyPrinter
2931
import scala.xml.ProcInstr
3032
import scala.xml.Text
3133
import scala.xml.TextBuffer
3234
import scala.xml.Utility
3335
import scala.xml.XML
34-
import scala.xml.Attribute
35-
import scala.xml.MinimizeMode
3636

3737
object Level {
3838
val Warning = "warning"

‎src/main/scala/org/scalastyle/file/FileLineLengthChecker.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
1616

1717
package org.scalastyle.file
1818

19-
import scala.Array.canBuildFrom
20-
2119
import org.scalastyle.FileChecker
22-
import org.scalastyle.LineError
2320
import org.scalastyle.Lines
2421
import org.scalastyle.ScalastyleError
2522

23+
import scala.Array.canBuildFrom
24+
2625
class FileLineLengthChecker extends FileChecker {
2726
val DefaultMaxLineLength = 160
2827
val DefaultTabSize = 4
@@ -35,8 +34,8 @@ class FileLineLengthChecker extends FileChecker {
3534

3635
val importPattern = """^\s*import""".r
3736
val errors = for {
38-
line <- NormalizedLine.normalize(lines, tabSize);
39-
if (line.length > maxLineLength && !(ignoreImports && importPattern.findFirstIn(line.body).isDefined))
37+
line <- NormalizedLine.normalize(lines, tabSize)
38+
if line.length > maxLineLength && !(ignoreImports && importPattern.findFirstIn(line.body).isDefined)
4039
} yield {
4140
line.mkError(List("" + maxLineLength))
4241
}

‎src/main/scala/org/scalastyle/file/FileTabChecker.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
package org.scalastyle.file
1818

19-
import scala.Array.canBuildFrom
20-
2119
import org.scalastyle.ColumnError
2220
import org.scalastyle.FileChecker
2321
import org.scalastyle.Lines
2422
import org.scalastyle.ScalastyleError
2523

24+
import scala.Array.canBuildFrom
25+
2626
class FileTabChecker extends FileChecker {
2727
val errorKey = "line.contains.tab"
2828

2929
def verify(lines: Lines): List[ScalastyleError] = {
3030
val errors = for {
31-
line <- lines.lines.zipWithIndex;
31+
line <- lines.lines.zipWithIndex
3232
if line._1.text.contains('\t')
3333
} yield {
3434
ColumnError(line._2 + 1, line._1.text.indexOf('\t'))

‎src/main/scala/org/scalastyle/file/HeaderMatchesChecker.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package org.scalastyle.file
1818

1919
import org.scalastyle.Checker
2020
import org.scalastyle.FileChecker
21-
import org.scalastyle.LineError
2221
import org.scalastyle.FileError
22+
import org.scalastyle.LineError
2323
import org.scalastyle.Lines
2424
import org.scalastyle.ScalastyleError
2525

‎src/main/scala/org/scalastyle/file/IndentationChecker.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.scalastyle.file
1818

1919
import org.scalastyle.FileChecker
20-
import org.scalastyle.LineError
2120
import org.scalastyle.Line
21+
import org.scalastyle.LineError
2222
import org.scalastyle.Lines
2323
import org.scalastyle.ScalastyleError
2424

@@ -48,7 +48,7 @@ case class NormalizedLine(lineNumber: Int, line: Line, tabSize: Int) {
4848
private def replaceTabs(s: String, tabSize: Int): String = {
4949
val sb = new StringBuilder(s)
5050
val len = sb.length
51-
var i = 0;
51+
var i = 0
5252

5353
while (i < len) {
5454
if (sb.charAt(i) == '\t') {
@@ -58,7 +58,7 @@ case class NormalizedLine(lineNumber: Int, line: Line, tabSize: Int) {
5858
}
5959

6060
if (sb.endsWith("\r")) {
61-
sb.setLength(sb.length-1);
61+
sb.setLength(sb.length-1)
6262
}
6363

6464
sb.toString

‎src/main/scala/org/scalastyle/file/WhitespaceEndOfLineChecker.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
package org.scalastyle.file
1818

19-
import scala.Array.canBuildFrom
20-
2119
import org.scalastyle.ColumnError
2220
import org.scalastyle.FileChecker
2321
import org.scalastyle.Lines
2422
import org.scalastyle.ScalastyleError
2523

24+
import scala.Array.canBuildFrom
25+
2626
class WhitespaceEndOfLineChecker extends FileChecker {
2727
val errorKey = "whitespace.end.of.line"
2828
lazy val ignoreWhitespaceLines = getBoolean("ignoreWhitespaceLines", false)
@@ -36,7 +36,7 @@ class WhitespaceEndOfLineChecker extends FileChecker {
3636
(for {
3737
withoutEndOfLines <- Some(sb.zipWithIndex.dropWhile{ case (c: Char, idx: Int) => endOfLines.contains(c) })
3838
(nextChar, eolIndex) <- withoutEndOfLines.headOption
39-
if (whitespaces.contains(nextChar))
39+
if whitespaces.contains(nextChar)
4040
} yield {
4141
withoutEndOfLines.dropWhile{ case (c: Char, idx: Int) =>
4242
whitespaces.contains(c)
@@ -53,8 +53,8 @@ class WhitespaceEndOfLineChecker extends FileChecker {
5353
val errors = for {
5454
(line, lineIndex) <- lines.lines.zipWithIndex
5555
(hasWhitespace, whitespaceIndex) = endsWithWhitespace(line.text)
56-
if (hasWhitespace)
57-
if (!ignoreWhitespaceLines || line.text.trim.size > 0)
56+
if hasWhitespace
57+
if !ignoreWhitespaceLines || line.text.trim.nonEmpty
5858
} yield {
5959
ColumnError(lineIndex + 1, whitespaceIndex)
6060
}

‎src/main/scala/org/scalastyle/scalariform/AbstractClassChecker.scala

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,30 @@
1414
// See the License for the specific language governing permissions and
1515
// limitations under the License.
1616

17-
package org.scalastyle.scalariform;
17+
package org.scalastyle.scalariform
1818

1919
import org.scalastyle.PositionError
2020
import org.scalastyle.ScalariformChecker
2121
import org.scalastyle.ScalastyleError
22+
import org.scalastyle.scalariform.VisitorHelper.TreeVisit
23+
import org.scalastyle.scalariform.VisitorHelper.traverse
24+
import org.scalastyle.scalariform.VisitorHelper.visit
2225

23-
import VisitorHelper.visit
24-
import VisitorHelper.traverse
25-
import VisitorHelper.TreeVisit
26-
import scalariform.lexer.Tokens.LBRACE
27-
import scalariform.lexer.Tokens.RBRACE
28-
import scalariform.parser.AstNode
29-
import scalariform.parser.CompilationUnit
30-
import scalariform.parser.TmplDef
26+
import _root_.scalariform.parser.CompilationUnit
27+
import _root_.scalariform.parser.TmplDef
3128

3229
abstract class AbstractClassChecker extends ScalariformChecker {
3330
case class TmplClazz(t: TmplDef, subs: List[TmplClazz]) extends TreeVisit[TmplClazz]
3431

3532
final def verify(ast: CompilationUnit): List[ScalastyleError] = {
3633
val it = for {
37-
f <- visit[TmplDef, TmplClazz](map)(ast.immediateChildren(0));
34+
f <- visit[TmplDef, TmplClazz](map)(ast.immediateChildren.head)
3835
t <- traverse(f, matches)
3936
} yield {
4037
PositionError(t.t.name.offset)
4138
}
4239

43-
it.toList
40+
it
4441
}
4542

4643
def matches(t: TmplClazz): Boolean

0 commit comments

Comments
 (0)