File with single toplevel extension function should only adhere to Pa…

…scalConvention (#1528) Closes #1521
pinterest · Jul 18, 2022 · 7abe7da · 7abe7da
1 parent 6ad30d2
commit 7abe7da
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ The "visit" life cycle hook will be removed in Ktlint 0.48. In KtLint 0.47 the "
 ### Fixed
 
 * Fix cli argument "--disabled_rules" ([#1520](https://github.com/pinterest/ktlint/issue/1520)).
+* A file which contains a single top level declaration of type function does not need to be name after the function but only needs to adhere to the PascalCase convention. `filename` ([#1521](https://github.com/pinterest/ktlint/issue/1521)).
 * When a glob is specified then ensure that it matches files in the current directory and not only in subdirectories of the current directory ([#1533](https://github.com/pinterest/ktlint/issue/1533)).
 * Disable/enable IndentationRule on blocks in middle of file. (`indent`) [#631](https://github.com/pinterest/ktlint/issues/631)
 

diff --git a/...nt-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/FilenameRule.kt b/...nt-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/FilenameRule.kt
@@ -76,8 +76,7 @@ public class FilenameRule : Rule("filename") {
                 if (topLevelDeclarations.size == 1) {
                     val topLevelDeclaration = topLevelDeclarations.first()
                     if (topLevelDeclaration.elementType == OBJECT_DECLARATION ||
-                        topLevelDeclaration.elementType == TYPEALIAS ||
-                        topLevelDeclaration.elementType == FUN
+                        topLevelDeclaration.elementType == TYPEALIAS
                     ) {
                         val pascalCaseIdentifier =
                             topLevelDeclaration

diff --git a/...uleset-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/FilenameRuleTest.kt b/...uleset-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/FilenameRuleTest.kt
@@ -81,12 +81,10 @@ class FilenameRuleTest {
     @ValueSource(
         strings = [
             "object Foo",
-            "typealias Foo = String",
-            "fun String.foo() = {}",
-            "fun foo() = {}"
+            "typealias Foo = String"
         ]
     )
-    fun `Given a file containing one top level declaration (no class or property) then the file should be named after the identifier`(
+    fun `Given a file containing one top level declaration then the file should be named after the identifier`(
         code: String
     ) {
         fileNameRuleAssertThat(code)
@@ -98,10 +96,13 @@ class FilenameRuleTest {
     @ValueSource(
         strings = [
             "val foo",
-            "const val FOO"
+            "const val FOO",
+            "fun String.foo() = {}",
+            "fun foo() = {}",
+            "operator fun Foo.plus(other: Foo): Foo { /* ... */ }"
         ]
     )
-    fun `Given a file containing one top level property declaration (non-private) then the file should conform to PascalCase`(
+    fun `Given a file containing one top level then the file should conform to PascalCase`(
         code: String
     ) {
         fileNameRuleAssertThat(code)