Skip to content

Commit

Permalink
Fix skipping non KtFiles
Browse files Browse the repository at this point in the history
  • Loading branch information
arturbosch committed Jun 5, 2022
1 parent 00bf96e commit d2abd3e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
Expand Up @@ -11,8 +11,8 @@ import io.gitlab.arturbosch.detekt.api.TextLocation
import io.gitlab.arturbosch.detekt.idea.config.DetektConfigStorage
import io.gitlab.arturbosch.detekt.idea.intention.AutoCorrectIntention
import io.gitlab.arturbosch.detekt.idea.util.isDetektEnabled
import io.gitlab.arturbosch.detekt.idea.util.isKotlinFile
import io.gitlab.arturbosch.detekt.idea.util.showNotification
import org.jetbrains.kotlin.idea.KotlinLanguage

class DetektAnnotator : ExternalAnnotator<PsiFile, List<Finding>>() {

Expand All @@ -22,7 +22,7 @@ class DetektAnnotator : ExternalAnnotator<PsiFile, List<Finding>>() {
if (!collectedInfo.project.isDetektEnabled()) {
return emptyList()
}
if (collectedInfo.isKotlinFile()) {
if (collectedInfo.language.id != KotlinLanguage.INSTANCE.id) {
return emptyList()
}

Expand Down
Expand Up @@ -7,20 +7,16 @@ import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.options.newEditor.SettingsDialog
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiFile
import io.gitlab.arturbosch.detekt.idea.DETEKT
import io.gitlab.arturbosch.detekt.idea.config.DetektConfig
import io.gitlab.arturbosch.detekt.idea.config.DetektConfigStorage
import org.jetbrains.kotlin.idea.KotlinLanguage
import java.io.File
import java.nio.file.Path
import java.nio.file.Paths

fun Project.isDetektEnabled(): Boolean =
DetektConfigStorage.instance(this).enableDetekt

fun PsiFile.isKotlinFile(): Boolean = language == KotlinLanguage.INSTANCE

fun absolutePath(project: Project, path: String): String =
if (path.isBlank() || File(path).isAbsolute) {
path
Expand Down

0 comments on commit d2abd3e

Please sign in to comment.