remove psi from getAnnotationUseSiteTarget

pinterest · Dec 10, 2024 · 1b76046 · 1b76046
1 parent a05595f
commit 1b76046
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/.../src/main/kotlin/com/pinterest/ktlint/rule/engine/internal/rules/KtlintSuppressionRule.kt b/.../src/main/kotlin/com/pinterest/ktlint/rule/engine/internal/rules/KtlintSuppressionRule.kt
@@ -124,9 +124,7 @@ public class KtlintSuppressionRule(
                         .ifAutocorrectAllowed {
                             node
                                 .createLiteralStringTemplateEntry(prefixedSuppression)
-                                ?.let {
-                                    literalStringTemplateEntry.replaceWith(it)
-                                }
+                                ?.let { literalStringTemplateEntry.replaceWith(it) }
                         }
                 }
             }

diff --git a/...et-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/AnnotationRule.kt b/...et-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/AnnotationRule.kt
@@ -1,6 +1,7 @@
 package com.pinterest.ktlint.ruleset.standard.rules
 
 import com.pinterest.ktlint.rule.engine.core.api.AutocorrectDecision
+import com.pinterest.ktlint.rule.engine.core.api.ElementType
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.ANNOTATED_EXPRESSION
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.ANNOTATION
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.ANNOTATION_ENTRY
@@ -43,11 +44,9 @@ import com.pinterest.ktlint.rule.engine.core.api.prevCodeSibling
 import com.pinterest.ktlint.rule.engine.core.api.prevLeaf
 import com.pinterest.ktlint.rule.engine.core.api.upsertWhitespaceAfterMe
 import com.pinterest.ktlint.rule.engine.core.api.upsertWhitespaceBeforeMe
-import com.pinterest.ktlint.rule.engine.core.util.safeAs
 import com.pinterest.ktlint.ruleset.standard.StandardRule
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
-import org.jetbrains.kotlin.psi.KtAnnotationEntry
 import org.jetbrains.kotlin.psi.psiUtil.siblings
 import org.jetbrains.kotlin.utils.addToStdlib.ifTrue
 
@@ -346,11 +345,10 @@ public class AnnotationRule :
 
     private fun ASTNode.isNotReceiverTargetAnnotation() = getAnnotationUseSiteTarget() != AnnotationUseSiteTarget.RECEIVER
 
-    private fun ASTNode.getAnnotationUseSiteTarget() =
-        psi
-            .safeAs<KtAnnotationEntry>()
-            ?.useSiteTarget
-            ?.getAnnotationUseSiteTarget()
+    private fun ASTNode.getAnnotationUseSiteTarget(): AnnotationUseSiteTarget? =
+        takeIf { it.elementType == ElementType.ANNOTATION_ENTRY }
+            ?.findChildByType(ElementType.ANNOTATION_TARGET)
+            ?.let { USE_SITE_TARGETS[it.text] }
 
     private fun ASTNode.isAnnotationEntryWithValueArgumentList() = getAnnotationEntryValueArgumentList() != null
 
@@ -469,6 +467,7 @@ public class AnnotationRule :
                 FILE_ANNOTATION_LIST,
                 MODIFIER_LIST,
             )
+        val USE_SITE_TARGETS = AnnotationUseSiteTarget.entries.associate { it.renderName to it }
     }
 }