diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoParser.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoParser.kt index 9b3f7925d25..d56f7e627c0 100644 --- a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoParser.kt +++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoParser.kt @@ -15,7 +15,7 @@ object CodeMetaInfoParser { /* * ([\S&&[^,(){}]]+) -- tag, allowing all non-space characters except bracers and curly bracers - * ([{](.*?)[}])? -- list of platforms + * ([{](.*?)[}])? -- list of attributes * (\("(.*?)"\))? -- arguments of meta info * (, )? -- possible separator between different infos */ @@ -60,14 +60,14 @@ object CodeMetaInfoParser { val allMetaInfos = openingMatchResult.groups[2]!!.value tagRegex.findAll(allMetaInfos).map { it.groups }.forEach { val tag = it[1]!!.value - val platforms = it[3]?.value?.split(";") ?: emptyList() + val attributes = it[3]?.value?.split(";") ?: emptyList() val description = it[5]?.value result.add( ParsedCodeMetaInfo( openingMatchResult.range.first, closingMatchResult.range.first, - platforms.toMutableList(), + attributes.toMutableList(), tag, description ) diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt index 5135ddf25af..1867150a652 100644 --- a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt +++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.codeMetaInfo.model.CodeMetaInfo abstract class AbstractCodeMetaInfoRenderConfiguration(var renderParams: Boolean = true) { private val clickOrPressRegex = "Click or press (.*)to navigate".toRegex() // We have different hotkeys on different platforms - open fun asString(codeMetaInfo: CodeMetaInfo): String = codeMetaInfo.tag + getPlatformsString(codeMetaInfo) + open fun asString(codeMetaInfo: CodeMetaInfo): String = codeMetaInfo.tag + getAttributesString(codeMetaInfo) open fun getAdditionalParams(codeMetaInfo: CodeMetaInfo) = "" @@ -31,7 +31,7 @@ abstract class AbstractCodeMetaInfoRenderConfiguration(var renderParams: Boolean return sanitizedText } - protected fun getPlatformsString(codeMetaInfo: CodeMetaInfo): String { + protected fun getAttributesString(codeMetaInfo: CodeMetaInfo): String { if (codeMetaInfo.attributes.isEmpty()) return "" return "{${codeMetaInfo.attributes.joinToString(";")}}" } diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/DiagnosticCodeMetaInfoRenderConfiguration.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/DiagnosticCodeMetaInfoRenderConfiguration.kt index 6357a18f5cd..0218108e750 100644 --- a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/DiagnosticCodeMetaInfoRenderConfiguration.kt +++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/DiagnosticCodeMetaInfoRenderConfiguration.kt @@ -21,7 +21,7 @@ open class DiagnosticCodeMetaInfoRenderConfiguration( override fun asString(codeMetaInfo: CodeMetaInfo): String { if (codeMetaInfo !is DiagnosticCodeMetaInfo) return "" return (getTag(codeMetaInfo) - + getPlatformsString(codeMetaInfo) + + getAttributesString(codeMetaInfo) + getParamsString(codeMetaInfo)) .replace(crossPlatformLineBreak, "") } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticCodeMetaInfo.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticCodeMetaInfo.kt index fbb6af8262d..5042b2d400b 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticCodeMetaInfo.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticCodeMetaInfo.kt @@ -62,7 +62,7 @@ class FirDiagnosticCodeMetaRenderConfiguration( override fun asString(codeMetaInfo: CodeMetaInfo): String { if (codeMetaInfo !is FirDiagnosticCodeMetaInfo) return "" return (getTag(codeMetaInfo) - + getPlatformsString(codeMetaInfo) + + getAttributesString(codeMetaInfo) + getParamsString(codeMetaInfo)) .replace(crossPlatformLineBreak, "") }