From 175b7230f14a91511c758df63d02c51057739915 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Tue, 21 Feb 2012 18:37:49 +0400 Subject: [PATCH] better compiler output for incomplete hierarchies --- .../cli/src/org/jetbrains/jet/compiler/CompileSession.java | 4 ++-- idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java b/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java index 228171a8f47..41732517191 100644 --- a/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java +++ b/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java @@ -149,9 +149,9 @@ public class CompileSession { boolean hasIncompleteHierarchyErrors; Collection incompletes = myBindingContext.getKeys(BindingContext.INCOMPLETE_HIERARCHY); if (!incompletes.isEmpty()) { - out.println("following classes have incomplete hierarchies:"); + out.println(Severity.ERROR + ":: The following classes have incomplete hierarchies:"); for (ClassDescriptor incomplete : incompletes) { - out.println(" " + fqName(incomplete)); + out.println(Severity.ERROR + ":: " + fqName(incomplete)); } hasIncompleteHierarchyErrors = true; } else { diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java index 43877f02139..bd42098adec 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java @@ -324,7 +324,9 @@ public class JetCompiler implements TranslatingCompiler { int line = -1; int column = -1; int colonIndex = text.indexOf(':'); - if (colonIndex > 0) { + if (text.startsWith(":")) { + text = text.substring(1); + } else if (colonIndex > 0) { path = "file://" + text.substring(0, colonIndex).trim(); text = text.substring(colonIndex + 1);