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

Minor: use CompilerConfiguration#putIfNotNull for IC services

Browse Source
This commit is contained in:
Alexey Tsvetkov
2019-09-02 01:36:16 +03:00
parent a950226602
commit 4f3418dc89
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
+4 -19
View File
@@ -294,25 +294,10 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
} }
configuration.put(JSConfigurationKeys.MODULE_KIND, moduleKind) configuration.put(JSConfigurationKeys.MODULE_KIND, moduleKind)
val incrementalDataProvider = services[IncrementalDataProvider::class.java] configuration.putIfNotNull(JSConfigurationKeys.INCREMENTAL_DATA_PROVIDER, services[IncrementalDataProvider::class.java])
if (incrementalDataProvider != null) { configuration.putIfNotNull(JSConfigurationKeys.INCREMENTAL_RESULTS_CONSUMER, services[IncrementalResultsConsumer::class.java])
configuration.put(JSConfigurationKeys.INCREMENTAL_DATA_PROVIDER, incrementalDataProvider) configuration.putIfNotNull(CommonConfigurationKeys.LOOKUP_TRACKER, services[LookupTracker::class.java])
} configuration.putIfNotNull(CommonConfigurationKeys.EXPECT_ACTUAL_TRACKER, services[ExpectActualTracker::class.java])
val incrementalResultsConsumer = services[IncrementalResultsConsumer::class.java]
if (incrementalResultsConsumer != null) {
configuration.put(JSConfigurationKeys.INCREMENTAL_RESULTS_CONSUMER, incrementalResultsConsumer)
}
val lookupTracker = services[LookupTracker::class.java]
if (lookupTracker != null) {
configuration.put(CommonConfigurationKeys.LOOKUP_TRACKER, lookupTracker)
}
val expectActualTracker = services[ExpectActualTracker::class.java]
if (expectActualTracker != null) {
configuration.put(CommonConfigurationKeys.EXPECT_ACTUAL_TRACKER, expectActualTracker)
}
val sourceMapEmbedContentString = arguments.sourceMapEmbedSources val sourceMapEmbedContentString = arguments.sourceMapEmbedSources
var sourceMapContentEmbedding: SourceMapSourceEmbedding? = if (sourceMapEmbedContentString != null) var sourceMapContentEmbedding: SourceMapSourceEmbedding? = if (sourceMapEmbedContentString != null)