-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(goto): Navigate between test and implementation
- Loading branch information
1 parent
2e69ec0
commit f1b63ac
Showing
11 changed files
with
215 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
package com.pestphp.pest.goto | ||
|
||
import com.intellij.psi.PsiElement | ||
import com.intellij.psi.PsiManager | ||
import com.intellij.psi.search.GlobalSearchScope | ||
import com.intellij.psi.util.PsiTreeUtil | ||
import com.intellij.testIntegration.TestFinder | ||
import com.intellij.util.indexing.FileBasedIndex | ||
import com.jetbrains.php.PhpIndex | ||
import com.jetbrains.php.lang.psi.elements.PhpClass | ||
import com.pestphp.pest.indexers.PestTestIndex | ||
import com.pestphp.pest.isPestTestFile | ||
import java.util.ArrayList | ||
|
||
class PestTestFinder : TestFinder { | ||
override fun findClassesForTest(element: PsiElement): MutableCollection<PhpClass> { | ||
return PhpIndex.getInstance(element.project) | ||
.getClassesByNameInScope( | ||
element.containingFile.name.removeSuffix("Test.php"), | ||
GlobalSearchScope.projectScope(element.project) | ||
) | ||
} | ||
|
||
override fun findSourceElement(from: PsiElement): PsiElement? { | ||
return from.containingFile | ||
} | ||
|
||
override fun isTest(element: PsiElement): Boolean { | ||
return element.containingFile.isPestTestFile() | ||
} | ||
|
||
override fun findTestsForClass(element: PsiElement): MutableCollection<PsiElement> { | ||
val phpClass = PsiTreeUtil.getNonStrictParentOfType(element, PhpClass::class.java) ?: return arrayListOf() | ||
|
||
return FileBasedIndex.getInstance().getAllKeys( | ||
PestTestIndex.key, | ||
element.project | ||
).filter { it.contains(phpClass.name) } | ||
.flatMap { | ||
FileBasedIndex.getInstance().getContainingFiles( | ||
PestTestIndex.key, | ||
it, | ||
GlobalSearchScope.projectScope(element.project) | ||
) | ||
} | ||
.map { PsiManager.getInstance(element.project).findFile(it)!! } | ||
.toCollection(ArrayList()) | ||
} | ||
} |
52 changes: 52 additions & 0 deletions
52
src/main/kotlin/com/pestphp/pest/indexers/PestTestIndex.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
package com.pestphp.pest.indexers | ||
|
||
import com.intellij.util.indexing.DataIndexer | ||
import com.intellij.util.indexing.FileBasedIndex | ||
import com.intellij.util.indexing.FileContent | ||
import com.intellij.util.indexing.ID | ||
import com.intellij.util.indexing.ScalarIndexExtension | ||
import com.intellij.util.io.EnumeratorStringDescriptor | ||
import com.intellij.util.io.KeyDescriptor | ||
import com.jetbrains.php.lang.psi.stubs.indexes.PhpConstantNameIndex | ||
import com.pestphp.pest.isPestTestFile | ||
import gnu.trove.THashMap | ||
|
||
class PestTestIndex : ScalarIndexExtension<String>() { | ||
override fun getName(): ID<String, Void> { | ||
return key | ||
} | ||
|
||
override fun getVersion(): Int { | ||
return 0 | ||
} | ||
|
||
override fun dependsOnFileContent(): Boolean { | ||
return true | ||
} | ||
|
||
override fun getIndexer(): DataIndexer<String, Void, FileContent> { | ||
return DataIndexer { inputData -> | ||
val file = inputData.psiFile | ||
|
||
if (!file.isPestTestFile()) { | ||
return@DataIndexer mapOf() | ||
} | ||
|
||
val map = THashMap<String, Void>() | ||
map[file.name] = null | ||
return@DataIndexer map | ||
} | ||
} | ||
|
||
override fun getInputFilter(): FileBasedIndex.InputFilter { | ||
return PhpConstantNameIndex.PHP_INPUT_FILTER | ||
} | ||
|
||
override fun getKeyDescriptor(): KeyDescriptor<String> { | ||
return EnumeratorStringDescriptor.INSTANCE | ||
} | ||
|
||
companion object { | ||
val key = ID.create<String, Void>("php.pest") | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
src/test/kotlin/com/pestphp/pest/goto/PestTestFinderTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package com.pestphp.pest.goto | ||
|
||
import com.jetbrains.php.lang.psi.PhpFile | ||
import com.jetbrains.php.lang.psi.PhpPsiUtil | ||
import com.pestphp.pest.tests.PestLightCodeFixture | ||
import junit.framework.TestCase | ||
|
||
class PestTestFinderTest : PestLightCodeFixture() { | ||
override fun getTestDataPath(): String? { | ||
return "src/test/resources/com/pestphp/pest/goto/PestTestFinder" | ||
} | ||
|
||
fun testPestTestIsTest() { | ||
val file = myFixture.configureByFile("test/App/UserTest.php") | ||
|
||
val testElement = file.firstChild.lastChild.firstChild | ||
|
||
assertTrue(PestTestFinder().isTest(testElement)) | ||
} | ||
|
||
fun testFileIsTest() { | ||
val file = myFixture.configureByFile("test/App/UserTest.php") | ||
|
||
assertTrue(PestTestFinder().isTest(file)) | ||
} | ||
|
||
fun testRandomElementIsTest() { | ||
val file = myFixture.configureByFile("test/App/UserTest.php") | ||
|
||
assertTrue(PestTestFinder().isTest(file.firstChild.children.random())) | ||
} | ||
|
||
fun testCanFindSourceElement() { | ||
val file = myFixture.configureByFile("App/User.php") | ||
|
||
TestCase.assertSame( | ||
file, | ||
PestTestFinder().findSourceElement( | ||
PhpPsiUtil.findAllClasses(file as PhpFile).first().methods.first() | ||
) | ||
) | ||
} | ||
} |
41 changes: 41 additions & 0 deletions
41
src/test/kotlin/com/pestphp/pest/indexers/PestTestIndexTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
package com.pestphp.pest.indexers | ||
|
||
import com.intellij.psi.search.GlobalSearchScope | ||
import com.intellij.util.indexing.FileBasedIndex | ||
import com.pestphp.pest.tests.PestLightCodeFixture | ||
import junit.framework.TestCase | ||
|
||
class PestTestIndexTest : PestLightCodeFixture() { | ||
override fun getTestDataPath(): String? { | ||
return "src/test/resources/com/pestphp/pest/indexers/PestTestIndexTest" | ||
} | ||
|
||
fun testPestTestFileIsIndexed() { | ||
val file = myFixture.configureByFile("FileWithPestTest.php") | ||
|
||
val indexes = FileBasedIndex.getInstance().getAllKeys(PestTestIndex.key, project) | ||
|
||
val files = FileBasedIndex.getInstance().getContainingFiles( | ||
PestTestIndex.key, | ||
indexes.first(), | ||
GlobalSearchScope.projectScope(project) | ||
) | ||
|
||
assertNotNull(file.virtualFile) | ||
assertContainsElements(files, file.virtualFile) | ||
} | ||
|
||
fun testPhpFileIsNotIndexed() { | ||
val file = myFixture.configureByFile("FileWithoutPestTest.php") | ||
|
||
val indexes = FileBasedIndex.getInstance().getAllKeys(PestTestIndex.key, project) | ||
|
||
val files = FileBasedIndex.getInstance().getContainingFiles( | ||
PestTestIndex.key, | ||
indexes.first(), | ||
GlobalSearchScope.projectScope(project) | ||
) | ||
|
||
assertDoesntContain(files, file.virtualFile) | ||
} | ||
} |
10 changes: 10 additions & 0 deletions
10
src/test/resources/com/pestphp/pest/goto/PestTestFinder/App/User.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?php | ||
|
||
namespace App; | ||
|
||
class User { | ||
public function getName(): String | ||
{ | ||
return "Oliver Nybroe"; | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
src/test/resources/com/pestphp/pest/goto/PestTestFinder/test/App/UserTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?php | ||
|
||
test("Can get user's name", function () { | ||
$user = new \App\User(); | ||
|
||
$this->asserEquals("Oliver Nybroe", $user->getName()); | ||
}); |
5 changes: 5 additions & 0 deletions
5
src/test/resources/com/pestphp/pest/indexers/PestTestIndexTest/FileWithPestTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<?php | ||
|
||
test('basic', function () { | ||
$this->assertTrue(true); | ||
}); |
3 changes: 3 additions & 0 deletions
3
src/test/resources/com/pestphp/pest/indexers/PestTestIndexTest/FileWithoutPestTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<?php | ||
|
||
echo "works"; |