mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[kotlin] remove k1 dependencies from kotlin.gradle.gradle-java.tests.shared module
^KTIJ-37091 fixed GitOrigin-RevId: eeb32d2fbb98108c3ec2e65ba430da3e0f048759
This commit is contained in:
committed by
intellij-monorepo-bot
parent
8e26866689
commit
2274c0ebe9
@@ -61,7 +61,7 @@ jvm_library(
|
||||
"//plugins/kotlin/base/project-model",
|
||||
"//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared",
|
||||
"//platform/external-system-impl:externalSystem-tests_test_lib",
|
||||
"//plugins/kotlin/idea/tests:tests_test_lib",
|
||||
"//plugins/kotlin/intellij.kotlin.base.test:base-test_test_lib",
|
||||
"//libraries/fastutil",
|
||||
"@lib//:kotlinc-kotlin-compiler-tests",
|
||||
"//plugins/kotlin/base/facet",
|
||||
@@ -72,7 +72,6 @@ jvm_library(
|
||||
"//plugins/kotlin/gradle/gradle-java:gradle-java_test_lib",
|
||||
"//plugins/kotlin/gradle/gradle",
|
||||
"//plugins/kotlin/completion/tests-shared:kotlin-completion-tests-shared_test_lib",
|
||||
"//plugins/kotlin/idea",
|
||||
"//plugins/kotlin/base/indices",
|
||||
"//plugins/kotlin/base/util",
|
||||
"//plugins/kotlin/base/util:util_test_lib",
|
||||
|
||||
+1
-2
@@ -40,7 +40,7 @@
|
||||
<orderEntry type="module" module-name="intellij.kotlin.base.projectModel" scope="TEST" />
|
||||
<orderEntry type="module" module-name="kotlin.highlighting.shared" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.platform.externalSystem.tests" scope="TEST" />
|
||||
<orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.kotlin.base.test" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.libraries.fastutil" scope="TEST" />
|
||||
<orderEntry type="library" name="kotlinc.kotlin-compiler-tests" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.kotlin.base.facet" scope="TEST" />
|
||||
@@ -49,7 +49,6 @@
|
||||
<orderEntry type="module" module-name="kotlin.gradle.gradle-java" />
|
||||
<orderEntry type="module" module-name="intellij.kotlin.gradle.gradle" scope="TEST" />
|
||||
<orderEntry type="module" module-name="kotlin.completion.tests.shared" scope="TEST" />
|
||||
<orderEntry type="module" module-name="kotlin.idea" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.kotlin.base.indices" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.kotlin.base.util" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.kotlin.base.psi" scope="TEST" />
|
||||
|
||||
+6
-5
@@ -10,11 +10,10 @@ import com.intellij.testFramework.runInEdtAndGet
|
||||
import org.jetbrains.kotlin.gradle.multiplatformTests.KotlinSyncTestsContext
|
||||
import org.jetbrains.kotlin.gradle.multiplatformTests.testFeatures.checkers.highlighting.TestFeatureWithFileMarkup
|
||||
import org.jetbrains.kotlin.idea.KotlinFileType
|
||||
import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
|
||||
import org.jetbrains.kotlin.idea.kdoc.findKDoc
|
||||
import org.jetbrains.kotlin.idea.kdoc.findKDocByPsi
|
||||
import org.jetbrains.kotlin.idea.references.mainReference
|
||||
import org.jetbrains.kotlin.idea.search.ExpectActualUtils
|
||||
import org.jetbrains.kotlin.psi.KtDeclaration
|
||||
import org.jetbrains.kotlin.psi.KtElement
|
||||
import org.jetbrains.kotlin.psi.KtNameReferenceExpression
|
||||
import org.jetbrains.plugins.gradle.settings.GradleSystemSettings
|
||||
import java.io.File
|
||||
@@ -73,10 +72,12 @@ object DocumentationChecker : TestFeatureWithFileMarkup<DocumentationCheckerConf
|
||||
?: error("element at caret is not found in the file '$relativePath'[$line:$offset]")
|
||||
val referenceExpression = caretElement.parent as? KtNameReferenceExpression
|
||||
?: error("caret is expected at reference expression")
|
||||
val element = referenceExpression.mainReference.resolve() as KtElement
|
||||
val element = referenceExpression.mainReference.resolve() as KtDeclaration
|
||||
val navigationElement = element.navigationElement as? KtDeclaration
|
||||
?: error("documentation can be only on KtDeclaration")
|
||||
val docText: String? = navigationElement.findKDoc { DescriptorToSourceUtilsIde.getAnyDeclaration(testProject, it) }?.contentTag?.getContent()
|
||||
val docText: String? =
|
||||
(navigationElement.findKDocByPsi()
|
||||
?: (ExpectActualUtils.liftToExpect(element)?.navigationElement as? KtDeclaration)?.findKDocByPsi())?.contentTag?.getContent()
|
||||
return@map """
|
||||
|$relativePath:$line:$offset
|
||||
|$docText
|
||||
|
||||
-32
@@ -2,20 +2,11 @@
|
||||
|
||||
package org.jetbrains.kotlin.idea.run
|
||||
|
||||
import com.intellij.execution.PsiLocation
|
||||
import com.intellij.execution.RunManager
|
||||
import com.intellij.execution.actions.ConfigurationContext
|
||||
import com.intellij.execution.actions.ConfigurationFromContext
|
||||
import com.intellij.execution.impl.RunManagerImpl
|
||||
import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl
|
||||
import com.intellij.execution.junit.JUnitConfiguration
|
||||
import com.intellij.execution.junit.TestInClassConfigurationProducer
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.openapi.vfs.VirtualFile
|
||||
import com.intellij.openapi.vfs.isFile
|
||||
import com.intellij.psi.PsiElement
|
||||
import com.intellij.psi.PsiManager
|
||||
import com.intellij.psi.impl.file.PsiDirectoryFactory
|
||||
import com.intellij.refactoring.RefactoringFactory
|
||||
import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
|
||||
import org.jetbrains.kotlin.idea.base.util.allScope
|
||||
@@ -133,26 +124,3 @@ class KotlinJUnitRunConfigurationTest : AbstractRunConfigurationBaseTest() {
|
||||
override fun getTestDataDirectory() = IDEA_TEST_DATA_DIR.resolve("runConfigurations/junit")
|
||||
}
|
||||
|
||||
fun getConfigurations(file: VirtualFile, project: Project, pattern: String): List<ConfigurationFromContext> {
|
||||
val location: PsiLocation<PsiElement?> =
|
||||
when {
|
||||
file.isFile -> {
|
||||
val psiFile = PsiManager.getInstance(project).findFile(file) ?: error("PsiFile not found for $file")
|
||||
val offset = psiFile.text.indexOf(pattern)
|
||||
val psiElement = psiFile.findElementAt(offset)
|
||||
PsiLocation(psiElement)
|
||||
}
|
||||
file.isDirectory -> {
|
||||
val directory = PsiDirectoryFactory.getInstance(project).createDirectory(file)
|
||||
PsiLocation(directory)
|
||||
}
|
||||
else -> {
|
||||
error("")
|
||||
}
|
||||
}
|
||||
val context = ConfigurationContext.createEmptyContextForLocation(location)
|
||||
return context.configurationsFromContext.orEmpty()
|
||||
}
|
||||
|
||||
fun getConfiguration(file: VirtualFile, project: Project, pattern: String): ConfigurationFromContext =
|
||||
getConfigurations(file, project, pattern).singleOrNull() ?: error("Configuration not found for pattern $pattern")
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package org.jetbrains.kotlin.idea.run
|
||||
|
||||
import com.intellij.execution.PsiLocation
|
||||
import com.intellij.execution.actions.ConfigurationContext
|
||||
import com.intellij.execution.actions.ConfigurationFromContext
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.openapi.vfs.VirtualFile
|
||||
import com.intellij.openapi.vfs.isFile
|
||||
import com.intellij.psi.PsiElement
|
||||
import com.intellij.psi.PsiManager
|
||||
import com.intellij.psi.impl.file.PsiDirectoryFactory
|
||||
|
||||
fun getConfigurations(file: VirtualFile, project: Project, pattern: String): List<ConfigurationFromContext> {
|
||||
val location: PsiLocation<PsiElement?> =
|
||||
when {
|
||||
file.isFile -> {
|
||||
val psiFile = PsiManager.getInstance(project).findFile(file) ?: error("PsiFile not found for $file")
|
||||
val offset = psiFile.text.indexOf(pattern)
|
||||
val psiElement = psiFile.findElementAt(offset)
|
||||
PsiLocation(psiElement)
|
||||
}
|
||||
file.isDirectory -> {
|
||||
val directory = PsiDirectoryFactory.getInstance(project).createDirectory(file)
|
||||
PsiLocation(directory)
|
||||
}
|
||||
else -> {
|
||||
error("")
|
||||
}
|
||||
}
|
||||
val context = ConfigurationContext.createEmptyContextForLocation(location)
|
||||
return context.configurationsFromContext.orEmpty()
|
||||
}
|
||||
|
||||
fun getConfiguration(file: VirtualFile, project: Project, pattern: String): ConfigurationFromContext =
|
||||
getConfigurations(file, project, pattern).singleOrNull() ?: error("Configuration not found for pattern $pattern")
|
||||
Reference in New Issue
Block a user