cosmetic

Roman Janusz · Roman Janusz · commit 906fe526085f · 2022-08-10T17:54:29.000+02:00
diff --git a/commons-analyzer/src/main/scala/com/avsystem/commons/analyzer/ConstantDeclarations.scala b/commons-analyzer/src/main/scala/com/avsystem/commons/analyzer/ConstantDeclarations.scala
@@ -20,9 +20,9 @@ class ConstantDeclarations(g: Global) extends AnalyzerRule(g, "constantDeclarati
 
         val firstChar = name.toString.charAt(0)
         if (constantValue && (firstChar.isLower || !getter.isFinal)) {
-          report(t.pos, "a constant should be declared as a `final val` with an UpperCamelCase name")
+          report(t.pos, "a literal-valued constant should be declared as a `final val` with an UpperCamelCase name")
         }
-        if (firstChar.isUpper && !getter.isFinal) {
+        if (!constantValue && firstChar.isUpper && !getter.isFinal) {
           report(t.pos, "a constant with UpperCamelCase name should be declared as a `final val`")
         }
         if (getter.isFinal && constantValue && !(tpt.tpe =:= rhs.tpe)) {

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ class ConstantDeclarations(g: Global) extends AnalyzerRule(g, "constantDeclarati`
`20`	`20`
`21`	`21`	`val firstChar = name.toString.charAt(0)`
`22`	`22`	`if (constantValue && (firstChar.isLower \|\| !getter.isFinal)) {`
`23`		- report(t.pos, "a constant should be declared as a `final val` with an UpperCamelCase name")
	`23`	+ report(t.pos, "a literal-valued constant should be declared as a `final val` with an UpperCamelCase name")
`24`	`24`	`}`
`25`		`- if (firstChar.isUpper && !getter.isFinal) {`
	`25`	`+ if (!constantValue && firstChar.isUpper && !getter.isFinal) {`
`26`	`26`	report(t.pos, "a constant with UpperCamelCase name should be declared as a `final val`")
`27`	`27`	`}`
`28`	`28`	`if (getter.isFinal && constantValue && !(tpt.tpe =:= rhs.tpe)) {`