[K2] Fix sample resolving (#3361)HEADmaster

* [K2] Fix sample

Fallback to default roots of the source set even if sample roots are assigned

* [K2] Resolve java samples as well

`sourcePsiSafe` does not support Java KT-53669

1 files changed, 0 insertions, 8 deletions

diff --git a/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/sample/SampleAnalysisTest.kt b/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/sample/SampleAnalysisTest.kt
index 3b8a2afd..fbd11fd7 100644
--- a/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/sample/SampleAnalysisTest.kt
+++ b/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/sample/SampleAnalysisTest.kt
@@ -10,7 +10,6 @@ import org.jetbrains.dokka.analysis.test.api.mixedJvmTestProject
 import org.jetbrains.dokka.analysis.test.api.useServices
 import org.jetbrains.dokka.analysis.test.api.util.CollectingDokkaConsoleLogger
 import org.jetbrains.dokka.analysis.test.api.util.singleSourceSet
-import org.junit.jupiter.api.Tag
 import kotlin.test.*
 
 class SampleAnalysisTest {
@@ -75,7 +74,6 @@ class SampleAnalysisTest {
     }
 
     @Test
-    @Tag("onlyDescriptors") // TODO #3359
     fun `should resolve a valid sample if set via the additionalSourceRoots option`() {
         val testProject = kotlinJvmTestProject {
             dokkaConfiguration {
@@ -135,7 +133,6 @@ class SampleAnalysisTest {
     }
 
     @Test
-    @Tag("onlyDescriptors") // TODO #3359
     fun `should resolve a valid sample function that exists in the main source set`() {
         val testProject = kotlinJvmTestProject {
             ktFile("org/jetbrains/dokka/test/MyKotlinFile.kt") {
@@ -325,7 +322,6 @@ class SampleAnalysisTest {
     }
 
     @Test
-    @Tag("onlyDescriptors") // TODO #3359
     fun `should return null if trying to resolve a non-kotlin sample link`() {
         val testProject = mixedJvmTestProject {
             kotlinSourceDirectory {
@@ -366,7 +362,6 @@ class SampleAnalysisTest {
     }
 
     @Test
-    @Tag("onlyDescriptors") // TODO #3359
     fun `should filter out empty import statement lines`() {
         val testProject = kotlinJvmTestProject {
             ktFile("org/jetbrains/dokka/test/MyKotlinFile.kt") {
@@ -403,7 +398,6 @@ class SampleAnalysisTest {
     }
 
     @Test
-    @Tag("onlyDescriptors") // TODO #3359
     fun `should return an empty list of imports if sample file has none`() {
         val testProject = kotlinJvmTestProject {
             ktFile("org/jetbrains/dokka/test/MyKotlinFile.kt") {
@@ -430,7 +424,6 @@ class SampleAnalysisTest {
     }
 
     @Test
-    @Tag("onlyDescriptors") // TODO #3359
     fun `should filter out leading and trailing line breaks`() {
         val testProject = kotlinJvmTestProject {
             ktFile("org/jetbrains/dokka/test/MyKotlinFile.kt") {
@@ -459,7 +452,6 @@ class SampleAnalysisTest {
     }
 
     @Test
-    @Tag("onlyDescriptors") // TODO #3359
     fun `should filter out trailing whitespace`() {
         val testProject = kotlinJvmTestProject {
             ktFile("org/jetbrains/dokka/test/MyKotlinFile.kt") {