fix(line-marker): Fix to use identifier

Per docs, line markers should always be to identifiers, not higher types
JetBrains · Jul 27, 2020 · 31bdc3c · 31bdc3c
1 parent 7ade45a
commit 31bdc3c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/kotlin/com/pestphp/pest/PestTestRunLineMarkerProvider.kt b/src/main/kotlin/com/pestphp/pest/PestTestRunLineMarkerProvider.kt
@@ -2,11 +2,17 @@ package com.pestphp.pest
 
 import com.intellij.execution.lineMarker.RunLineMarkerContributor
 import com.intellij.psi.PsiElement
+import com.jetbrains.php.lang.lexer.PhpTokenTypes
+import com.jetbrains.php.lang.psi.PhpPsiUtil
 import com.jetbrains.php.lang.psi.elements.impl.FunctionReferenceImpl
 
 class PestTestRunLineMarkerProvider : RunLineMarkerContributor() {
     override fun getInfo(leaf: PsiElement): Info? {
-        if (leaf !is FunctionReferenceImpl || !leaf.isPestTestReference()) {
+        if (!PhpPsiUtil.isOfType(leaf, PhpTokenTypes.IDENTIFIER)) {
+            return null
+        }
+
+        if (leaf.parent !is FunctionReferenceImpl || !leaf.parent.isPestTestReference()) {
             return null
         }
 

diff --git a/src/test/kotlin/com/pestphp/pest/PestTestRunLineMarkerProviderTest.kt b/src/test/kotlin/com/pestphp/pest/PestTestRunLineMarkerProviderTest.kt
@@ -11,15 +11,15 @@ class PestTestRunLineMarkerProviderTest : PestLightCodeFixture() {
     fun testMethodCallNamedItAndVariableTestIsNotPestTest() {
         val file = myFixture.configureByFile("MethodCallNamedItAndVariableTest.php")
 
-        val testElement = file.firstChild.lastChild.firstChild
+        val testElement = file.firstChild.lastChild.firstChild.firstChild
 
         assertNull(PestTestRunLineMarkerProvider().getInfo(testElement))
     }
 
     fun testFunctionCallNamedItWithDescriptionAndClosure() {
         val file = myFixture.configureByFile("PestItFunctionCallWithDescriptionAndClosure.php")
 
-        val testElement = file.firstChild.lastChild.firstChild
+        val testElement = file.firstChild.lastChild.firstChild.firstChild
 
         assertNotNull(PestTestRunLineMarkerProvider().getInfo(testElement))
     }