Skip to content

Commit 52d6ac3

Browse files
DarkDimiusDarkDimius
committed
Merge pull request #469 from dotty-staging/stylecheck
Add stylechecking to test suite, fix style errors
2 parents 0c1797a + a16ab21 commit 52d6ac3

File tree

356 files changed

+1541
-1417
lines changed

Some content is hidden

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

356 files changed

+1541
-1417
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: scala
22
script:
3-
- sbt -Ddotty.travis.build=yes update compile test
3+
- sbt -Ddotty.travis.build=yes update compile test scalastyle
44
jdk:
55
- oraclejdk8
66
notifications:

‎project/Build.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ object DottyBuild extends Build {
2727

2828
// to get Scala 2.11
2929
resolvers += Resolver.sonatypeRepo("releases"),
30-
30+
3131
// get reflect and xml onboard
3232
libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value,
3333
"org.scala-lang.modules" %% "scala-xml" % "1.0.1",
@@ -59,7 +59,7 @@ object DottyBuild extends Build {
5959
val path = for {
6060
file <- attList.map(_.data)
6161
path = file.getAbsolutePath
62-
} yield "-Xbootclasspath/p:" + path
62+
} yield "-Xbootclasspath/p:" + path
6363
// dotty itself needs to be in the bootclasspath
6464
val fullpath = ("-Xbootclasspath/a:" + bin) :: path.toList
6565
// System.err.println("BOOTPATH: " + fullpath)
@@ -109,8 +109,8 @@ object DottyBuild extends Build {
109109
val path = for {
110110
file <- attList.map(_.data)
111111
path = file.getAbsolutePath
112-
prefix = if(path.endsWith(".jar")) "p" else "a"
113-
} yield "-Xbootclasspath/"+ prefix +":" + path
112+
prefix = if (path.endsWith(".jar")) "p" else "a"
113+
} yield "-Xbootclasspath/" + prefix + ":" + path
114114
// dotty itself needs to be in the bootclasspath
115115
val fullpath = ("-Xbootclasspath/a:" + bin) :: path.toList
116116
// System.err.println("BOOTPATH: " + fullpath)
@@ -121,7 +121,7 @@ object DottyBuild extends Build {
121121
else
122122
List()
123123
val res = agentOptions ::: travis_build ::: fullpath
124-
println("Running with javaOptions: " +res)
124+
println("Running with javaOptions: " + res)
125125
res
126126
}
127127
)

‎project/plugins.sbt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44

55
// Scala IDE project file generator
66
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
7+
8+
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.6.0")
9+

‎scalastyle-config.xml‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
<scalastyle>
2+
<name>Scalastyle standard configuration</name>
3+
<check level="warning" class="org.scalastyle.file.FileTabChecker" enabled="true"></check>
4+
<check level="warning" class="org.scalastyle.file.FileLengthChecker" enabled="false">
5+
<parameters>
6+
<parameter name="maxFileLength"><![CDATA[800]]></parameter>
7+
</parameters>
8+
</check>
9+
<check level="warning" class="org.scalastyle.file.HeaderMatchesChecker" enabled="false">
10+
<parameters>
11+
<parameter name="header"><![CDATA[// Copyright (C) 2011-2012 the original author or authors.
12+
// See the LICENCE.txt file distributed with this work for additional
13+
// information regarding copyright ownership.
14+
//
15+
// Licensed under the Apache License, Version 2.0 (the "License");
16+
// you may not use this file except in compliance with the License.
17+
// You may obtain a copy of the License at
18+
//
19+
// http://www.apache.org/licenses/LICENSE-2.0
20+
//
21+
// Unless required by applicable law or agreed to in writing, software
22+
// distributed under the License is distributed on an "AS IS" BASIS,
23+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
24+
// See the License for the specific language governing permissions and
25+
// limitations under the License.]]></parameter>
26+
</parameters>
27+
</check>
28+
<check level="warning" class="org.scalastyle.scalariform.EnsureSingleSpaceAfterTokenChecker" enabled="false">
29+
<parameters>
30+
<parameter name="tokens">IF</parameter>
31+
</parameters>
32+
</check>
33+
<check level="warning" class="org.scalastyle.scalariform.SpacesAfterPlusChecker" enabled="false"></check>
34+
<check level="warning" class="org.scalastyle.file.WhitespaceEndOfLineChecker" enabled="true"></check>
35+
<check level="warning" class="org.scalastyle.scalariform.SpacesBeforePlusChecker" enabled="true"></check>
36+
<check level="warning" class="org.scalastyle.file.FileLineLengthChecker" enabled="false">
37+
<parameters>
38+
<parameter name="maxLineLength"><![CDATA[160]]></parameter>
39+
<parameter name="tabSize"><![CDATA[4]]></parameter>
40+
</parameters>
41+
</check>
42+
<check level="warning" class="org.scalastyle.scalariform.ClassNamesChecker" enabled="true">
43+
<parameters>
44+
<parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
45+
</parameters>
46+
</check>
47+
<check level="warning" class="org.scalastyle.scalariform.ObjectNamesChecker" enabled="true">
48+
<parameters>
49+
<parameter name="regex"><![CDATA[[A-Z]?[A-Za-z]*]]></parameter>
50+
</parameters>
51+
</check>
52+
<check level="warning" class="org.scalastyle.scalariform.PackageObjectNamesChecker" enabled="true">
53+
<parameters>
54+
<parameter name="regex"><![CDATA[^[a-z][A-Za-z]*$]]></parameter>
55+
</parameters>
56+
</check>
57+
<check level="warning" class="org.scalastyle.scalariform.EqualsHashCodeChecker" enabled="false"></check>
58+
<check level="warning" class="org.scalastyle.scalariform.IllegalImportsChecker" enabled="true">
59+
<parameters>
60+
<parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter>
61+
</parameters>
62+
</check>
63+
<check level="warning" class="org.scalastyle.scalariform.ParameterNumberChecker" enabled="false">
64+
<parameters>
65+
<parameter name="maxParameters"><![CDATA[8]]></parameter>
66+
</parameters>
67+
</check>
68+
<check level="warning" class="org.scalastyle.scalariform.MagicNumberChecker" enabled="false">
69+
<parameters>
70+
<parameter name="ignore"><![CDATA[-1,0,1,2,3]]></parameter>
71+
</parameters>
72+
</check>
73+
<check level="warning" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="true"></check>
74+
<check level="warning" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"></check>
75+
<check level="warning" class="org.scalastyle.scalariform.ReturnChecker" enabled="false"></check>
76+
<check level="warning" class="org.scalastyle.scalariform.NullChecker" enabled="false"></check>
77+
<check level="warning" class="org.scalastyle.scalariform.NoCloneChecker" enabled="false"></check>
78+
<check level="warning" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"></check>
79+
<check level="warning" class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"></check>
80+
<check level="warning" class="org.scalastyle.scalariform.StructuralTypeChecker" enabled="false"></check>
81+
<check level="warning" class="org.scalastyle.file.RegexChecker" enabled="true">
82+
<parameters>
83+
<parameter name="regex"><![CDATA[if\(]]></parameter>
84+
</parameters>
85+
</check>
86+
<check level="warning" class="org.scalastyle.scalariform.NumberOfTypesChecker" enabled="false">
87+
<parameters>
88+
<parameter name="maxTypes"><![CDATA[30]]></parameter>
89+
</parameters>
90+
</check>
91+
<check level="warning" class="org.scalastyle.scalariform.CyclomaticComplexityChecker" enabled="false">
92+
<parameters>
93+
<parameter name="maximum"><![CDATA[10]]></parameter>
94+
</parameters>
95+
</check>
96+
<check level="warning" class="org.scalastyle.scalariform.UppercaseLChecker" enabled="true"></check>
97+
<check level="warning" class="org.scalastyle.scalariform.SimplifyBooleanExpressionChecker" enabled="false"></check>
98+
<check level="warning" class="org.scalastyle.scalariform.IfBraceChecker" enabled="false">
99+
<parameters>
100+
<parameter name="singleLineAllowed"><![CDATA[true]]></parameter>
101+
<parameter name="doubleLineAllowed"><![CDATA[true]]></parameter>
102+
</parameters>
103+
</check>
104+
<check level="warning" class="org.scalastyle.scalariform.MethodLengthChecker" enabled="false">
105+
<parameters>
106+
<parameter name="maxLength"><![CDATA[50]]></parameter>
107+
</parameters>
108+
</check>
109+
<check level="warning" class="org.scalastyle.scalariform.MethodNamesChecker" enabled="false">
110+
<parameters>
111+
<parameter name="regex"><![CDATA[^[a-z][A-Za-z0-9]*(_=)?$]]></parameter>
112+
</parameters>
113+
</check>
114+
<check level="warning" class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" enabled="false">
115+
<parameters>
116+
<parameter name="maxMethods"><![CDATA[30]]></parameter>
117+
</parameters>
118+
</check>
119+
<check level="warning" class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" enabled="false"></check>
120+
<check level="warning" class="org.scalastyle.file.NewLineAtEofChecker" enabled="true"></check>
121+
<check level="warning" class="org.scalastyle.file.NoNewLineAtEofChecker" enabled="false"></check>
122+
</scalastyle>

‎src/dotty/DottyPredef.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ object DottyPredef {
77
/** implicits for ClassTag and TypeTag. Should be implemented with macros */
88
implicit def classTag[T]: ClassTag[T] = ???
99
implicit def typeTag[T]: TypeTag[T] = ???
10-
}
10+
}

‎src/dotty/Pair.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package dotty
22

33
class Pair[T, U](x: T, y: U) {
44

5-
}
5+
}

‎src/dotty/Singleton.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package dotty
22

33
class Singleton {
44

5-
}
5+
}

‎src/dotty/annotation/internal/Alias.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ import scala.annotation.Annotation
44

55
class Alias(aliased: Any) extends Annotation {
66

7-
}
7+
}

‎src/dotty/annotation/internal/AnnotationDefault.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ import scala.annotation.Annotation
44

55
class AnnotationDefault extends Annotation {
66

7-
}
7+
}

‎src/dotty/annotation/internal/Child.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ import scala.annotation.Annotation
44

55
class Child[T] extends Annotation {
66

7-
}
7+
}

0 commit comments

Comments
 (0)