From 3bf60b3accf487449e6a958ff566940790d98301 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 2 Dec 2020 15:45:06 +0300 Subject: [PATCH] [CMI] Rename `CodeMetaInfo.platforms` to `attributes` --- .../jetbrains/kotlin/codeMetaInfo/model/CodeMetaInfo.kt | 2 +- .../kotlin/codeMetaInfo/model/DiagnosticCodeMetaInfo.kt | 2 +- .../kotlin/codeMetaInfo/model/ParsedCodeMetaInfo.kt | 2 +- .../AbstractCodeMetaInfoRenderConfiguration.kt | 4 ++-- .../kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt | 8 ++++---- .../idea/codeMetaInfo/models/HighlightingCodeMetaInfo.kt | 2 +- .../idea/codeMetaInfo/models/LineMarkerCodeMetaInfo.kt | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/CodeMetaInfo.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/CodeMetaInfo.kt index bcb4798ca1f..aec752b7a48 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/CodeMetaInfo.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/CodeMetaInfo.kt @@ -12,7 +12,7 @@ interface CodeMetaInfo { val end: Int val tag: String val renderConfiguration: AbstractCodeMetaInfoRenderConfiguration - val platforms: MutableList + val attributes: MutableList fun asString(): String } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/DiagnosticCodeMetaInfo.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/DiagnosticCodeMetaInfo.kt index 0867f996da0..e2d5afce7a4 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/DiagnosticCodeMetaInfo.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/DiagnosticCodeMetaInfo.kt @@ -24,7 +24,7 @@ class DiagnosticCodeMetaInfo( override val tag: String get() = renderConfiguration.getTag(this) - override val platforms: MutableList = mutableListOf() + override val attributes: MutableList = mutableListOf() override fun asString(): String = renderConfiguration.asString(this) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/ParsedCodeMetaInfo.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/ParsedCodeMetaInfo.kt index 2e15df0e8eb..5e2d93bbc74 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/ParsedCodeMetaInfo.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/ParsedCodeMetaInfo.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.codeMetaInfo.renderConfigurations.AbstractCodeMetaIn class ParsedCodeMetaInfo( override val start: Int, override val end: Int, - override val platforms: MutableList, + override val attributes: MutableList, override val tag: String, val description: String? ) : CodeMetaInfo { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt index 3c72f7329da..5135ddf25af 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt @@ -32,7 +32,7 @@ abstract class AbstractCodeMetaInfoRenderConfiguration(var renderParams: Boolean } protected fun getPlatformsString(codeMetaInfo: CodeMetaInfo): String { - if (codeMetaInfo.platforms.isEmpty()) return "" - return "{${codeMetaInfo.platforms.joinToString(";")}}" + if (codeMetaInfo.attributes.isEmpty()) return "" + return "{${codeMetaInfo.attributes.joinToString(";")}}" } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt index 17ce19618b9..33032319348 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt @@ -161,13 +161,13 @@ class CodeMetaInfoTestCase( val correspondingParsed = parsedMetaInfo.firstOrNull { it == codeMetaInfo } if (correspondingParsed != null) { parsedMetaInfo.remove(correspondingParsed) - codeMetaInfo.platforms.addAll(correspondingParsed.platforms) - if (correspondingParsed.platforms.isNotEmpty() && OSKind.current.toString() !in correspondingParsed.platforms) - codeMetaInfo.platforms.add(OSKind.current.toString()) + codeMetaInfo.attributes.addAll(correspondingParsed.attributes) + if (correspondingParsed.attributes.isNotEmpty() && OSKind.current.toString() !in correspondingParsed.attributes) + codeMetaInfo.attributes.add(OSKind.current.toString()) } } parsedMetaInfo.forEach { - if (it.platforms.isNotEmpty() && OSKind.current.toString() !in it.platforms) codeMetaInfoForCheck.add( + if (it.attributes.isNotEmpty() && OSKind.current.toString() !in it.attributes) codeMetaInfoForCheck.add( it ) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/HighlightingCodeMetaInfo.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/HighlightingCodeMetaInfo.kt index d47a5480a59..f0c902caa16 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/HighlightingCodeMetaInfo.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/HighlightingCodeMetaInfo.kt @@ -21,7 +21,7 @@ class HighlightingCodeMetaInfo( override val tag: String get() = renderConfiguration.getTag() - override val platforms: MutableList = mutableListOf() + override val attributes: MutableList = mutableListOf() override fun asString(): String = renderConfiguration.asString(this) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/LineMarkerCodeMetaInfo.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/LineMarkerCodeMetaInfo.kt index c397e6f67d5..8e964a0f2c4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/LineMarkerCodeMetaInfo.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/LineMarkerCodeMetaInfo.kt @@ -21,7 +21,7 @@ class LineMarkerCodeMetaInfo( override val tag: String get() = renderConfiguration.getTag() - override val platforms: MutableList = mutableListOf() + override val attributes: MutableList = mutableListOf() override fun asString(): String = renderConfiguration.asString(this) }