From ea8ac353c8b37f45d4336511dbc090bac28235a9 Mon Sep 17 00:00:00 2001 From: Nick Rayburn <52075362+nrayburn-tech@users.noreply.github.com> Date: Sun, 27 Oct 2024 14:15:47 -0500 Subject: [PATCH] feat: Add eslint config file support --- .../com/github/oxc/project/oxcintellijplugin/Constants.kt | 5 +++-- .../github/oxc/project/oxcintellijplugin/OxcIconProvider.kt | 2 +- .../project/oxcintellijplugin/OxcSchemaProviderFactory.kt | 2 +- .../oxc/project/oxcintellijplugin/lsp/OxlintConfigWatcher.kt | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/Constants.kt b/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/Constants.kt index 278a17c..14f1393 100644 --- a/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/Constants.kt +++ b/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/Constants.kt @@ -2,6 +2,7 @@ package com.github.oxc.project.oxcintellijplugin object Constants { - val CONFIG_FILES = listOf("oxlintrc.json", "oxlint.json", ".oxlintrc.json", ".oxlint.json", - ".oxlintrc") + val ESLINT_CONFIG_FILES = listOf(".eslintrc", ".eslintrc.json") + val OXLINT_CONFIG_FILES = listOf("oxlintrc.json", "oxlint.json", ".oxlintrc.json", + ".oxlint.json", ".oxlintrc") } diff --git a/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/OxcIconProvider.kt b/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/OxcIconProvider.kt index 5b1392b..05d482b 100644 --- a/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/OxcIconProvider.kt +++ b/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/OxcIconProvider.kt @@ -16,7 +16,7 @@ class OxcIconProvider : IconProvider(), DumbAware { if (!file.isValid || file.isDirectory) { return null } - if (Constants.CONFIG_FILES.contains(file.name)) { + if (Constants.OXLINT_CONFIG_FILES.contains(file.name)) { return OxcIcons.OxcRound } diff --git a/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/OxcSchemaProviderFactory.kt b/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/OxcSchemaProviderFactory.kt index b252e62..39a6c0c 100644 --- a/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/OxcSchemaProviderFactory.kt +++ b/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/OxcSchemaProviderFactory.kt @@ -13,7 +13,7 @@ class OxcSchemaProviderFactory : JsonSchemaProviderFactory { override fun getProviders(project: Project): List { return listOf(object : JsonSchemaFileProvider { override fun isAvailable(file: VirtualFile): Boolean { - return Constants.CONFIG_FILES.contains(file.name) + return Constants.OXLINT_CONFIG_FILES.contains(file.name) } override fun getName(): @Nls String { diff --git a/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/lsp/OxlintConfigWatcher.kt b/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/lsp/OxlintConfigWatcher.kt index 95a74d4..f718154 100644 --- a/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/lsp/OxlintConfigWatcher.kt +++ b/src/main/kotlin/com/github/oxc/project/oxcintellijplugin/lsp/OxlintConfigWatcher.kt @@ -14,7 +14,8 @@ class OxlintConfigWatcher : BulkFileListener { val configChanged = events.any { event -> val fileName = event.path.substringAfterLast("/") - return@any Constants.CONFIG_FILES.contains(fileName) + return@any (Constants.OXLINT_CONFIG_FILES + Constants.ESLINT_CONFIG_FILES).contains( + fileName) } if (configChanged) {