Merge pull request #12 from BartBM/master

Add Aurelia detection to package.json field devDependencies
CollinHerber · Sep 5, 2024 · 09b1ef9 · 09b1ef9
2 parents 5b9a3a7 + 98c62e8
commit 09b1ef9
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/main/kotlin/com/github/denofevil/aurelia/Aurelia.kt b/src/main/kotlin/com/github/denofevil/aurelia/Aurelia.kt
@@ -44,14 +44,12 @@ object Aurelia {
                     val jsonFile = PsiManager.getInstance(project).findFile(virtualFile)
                     val jsonObject = (jsonFile as? JsonFile)?.topLevelValue as? JsonObject
 
-                    jsonObject?.findProperty("dependencies")?.let { dependenciesProp ->
-                        val dependenciesObject = dependenciesProp.value as? JsonObject
-                        val aureliaDependency = dependenciesObject?.findProperty("aurelia")
-                        val aureliaCliDependency = dependenciesObject?.findProperty("aurelia-cli")
-                        if (aureliaCliDependency != null || aureliaDependency != null) {
-                            hasDependency = true
-                            return@iterateChildrenRecursively false
-                        }
+                    val dependencies = jsonObject?.findProperty("dependencies")?.value as? JsonObject
+                    val devDependencies = jsonObject?.findProperty("devDependencies")?.value as? JsonObject
+
+                    if (hasAureliaDependency(dependencies) || hasAureliaDependency(devDependencies)) {
+                        hasDependency = true
+                        return@iterateChildrenRecursively false
                     }
                 }
 
@@ -61,4 +59,13 @@ object Aurelia {
 
         return hasDependency
     }
+
+    private fun hasAureliaDependency(jsonObject: JsonObject?): Boolean {
+        if (jsonObject == null) return false
+
+        val aureliaDependency = jsonObject.findProperty("aurelia")
+        val aureliaCliDependency = jsonObject.findProperty("aurelia-cli")
+
+        return aureliaDependency != null || aureliaCliDependency != null
+    }
 }