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

[CMI] Fix clearing code meta infos from original text

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-03 16:52:58 +03:00
parent 7960182674
commit 1c91b74ff0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoParser.kt
+4 -2
View File
@@ -8,8 +8,10 @@ package org.jetbrains.kotlin.codeMetaInfo
import org.jetbrains.kotlin.codeMetaInfo.model.ParsedCodeMetaInfo import org.jetbrains.kotlin.codeMetaInfo.model.ParsedCodeMetaInfo
object CodeMetaInfoParser { object CodeMetaInfoParser {
private val openingRegex = """(<!([^"]*?(".*?")?[^"]*?)!>)""".toRegex() val openingRegex = """(<!([^"]*?((".*?")(, ".*?")*?)?[^"]*?)!>)""".toRegex()
private val closingRegex = """(<!>)""".toRegex() val closingRegex = """(<!>)""".toRegex()
val openingOrClosingRegex = """(${closingRegex.pattern}|${openingRegex.pattern})""".toRegex()
/* /*
* ([\S&&[^,(){}]]+) -- tag, allowing all non-space characters except bracers and curly bracers * ([\S&&[^,(){}]]+) -- tag, allowing all non-space characters except bracers and curly bracers
compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoRenderer.kt
+1 -1
View File
@@ -106,4 +106,4 @@ fun clearFileFromDiagnosticMarkup(file: File) {
file.writeText(cleanText) file.writeText(cleanText)
} }
fun clearTextFromDiagnosticMarkup(text: String): String = CheckerTestUtil.rangeStartOrEndPattern.matcher(text).replaceAll("") fun clearTextFromDiagnosticMarkup(text: String): String = text.replace(CodeMetaInfoParser.openingOrClosingRegex, "")