From 65882579bc24cbdfb77cea919a0bec07ae04d9e3 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 28 Oct 2016 11:21:11 +0300 Subject: [PATCH] Minor, add toString() for debug --- .../kotlin/resolve/source/PsiSourceElement.kt | 3 +++ .../jetbrains/kotlin/checkers/BaseDiagnosticsTest.java | 10 ++++++++++ .../jetbrains/kotlin/descriptors/ModuleDescriptor.kt | 4 +++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/source/PsiSourceElement.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/source/PsiSourceElement.kt index 6e6f514f135..49dd07cb49b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/source/PsiSourceElement.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/source/PsiSourceElement.kt @@ -29,5 +29,8 @@ interface PsiSourceElement : SourceElement { class PsiSourceFile(val psiFile: PsiFile): SourceFile { override fun equals(other: Any?): Boolean = other is PsiSourceFile && psiFile == other.psiFile + override fun hashCode(): Int = psiFile.hashCode() + + override fun toString(): String = psiFile.virtualFile.path } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java index ac99b50a5c9..ecde141cd6b 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java @@ -303,6 +303,11 @@ public abstract class BaseDiagnosticsTest public int compareTo(@NotNull TestModule module) { return name.compareTo(module.getName()); } + + @Override + public String toString() { + return getName(); + } } public static class DiagnosticTestLanguageVersionSettings implements LanguageVersionSettings { @@ -510,5 +515,10 @@ public abstract class BaseDiagnosticsTest } return jvmSignatureDiagnostics; } + + @Override + public String toString() { + return jetFile.getName(); + } } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt index cf94e41f807..d043a38e34f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt @@ -47,5 +47,7 @@ interface ModuleDescriptor : DeclarationDescriptor { fun getCapability(capability: Capability): T? - class Capability(val name: String) + class Capability(val name: String) { + override fun toString() = name + } }