Capitalize ExplicitResultTypes to follow the new convention

scalacenter · Sep 17, 2017 · e5216b6 · e5216b6
1 parent 95eff4b
commit e5216b6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/readme/Rules.scalatex b/readme/Rules.scalatex
@@ -29,12 +29,12 @@
     @h3{Configuration}
 
     @config
-      explicitResultTypes.memberKind = [Val, Def, Var]
-      explicitResultTypes.memberVisibility = [Public, Protected]
+      ExplicitResultTypes.memberKind = [Val, Def, Var]
+      ExplicitResultTypes.memberVisibility = [Public, Protected]
       // Experimental, shorten fully qualified names and insert missing imports
       // By default, names are fully qualified and prefixed with _root_.
       unsafeShortenNames = true // false by default.
-      explicitResultTypes.unsafeShortenNames = true // false by default.
+      ExplicitResultTypes.unsafeShortenNames = true // false by default.
 
     @h3{Known limitations}
 

diff --git a/scalafix-core/shared/src/main/scala/scalafix/internal/rule/ExplicitResultTypes.scala b/scalafix-core/shared/src/main/scala/scalafix/internal/rule/ExplicitResultTypes.scala
@@ -32,8 +32,9 @@ case class ExplicitResultTypes(
   def this(index: SemanticdbIndex) =
     this(index, ExplicitResultTypesConfig.default)
   override def init(config: Conf): Configured[Rule] =
-    config
-      .getOrElse("explicitResultTypes")(ExplicitResultTypesConfig.default)
+    config // Support deprecated explicitReturnTypes config
+      .getOrElse("explicitReturnTypes", "ExplicitResultTypes")(
+        ExplicitResultTypesConfig.default)
       .map(c => ExplicitResultTypes(index, c))
 
   // Don't explicitly annotate vals when the right-hand body is a single call

diff --git a/scalafix-tests/input/src/main/scala/test/explicitResultTypes/ExplicitResultTypesBase.scala b/scalafix-tests/input/src/main/scala/test/explicitResultTypes/ExplicitResultTypesBase.scala
@@ -1,7 +1,7 @@
 /*
 rules = ExplicitResultTypes
-explicitResultTypes.memberKind = [Val, Def, Var]
-explicitResultTypes.memberVisibility = [Public, Protected]
+ExplicitResultTypes.memberKind = [Val, Def, Var]
+ExplicitResultTypes.memberVisibility = [Public, Protected]
  */
 package test.explicitResultTypes
 

diff --git a/scalafix-tests/input/src/main/scala/test/explicitResultTypes/ExplicitResultTypesShort.scala b/scalafix-tests/input/src/main/scala/test/explicitResultTypes/ExplicitResultTypesShort.scala
@@ -1,6 +1,6 @@
 /*
 rules = ExplicitResultTypes
-explicitResultTypes.unsafeShortenNames = true
+ExplicitResultTypes.unsafeShortenNames = true
  */
 package test.explicitResultTypes