MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

KTIJ-31334 Revert "Enable classpath mode for import by default"

Browse Source 
This reverts commit 214626f432e042d02b707e313b772ba0299f42d8.

(#KTIJ-31718, #IDEA-363166, #KTIJ-31709) Fixed


(cherry picked from commit e3f5e2d058d383aba778a649b82af9e7501eaeab)

IJ-CR-149861

GitOrigin-RevId: 789b7ee72b260538392a01f6e4f38440c43ba066
This commit is contained in:
Aleksei.Cherepanov
2024-11-20 14:22:30 +01:00
committed by intellij-monorepo-bot
parent 02a8b8e3b6
commit eae71268ca
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/kotlin/gradle/gradle-java/tests.shared/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt
View File

@@ -36,6 +36,13 @@ import kotlin.test.assertFailsWith
@RunWith(value = Parameterized::class)
@Suppress("ACCIDENTAL_OVERRIDE")
abstract class GradleKtsImportTest : KotlinGradleImportingTestCase() {
companion object {
@JvmStatic
@Suppress("ACCIDENTAL_OVERRIDE")
@Parameters(name = "{index}: with Gradle-{0}")
fun data(): Collection<Array<Any?>> = listOf(arrayOf("6.0.1"))
}
val projectDir: File get() = File(GradleSettings.getInstance(myProject).linkedProjectsSettings.first().externalProjectPath)
internal val scriptConfigurationManager: CompositeScriptConfigurationManager
@@ -111,7 +118,7 @@ abstract class GradleKtsImportTest : KotlinGradleImportingTestCase() {
val expectedErrorMessage = "Unresolved reference: unresolved"
val errors = events.filterIsInstance<MessageEventImpl>().filter { it.kind == MessageEvent.Kind.ERROR }
val buildScriptErrors = errors.filter { it.message.contains(expectedErrorMessage) }
val buildScriptErrors = errors.filter { it.message == expectedErrorMessage }
assertTrue(
"$expectedErrorMessage error has not been reported among other errors: $errors",
buildScriptErrors.isNotEmpty()

14
plugins/kotlin/gradle/gradle/src/org/jetbrains/kotlin/idea/gradle/scripting/importing/KotlinDslScriptModelResolverCommon.kt
View File

@@ -8,7 +8,6 @@ import com.intellij.openapi.util.IntellijInternalApi
import com.intellij.openapi.util.Pair
import org.gradle.tooling.model.kotlin.dsl.KotlinDslModelsParameters.*
import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.idea.gradleTooling.KotlinDslScriptAdditionalTask
import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
@@ -28,17 +27,4 @@ abstract class KotlinDslScriptModelResolverCommon : AbstractProjectResolverExten
override fun getExtraCommandLineArgs(): List<String> {
return listOf("-P$CORRELATION_ID_GRADLE_PROPERTY_NAME=${System.nanoTime()}")
}
override fun getExtraJvmArgs(): List<Pair<String, String>> {
return if (GradleVersion.current() >= GradleVersion.version("7.6")) {
listOf(
Pair(
PROVIDER_MODE_SYSTEM_PROPERTY_NAME,
CLASSPATH_MODE_SYSTEM_PROPERTY_VALUE
)
)
} else {
super.extraJvmArgs
}
}
}