Fixes #11 does not handle package objects

Added package object names, default [a-z][A-Za-z]*
Changed object names to ignore package objects
Corrected handling of scalariform errors

Also better management of default values for regexps

src/main/resources/scalastyle_definition.xml

@@ -23,12 +23,17 @@
 	</checker>
     <checker class="org.scalastyle.scalariform.ClassNamesChecker" id="class.name" defaultLevel="warning">
         <parameters>
-            <parameter name="regex" type="string" default="[A-Z][A-Za-z]*" />
+            <parameter name="regex" type="string" default="^[A-Z][A-Za-z]*$" />
         </parameters>
     </checker>
     <checker class="org.scalastyle.scalariform.ObjectNamesChecker" id="object.name" defaultLevel="warning">
         <parameters>
-            <parameter name="regex" type="string" default="[A-Z][A-Za-z]*" />
+            <parameter name="regex" type="string" default="^[A-Z][A-Za-z]*$" />
+        </parameters>
+    </checker>
+    <checker class="org.scalastyle.scalariform.PackageObjectNamesChecker" id="package.object.name" defaultLevel="warning">
+        <parameters>
+            <parameter name="regex" type="string" default="^[a-z][A-Za-z]*$" />
         </parameters>
     </checker>
     <checker class="org.scalastyle.scalariform.EqualsHashCodeChecker" id="equals.hash.code"  defaultLevel="warning"/>

src/main/resources/scalastyle_messages.properties

@@ -103,3 +103,9 @@ structural.type.message = Avoid using structural types
 structural.type.label = Structural type
 structural.type.description = Check that structural types are not used.
 
+package.object.name.message = Package object name does not match the regular expression ''{0}''
+package.object.name.label = Package object name
+package.object.name.description = Check that package object names match a regular expression
+package.object.name.regex.label = Regular expression
+package.object.name.regex.description = The package object names must match this regular expression
+

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

@@ -56,14 +56,9 @@ object Checker {
   type CheckerClass = Class[_ <: Checker[_]]
 
   def parseScalariform(source: String): Option[ScalariformAst] = {
-    try {
-      val (hiddenTokenInfo, tokens) = ScalaLexer.tokeniseFull(source, true)
+    val (hiddenTokenInfo, tokens) = ScalaLexer.tokeniseFull(source, true)
 
-      Some(ScalariformAst(new ScalaParser(tokens.toArray).compilationUnitOrScript(), hiddenTokenInfo))
-    } catch {
-      // TODO improve error logging here
-      case e: Exception => None
-    }
+    Some(ScalariformAst(new ScalaParser(tokens.toArray).compilationUnitOrScript(), hiddenTokenInfo))
   }
 
   def parseLines(source: String): Lines = Lines(source.split("\n").scanLeft(Line("", 0, 0)) {

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

@@ -24,7 +24,7 @@ import org.scalastyle._
 import org.scalastyle.FileSpec
 
 class ClassNamesChecker extends ScalariformChecker {
-  val DefaultRegex = "[A-Z][A-Za-z]*"
+  val DefaultRegex = "^[A-Z][A-Za-z]*$"
   val errorKey = "class.name"
 
   def verify(ast: CompilationUnit): List[ScalastyleError] = {
@@ -43,16 +43,36 @@ class ClassNamesChecker extends ScalariformChecker {
 }
 
 class ObjectNamesChecker extends ScalariformChecker {
-  val DefaultRegex = "[A-Z][A-Za-z]*"
+  val DefaultRegex = "^[A-Z][A-Za-z]*$"
   val errorKey = "object.name"
 
   def verify(ast: CompilationUnit): List[PositionError] = {
     val regexString = getString("regex", DefaultRegex)
     val regex = regexString.r
 
     val it = for (
-      List(left, right) <- ast.tokens.sliding(2);
-      if (left.tokenType == OBJECT && (regex findAllIn (right.getText)).size == 0)
+      List(left, middle, right) <- ast.tokens.sliding(3);
+      if (left.tokenType != PACKAGE && middle.tokenType == OBJECT && (regex findAllIn (right.getText)).size == 0)
+    ) yield {
+      PositionError(right.startIndex, List(regexString))
+    }
+
+    it.toList
+  }
+}
+
+
+class PackageObjectNamesChecker extends ScalariformChecker {
+  val DefaultRegex = "^[a-z][A-Za-z]*$"
+  val errorKey = "package.object.name"
+
+  def verify(ast: CompilationUnit): List[PositionError] = {
+    val regexString = getString("regex", DefaultRegex)
+    val regex = regexString.r
+
+    val it = for (
+      List(left, middle, right) <- ast.tokens.sliding(3);
+      if (left.tokenType == PACKAGE && middle.tokenType == OBJECT && (regex findAllIn (right.getText)).size == 0)
     ) yield {
       PositionError(right.startIndex, List(regexString))
     }

src/test/scala/org/scalastyle/file/FileLengthCheckerTest.scala

@@ -35,7 +35,7 @@ class FileLengthCheckerTest extends AssertionsForJUnit with CheckerTest {
   @Test def testZero() = {
     val source = """
 package foobar
-import foobar
+
   object Foobar {
 }
 """;
@@ -46,7 +46,7 @@ import foobar
   @Test def testOne() = {
     val source = """
 package foobar
-import foobar
+
   object Foobar {
 }
   object Barbar {

src/test/scala/org/scalastyle/file/FileLineLengthCheckerTest.scala

@@ -37,7 +37,7 @@ class FileLineLengthCheckerTest extends AssertionsForJUnit with CheckerTest {
   @Test def testNoMax() = {
     val source = """
 package foobar
-import foobar
+
     object Foobar {
 }
 """;
@@ -48,7 +48,7 @@ import foobar
   @Test def testWithOneMax() = {
     val source = """
 package foobar
-import foobar
+
     object Foobar {
 }
 """;
@@ -59,7 +59,7 @@ import foobar
   @Test def testWithTwoMax() = {
     val source = """
 package foobar
-import foobar
+
     object Foobar {
 }
     object Barbar {
@@ -73,7 +73,7 @@ import foobar
     val source = """
 package foobar
 
-import# #foo
+import# #java.lang._
 object Barbar {
 }
 """.replaceAll("#","\t");

src/test/scala/org/scalastyle/file/FileTabCheckerTest.scala

@@ -37,7 +37,7 @@ class FileTabCheckerTest extends AssertionsForJUnit with CheckerTest {
   @Test def testZero() = {
     val source = """
 package foobar
-import foobar
+
     object Foobar {
 }
 """;
@@ -48,7 +48,7 @@ import foobar
   @Test def testOne() = {
     val source = """
 package foobar
-import foobar
+
 #object Foobar {
 }
 """.replaceAll("#", "\t");
@@ -59,7 +59,7 @@ import foobar
   @Test def testTwo() = {
     val source = """
 package foobar
-import foobar
+
 #object Foobar {
 }
 #object Barbar {

src/test/scala/org/scalastyle/file/HeaderMatchesCheckerTest.scala

@@ -55,7 +55,7 @@ class HeaderMatchesCheckerTest extends AssertionsForJUnit with CheckerTest {
   @Test def testOK() = {
     val source = licence + """
 package foobar
-import foobar
+
   object Foobar {
 }
 """;
@@ -66,7 +66,7 @@ import foobar
   @Test def testKO() = {
     val source = licence.replaceAll("BASIS,", "XXX") + """
 package foobar
-import foobar
+
   object Foobar {
 }
 """;

src/test/scala/org/scalastyle/file/WhitespaceEndOfLineCheckerTest.scala

@@ -36,7 +36,7 @@ class WhitespaceEndOfLineCheckerTest extends AssertionsForJUnit with CheckerTest
   @Test def testZero() = {
     val source = """
 package foobar
-import foobar
+
 object Foobar {
 }
 """;
@@ -47,7 +47,7 @@ object Foobar {
   @Test def testOne() = {
     val source = """
 package foobar##
-import foobar
+
 object Foobar {
 }
 """.replaceAll("#", " ");
@@ -58,7 +58,7 @@ object Foobar {
   @Test def testTwo() = {
     val source = """
 package foobar~
-import foobar#
+class  foobar#
 object Foobar {
 }
 """.replaceAll("~", " ").replaceAll("#", "\t");

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

@@ -54,7 +54,7 @@ class foobar {
 }
 """;
 
-    assertErrors(List(columnError(4, 6, List("[A-Z][A-Za-z]*")), columnError(5, 8, List("[A-Z][A-Za-z]*"))), source)
+    assertErrors(List(columnError(4, 6, List("^[A-Z][A-Za-z]*$")), columnError(5, 8, List("^[A-Z][A-Za-z]*$"))), source)
   }
 }
 
@@ -66,7 +66,7 @@ class ObjectNamesCheckerTest extends AssertionsForJUnit with CheckerTest {
     val source = """
 package foobar
 
-class Foobar {
+object Foobar {
   val foo = 1
 }
 """;
@@ -84,6 +84,63 @@ object foobar {
 }
 """;
 
-    assertErrors(List(columnError(4, 7, List("[A-Z][A-Za-z]*")), columnError(5, 9, List("[A-Z][A-Za-z]*"))), source)
+    assertErrors(List(columnError(4, 7, List("^[A-Z][A-Za-z]*$")), columnError(5, 9, List("^[A-Z][A-Za-z]*$"))), source)
+  }
+
+  @Test def testPackageObject() = {
+    val source = """
+package foobar
+
+package object foobar {
+  object barbar {
+  }
+}
+""";
+
+    assertErrors(List(columnError(5, 9, List("^[A-Z][A-Za-z]*$"))), source)
+  }
+}
+
+
+class PackageObjectNamesCheckerTest extends AssertionsForJUnit with CheckerTest {
+  val key = "package.object.name"
+  val classUnderTest = classOf[PackageObjectNamesChecker]
+
+  @Test def testZero() = {
+    val source = """
+package foobar
+
+package object foobar {
+  val foo = 1
+}
+""";
+
+    assertErrors(List(), source)
+  }
+
+  @Test def testOne() = {
+    val source = """
+package foobar
+
+package object Foobar {
+}
+package object Barbar {
+}
+""";
+
+    assertErrors(List(columnError(4, 15, List("^[a-z][A-Za-z]*$")), columnError(6, 15, List("^[a-z][A-Za-z]*$"))), source)
+  }
+
+  @Test def testPackageObject() = {
+    val source = """
+package foobar
+
+object foobar {
+  object barbar {
+  }
+}
+""";
+
+    assertErrors(List(), source)
   }
 }

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

@@ -50,6 +50,6 @@ class foobar {
 }
 """;
 
-    assertErrors(List(columnError(4, 6, List("[A-Z][A-Za-z]*")), columnError(14, 8, List("[A-Z][A-Za-z]*"))), source)
+    assertErrors(List(columnError(4, 6, List("^[A-Z][A-Za-z]*$")), columnError(14, 8, List("^[A-Z][A-Za-z]*$"))), source)
   }
 }