azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warn about mistyped phase names in CLI

Browse Source
This commit is contained in:
Georgy Bronnikov
2019-03-19 11:00:54 +03:00
parent 0fb444a5d1
commit 469fd20902
4 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/createPhaseConfig.kt
+13 -1
View File
@@ -9,6 +9,8 @@ import org.jetbrains.kotlin.backend.common.phaser.AnyNamedPhase
import org.jetbrains.kotlin.backend.common.phaser.CompilerPhase
import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
import org.jetbrains.kotlin.backend.common.phaser.toPhaseMap
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.CompilerConfigurationKey
@@ -54,5 +56,15 @@ private fun phaseSetFromConfiguration(
): Set<AnyNamedPhase> {
val phaseNames = config.get(key) ?: emptySet()
if ("ALL" in phaseNames) return phases.values.toSet()
return phaseNames.map { phases[it]!! }.toSet()
return phaseNames.mapNotNull {
phases[it] ?: run {
warn(config, "no phase named $it, ignoring")
null
}
}.toSet()
}
private fun warn(config: CompilerConfiguration, message: String) {
val messageCollector = config.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY) ?: MessageCollector.NONE
messageCollector.report(CompilerMessageSeverity.WARNING, message)
}