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

Revert "Add temporary fixMeExtensions to pass test on extensions check"

Browse Source 
KTI-267
This commit is contained in:
Yunir Salimzyanov
2020-06-05 14:58:02 +03:00
parent 571cab305c
commit b8cbfcbe7e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
+1 -2
View File
@@ -117,13 +117,12 @@ class CodeConformanceTest : TestCase() {
fun testForgottenBunchDirectivesAndFiles() { fun testForgottenBunchDirectivesAndFiles() {
val root = File("").absoluteFile val root = File("").absoluteFile
val extensions = File(root, ".bunch").readLines().map { it.split("_") }.flatten().toSet() val extensions = File(root, ".bunch").readLines().map { it.split("_") }.flatten().toSet()
val fixMeExtensions = setOf("191", "as35")
val failBuilder = mutableListOf<String>() val failBuilder = mutableListOf<String>()
for (sourceFile in FileUtil.findFilesByMask(SOURCES_BUNCH_FILE_PATTERN, root)) { for (sourceFile in FileUtil.findFilesByMask(SOURCES_BUNCH_FILE_PATTERN, root)) {
if (EXCLUDED_FILES_AND_DIRS.any { FileUtil.isAncestor(it, sourceFile, false) }) continue if (EXCLUDED_FILES_AND_DIRS.any { FileUtil.isAncestor(it, sourceFile, false) }) continue
val matches = Regex("BUNCH (\\w+)").findAll(sourceFile.readText()) val matches = Regex("BUNCH (\\w+)").findAll(sourceFile.readText())
.map { it.groupValues[1] }.toSet().filterNot { it in extensions || it in fixMeExtensions } .map { it.groupValues[1] }.toSet().filterNot { it in extensions }
for (bunch in matches) { for (bunch in matches) {
val filename = FileUtil.toSystemIndependentName(sourceFile.absoluteFile.toRelativeString(root)) val filename = FileUtil.toSystemIndependentName(sourceFile.absoluteFile.toRelativeString(root))
failBuilder.add("$filename has unregistered $bunch bunch directive") failBuilder.add("$filename has unregistered $bunch bunch directive")