Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 1076bf2

Browse files
PackageNamesChecker should allow only lowercase alphabets (#18)
1 parent 91fcc6b commit 1076bf2

File tree

5 files changed

+24
-8
lines changed

5 files changed

+24
-8
lines changed

src/main/resources/default_config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<check class="org.scalastyle.scalariform.PackageNamesChecker" level="warning" enabled="true">
6969
<parameters>
7070
<parameter name="regex">
71-
<![CDATA[^[a-z][A-Za-z]*$]]>
71+
<![CDATA[^[a-z]+$]]>
7272
</parameter>
7373
</parameters>
7474
</check>

src/main/resources/scalastyle_definition.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</checker>
4040
<checker class="org.scalastyle.scalariform.PackageNamesChecker" id="package.name" defaultLevel="warning">
4141
<parameters>
42-
<parameter name="regex" type="string" default="^[a-z][A-Za-z]*$" />
42+
<parameter name="regex" type="string" default="^[a-z]+$" />
4343
</parameters>
4444
</checker>
4545
<checker class="org.scalastyle.scalariform.PackageObjectNamesChecker" id="package.object.name" defaultLevel="warning">

src/main/resources/scalastyle_documentation.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ To bring consistency with how comments should be formatted, leave a space right
693693
<![CDATA[
694694
<check level="warning" class="org.scalastyle.scalariform.PackageNamesChecker" enabled="true">
695695
<parameters>
696-
<parameter name="regex">^[a-z][A-Za-z]*$</parameter>
696+
<parameter name="regex">^[a-z]+$</parameter>
697697
</parameters>
698698
</check>
699699
]]>

src/main/scala/org/scalastyle/scalariform/ClassNamesChecker.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class ObjectNamesChecker extends ScalariformChecker {
8181
}
8282

8383
class PackageNamesChecker extends ScalariformChecker {
84-
val DefaultRegex = "^[a-z][A-Za-z]*$"
84+
val DefaultRegex = "^[a-z]+$"
8585
val errorKey = "package.name"
8686

8787
def verify(ast: CompilationUnit): List[PositionError] = {

src/test/scala/org/scalastyle/scalariform/ClassNamesCheckerTest.scala

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,15 @@ package foobar
118118
package FooBar
119119
"""
120120

121-
assertErrors(List(columnError(2, 8, List("^[a-z][A-Za-z]*$"))), source)
121+
assertErrors(List(columnError(2, 8, List("^[a-z]+$"))), source)
122+
}
123+
124+
@Test def testSinglePartCamelCaseError(): Unit = {
125+
val source = """
126+
package fooBar
127+
"""
128+
129+
assertErrors(List(columnError(2, 8, List("^[a-z]+$"))), source)
122130
}
123131

124132
@Test def testMultiPartNoError(): Unit = {
@@ -134,7 +142,15 @@ package abc.foobar
134142
package abc.foo_bar
135143
"""
136144

137-
assertErrors(List(columnError(2, 12, List("^[a-z][A-Za-z]*$"))), source)
145+
assertErrors(List(columnError(2, 12, List("^[a-z]+$"))), source)
146+
}
147+
148+
@Test def testMultiPartCamelCaseError(): Unit = {
149+
val source = """
150+
package abc.fooBar
151+
"""
152+
153+
assertErrors(List(columnError(2, 12, List("^[a-z]+$"))), source)
138154
}
139155

140156
@Test def testPackageObjectNoError(): Unit = {
@@ -162,7 +178,7 @@ package foo
162178
package Bar
163179
"""
164180

165-
assertErrors(List(columnError(3, 8, List("^[a-z][A-Za-z]*$"))), source)
181+
assertErrors(List(columnError(3, 8, List("^[a-z]+$"))), source)
166182
}
167183

168184
@Test def testMultiLinePackageMultipleError(): Unit = {
@@ -172,7 +188,7 @@ package Bar
172188
"""
173189

174190
assertErrors(
175-
List(columnError(2, 8, List("^[a-z][A-Za-z]*$")), columnError(3, 8, List("^[a-z][A-Za-z]*$"))),
191+
List(columnError(2, 8, List("^[a-z]+$")), columnError(3, 8, List("^[a-z]+$"))),
176192
source
177193
)
178194
}

0 commit comments

Comments
 (0)