Fix false positive for value classes in ModifierOrder

detekt · May 21, 2021 · d25098e · d25098e
1 parent 22eec63
commit d25098e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -211,6 +211,7 @@ If you contributed to detekt but your name is not in the list, please feel free
 - [Krzysztof Kruczynski](https://github.com/krzykrucz) - Rule fix: ThrowingExceptionInMain, ExitOutsideMain
 - [Paya Do](https://github.com/payathedo) - Designer for Detekt's logo
 - [zmunm](https://github.com/zmunm) - New rule: ObjectLiteralToLambda
+- [Eliezer Graber](https://github.com/eygraber) - Rule fix: ModifierOrder
 
 ### Mentions
 

diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ModifierOrder.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ModifierOrder.kt
@@ -34,6 +34,7 @@ import org.jetbrains.kotlin.lexer.KtTokens.PUBLIC_KEYWORD
 import org.jetbrains.kotlin.lexer.KtTokens.SEALED_KEYWORD
 import org.jetbrains.kotlin.lexer.KtTokens.SUSPEND_KEYWORD
 import org.jetbrains.kotlin.lexer.KtTokens.TAILREC_KEYWORD
+import org.jetbrains.kotlin.lexer.KtTokens.VALUE_KEYWORD
 import org.jetbrains.kotlin.lexer.KtTokens.VARARG_KEYWORD
 import org.jetbrains.kotlin.psi.KtModifierList
 import org.jetbrains.kotlin.psi.psiUtil.allChildren
@@ -75,6 +76,7 @@ class ModifierOrder(config: Config = Config.empty) : Rule(config) {
         ENUM_KEYWORD, ANNOTATION_KEYWORD, FUN_KEYWORD,
         COMPANION_KEYWORD,
         INLINE_KEYWORD,
+        VALUE_KEYWORD,
         INFIX_KEYWORD,
         OPERATOR_KEYWORD,
         DATA_KEYWORD

diff --git a/...-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ModifierOrderSpec.kt b/...-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ModifierOrderSpec.kt
@@ -121,5 +121,16 @@ class ModifierOrderSpec : Spek({
                 assertThat(subject.compileAndLint(code)).isEmpty()
             }
         }
+
+        context("value class") {
+
+            it("should not report correctly ordered modifiers") {
+                val code = """
+                    @JvmInline
+                    private value class Foo(val bar: Int)
+                """
+                assertThat(subject.compileAndLint(code)).isEmpty()
+            }
+        }
     }
 })