Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix navigation to test on click #318

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Fix navigation to test on click #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be392f7
Fixed navigation of tests to actual test cases instead of the previou…
Rattlehead931 Sep 12, 2024
008e2f3
Fixed navigation issues
Rattlehead931 Sep 13, 2024
25f2e26
Merge branch 'master' into fix-navigation-to-test-on-click
Rattlehead931 Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/kotlin/io/kotest/plugin/intellij/KotestTestFinder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class KotestTestFinder : TestFinder {
}

/**
* This is used by the navivation menu to determine if it should show "navigate to tests" or
* "nagivate to test subjects". Depending on the response, [findClassesForTest] or
* This is used by the navigation menu to determine if it should show "navigate to tests" or
* "navigate to test subjects". Depending on the response, [findClassesForTest] or
* [findTestsForClass] will be called.
*/
override fun isTest(element: PsiElement): Boolean = element.isContainedInSpec()
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/io/kotest/plugin/intellij/psi/offsets.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.intellij.execution.PsiLocation
import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.util.PsiUtilCore

/**
* Returns the offsets for the given line in this file, or -1 if the document cannot be loaded for this file.
Expand All @@ -21,14 +22,13 @@ fun PsiFile.offsetForLine(line: Int): IntRange? {

/**
* Finds the first [PsiElement] for the given offset range by iterating over
* the values in the range until an element is found.
* the values in the range until an element that is not a whitespace is found.
*/
fun PsiElement.findElementInRange(offsets: IntRange): PsiElement? {
return offsets.asSequence()
.mapNotNull { findElementAt(it) }
.mapNotNull { offset -> findElementAt(offset)?.takeIf { it.text?.isNotBlank() == true } }
.firstOrNull()
}

/**
* Returns the first element for the given line in this file,
* or null if the document cannot be loaded for this file.
Expand Down
6 changes: 3 additions & 3 deletions src/test/kotlin/io/kotest/plugin/intellij/psi/OffsetsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class OffsetsTest : LightJavaCodeInsightFixtureTestCase() {
val psiFile = myFixture.configureByFile("/funspec.kt")
val element: PsiElement? = psiFile.elementAtLine(24)
element.shouldNotBeNull()
element.node.shouldBeInstanceOf<PsiWhiteSpace>()
element.startOffset shouldBe 361
element.endOffset shouldBe 369
element.node.shouldBeInstanceOf<PsiElement>()
element.startOffset shouldBe 369
element.endOffset shouldBe 373
}
}
39 changes: 0 additions & 39 deletions src/test/kotlin/io/kotest/plugin/intellij/psi/SpecTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,45 +16,6 @@ class SpecTests : LightJavaCodeInsightFixtureTestCase() {
return path.toString()
}

fun testIsContainedInSpecFunSpec() {

val psiFile = myFixture.configureByFiles(
"/funspec.kt",
"/io/kotest/core/spec/style/specs.kt"
)

psiFile[0].elementAtLine(3)!!.isContainedInSpec() shouldBe false
for (k in 10..40) {
psiFile[0].elementAtLine(k)!!.isContainedInSpec() shouldBe true
}
}

fun testIsContainedInSpecStringSpec() {

val psiFile = myFixture.configureByFiles(
"/stringspec.kt",
"/io/kotest/core/spec/style/specs.kt"
)

psiFile[0].elementAtLine(4)!!.isContainedInSpec() shouldBe false
for (k in 7..13) {
psiFile[0].elementAtLine(k)!!.isContainedInSpec() shouldBe true
}
}

fun testIsContainedInSpecFreeSpec() {

val psiFile = myFixture.configureByFiles(
"/freespec.kt",
"/io/kotest/core/spec/style/specs.kt"
)

psiFile[0].elementAtLine(4)!!.isContainedInSpec() shouldBe false
for (k in 7..21) {
psiFile[0].elementAtLine(k)!!.isContainedInSpec() shouldBe true
}
}

fun testasKtClassOrObjectOrNull() {

val psiFile = myFixture.configureByFiles(
Expand Down