From e2d504c78e200fbf9d24e708181473cea7a02482 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 9 Nov 2012 15:25:43 +0400 Subject: [PATCH] Report raw paths, not URLs, convert when needed --- .../org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java | 2 +- .../jetbrains/jet/plugin/compiler/MessageCollectorAdapter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java index 96e73d79ec8..655805ca236 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java +++ b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java @@ -208,7 +208,7 @@ public class CompilerRunnerUtil { message.setLength(0); String rawPath = attributes.getValue("path"); - path = rawPath == null ? null : "file://" + rawPath; + path = rawPath == null ? null : rawPath; line = safeParseInt(attributes.getValue("line"), -1); column = safeParseInt(attributes.getValue("column"), -1); } diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/MessageCollectorAdapter.java b/idea/src/org/jetbrains/jet/plugin/compiler/MessageCollectorAdapter.java index a103b11e5c0..babee40d3de 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/MessageCollectorAdapter.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/MessageCollectorAdapter.java @@ -42,7 +42,7 @@ class MessageCollectorAdapter implements MessageCollector { @NotNull CompilerMessageLocation location ) { CompilerMessageCategory category = category(severity); - compileContext.addMessage(category, message, location.getPath(), location.getLine(), location.getColumn()); + compileContext.addMessage(category, message, "file://" + location.getPath(), location.getLine(), location.getColumn()); if (severity == CompilerMessageSeverity.EXCEPTION) { LOG.error(message); }