Merge pull request #29 from olivernybroe/fix-blade

Fix foreach inspection running on blade files

CHANGELOG.md

@@ -3,6 +3,10 @@
 # collections-intellij Changelog
 
 ## [Unreleased]
+### Fixed
+- Ignore foreach to collection in blade files
+
+## [0.0.1-EAP.7]
 ### Added
 - Added closure to arrow function inside collection
 

gradle.properties

@@ -3,15 +3,15 @@
 
 pluginGroup = dev.nybroe.collector
 pluginName_ = Collector
-pluginVersion = 0.0.1-EAP.7
+pluginVersion = 0.0.1-EAP.8
 pluginSinceBuild = 193
 pluginUntilBuild =
 
 platformType = IU
 platformVersion = 2020.2.3
 platformDownloadSources = true
 # Get latest version from https://plugins.jetbrains.com/plugin/6610-php/versions
-platformPlugins = com.jetbrains.php:202.7660.42
+platformPlugins = com.jetbrains.php:202.7660.42, com.jetbrains.php.blade:202.7319.5
 
 # Opt-out flag for bundling Kotlin standard library.
 # See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details.

src/main/kotlin/dev/nybroe/collector/blade/BladePhpInspectionSuppressor.kt

@@ -0,0 +1,36 @@
+package dev.nybroe.collector.blade
+
+import com.intellij.codeInspection.InspectionSuppressor
+import com.intellij.codeInspection.SuppressQuickFix
+import com.intellij.psi.PsiElement
+import com.jetbrains.php.blade.psi.BladePsiDirectiveParameter
+import com.jetbrains.php.blade.psi.BladePsiLanguageInjectionHost
+import com.jetbrains.php.blade.psi.BladePsiPhpBlock
+import com.jetbrains.php.blade.psi.BladeTokenTypes
+import dev.nybroe.collector.inspections.ForeachToCollectionInspection
+
+class BladePhpInspectionSuppressor : InspectionSuppressor {
+    companion object {
+        private val SUPPRESSED_PHP_INSPECTIONS = listOf(ForeachToCollectionInspection().id)
+    }
+
+    override fun isSuppressedFor(element: PsiElement, toolId: String): Boolean {
+        if (element !is BladePsiLanguageInjectionHost) {
+            return false
+        }
+
+        if (element is BladePsiPhpBlock) {
+            return false
+        }
+
+        if (element is BladePsiDirectiveParameter && element.directiveElementType === BladeTokenTypes.PHP_DIRECTIVE) {
+            return false
+        }
+
+        return SUPPRESSED_PHP_INSPECTIONS.contains(toolId)
+    }
+
+    override fun getSuppressActions(element: PsiElement?, toolId: String): Array<SuppressQuickFix> {
+        return SuppressQuickFix.EMPTY_ARRAY
+    }
+}

src/main/resources/META-INF/blade.xml

@@ -0,0 +1,8 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="com.intellij">
+        <lang.inspectionSuppressor
+            language="Blade"
+            implementationClass="dev.nybroe.collector.blade.BladePhpInspectionSuppressor"
+        />
+    </extensions>
+</idea-plugin>

src/main/resources/META-INF/plugin.xml

@@ -2,11 +2,11 @@
     <id>dev.nybroe.collector</id>
     <name>Collector</name>
     <vendor email="[email protected]" url="https://nybroe.dev">Oliver Nybroe</vendor>
-
     <!-- Product and plugin compatibility requirements -->
     <!-- https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html -->
     <depends>com.intellij.modules.platform</depends>
     <depends>com.jetbrains.php</depends>
+    <depends optional="true" config-file="blade.xml">com.jetbrains.php.blade</depends>
 
     <extensions defaultExtensionNs="com.intellij">
         <localInspection

src/test/kotlin/dev/nybroe/collector/inspections/ForeachToCollectionInspectionTest.kt

@@ -50,4 +50,8 @@ internal class ForeachToCollectionInspectionTest : InspectionTest() {
     fun testForeachStringInterpolationWithPropertyAccess() {
         doTest("foreach-string-interpolation-with-property-access")
     }
+
+    fun testForeachBladeDirectives() {
+        doNotMatchTest("foreach-blade-directive.blade")
+    }
 }

src/test/resources/inspections/ForeachToCollectionInspection/nonMatches/foreach-blade-directive.blade.php

@@ -0,0 +1,3 @@
+@foreach ($items as $item)
+    <li>{{ $item }}</li>
+@endforeach