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

[CMI] Rename CodeMetaInfo.platforms to attributes

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-02 15:45:06 +03:00
parent ced9a6fe35
commit 3bf60b3acc
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt
+4 -4
View File
@@ -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
)
}
idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/HighlightingCodeMetaInfo.kt
+1 -1
View File
@@ -21,7 +21,7 @@ class HighlightingCodeMetaInfo(
override val tag: String
get() = renderConfiguration.getTag()
override val platforms: MutableList<String> = mutableListOf()
override val attributes: MutableList<String> = mutableListOf()
override fun asString(): String = renderConfiguration.asString(this)
}
idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/models/LineMarkerCodeMetaInfo.kt
+1 -1
View File
@@ -21,7 +21,7 @@ class LineMarkerCodeMetaInfo(
override val tag: String
get() = renderConfiguration.getTag()
override val platforms: MutableList<String> = mutableListOf()
override val attributes: MutableList<String> = mutableListOf()
override fun asString(): String = renderConfiguration.asString(this)
}