From 801d10229bd2e49729e6efb01c07c116aa8afaff Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Thu, 2 Jul 2015 09:49:22 +0300 Subject: [PATCH] Partially removed replaceHashWithStar --- .../org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt | 2 +- compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java | 1 + .../kotlin/test/util/RecursiveDescriptorComparator.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt index 80af13fc2d9..4e6409feb6c 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt @@ -92,7 +92,7 @@ public trait AbstractSMAPBaseTest { val files = data.substring(fileSectionStart, lineSection).split("\n") - val cleaned = files.map { JetTestUtils.replaceHashWithStar(it).replace("*", "HASH") }.join("\n") + val cleaned = files.join("\n") return data.substring(0, fileSectionStart) + cleaned + data.substring(lineSection) } diff --git a/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java index 203e0487449..91f12deeab4 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java @@ -950,6 +950,7 @@ public class JetTestUtils { @NotNull public static String replaceHashWithStar(@NotNull String string) { + //TODO: hashes are still used in SamWrapperCodegen Matcher matcher = STRIP_PACKAGE_PART_HASH_PATTERN.matcher(string); if (matcher.find()) { return matcher.replaceAll("\\$*"); diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java index 502ee4510c7..76f36eaa1f7 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java @@ -95,7 +95,7 @@ public class RecursiveDescriptorComparator { StringBuilder result = new StringBuilder(); appendDeclarationRecursively(declarationDescriptor, DescriptorUtils.getContainingModule(declarationDescriptor), new Printer(result, 1), true); - return JetTestUtils.replaceHashWithStar(result.toString()); + return result.toString(); } private void appendDeclarationRecursively(