MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Fixed logging in KotlinMavenImporterEx

Browse Source 
KTIJ-29261

GitOrigin-RevId: 29df70ea6467c3112e1e211c0d1dd0997f12fdc6
This commit is contained in:
Frederik Haselmeier
2024-08-13 10:46:27 +02:00
committed by intellij-monorepo-bot
parent 27c01bd409
commit a4a2ee75a8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterEx.kt
View File

@@ -134,7 +134,7 @@ class KotlinMavenImporterEx : KotlinMavenImporter(), MavenWorkspaceFacetConfigur
val commonArguments = KotlinCommonCompilerArgumentsHolder.getInstance(project).settings
if (compilerArguments == null) {
val targetPlatform = platform ?: getDefaultTargetPlatform(project)
LOG.debug("Detected target platform {0}", targetPlatform)
LOG.debug("Detected target platform ", targetPlatform)
val argumentsForPlatform = IdePlatformKindProjectStructure.getInstance(project)
.getCompilerArguments(targetPlatform.idePlatformKind)
@@ -161,7 +161,7 @@ class KotlinMavenImporterEx : KotlinMavenImporter(), MavenWorkspaceFacetConfigur
if (shouldInferLanguageLevel) {
languageLevel = (if (useProjectSettings) LanguageVersion.fromVersionString(commonArguments.languageVersion) else null)
?: getDefaultLanguageLevel(compilerVersion, coerceRuntimeLibraryVersionToReleased = false)
LOG.debug("Inferred languageLevel to {0}", languageLevel)
LOG.debug("Inferred languageLevel to ", languageLevel)
}
if (shouldInferAPILevel) {
@@ -185,7 +185,7 @@ class KotlinMavenImporterEx : KotlinMavenImporter(), MavenWorkspaceFacetConfigur
languageLevel
}
}
LOG.debug("Inferred apiLevel to {0}", apiLevel)
LOG.debug("Inferred apiLevel to ", apiLevel)
}
// end of initialize
this.pureKotlinSourceFolders = pureKotlinSourceFolders
@@ -198,6 +198,7 @@ class KotlinMavenImporterEx : KotlinMavenImporter(), MavenWorkspaceFacetConfigur
val executionArguments = mavenPlugin.executions
?.firstOrNull { it.goals.any { s -> s in compilationGoals } }
?.configurationElement?.let { getCompilerArgumentsByConfigurationElement(mavenProject, it, configuredPlatform, project) }
LOG.debug("Parsing compiler arguments: ", sharedArguments.args)
parseCompilerArgumentsToFacetSettings(sharedArguments.args, kotlinFacetSettings, null) //modifiableModelsProvider -> null
if (executionArguments != null) {
parseCompilerArgumentsToFacetSettings(executionArguments.args, kotlinFacetSettings, null) //modifiableModelsProvider -> null