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

Render file name and position in errors from JS library stubs

Browse Source
This commit is contained in:
Andrey Breslav
2014-03-27 19:43:20 +04:00
parent c74542c72e
commit bcc6843835
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/CompilerMessageLocation.java
+5
View File
@@ -73,4 +73,9 @@ public class CompilerMessageLocation {
result = 31 * result + column;
return result;
}
@Override
public String toString() {
return path + ((line != -1 || column != -1) ? " (" + line + ":" + column + ")" : "");
}
}
compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java
+3 -1
View File
@@ -19,6 +19,7 @@ package org.jetbrains.jet.cli.common.messages;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiErrorElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiModifierListOwner;
import com.intellij.psi.util.PsiFormatUtil;
import kotlin.Function0;
@@ -93,8 +94,9 @@ public final class AnalyzerWithCompilerReport {
else {
render = DefaultErrorMessages.RENDERER.render(diagnostic);
}
PsiFile file = diagnostic.getPsiFile();
messageCollector.report(convertSeverity(diagnostic.getSeverity()), render,
MessageUtil.psiFileToMessageLocation(diagnostic.getPsiFile(), null, lineAndColumn.getLine(), lineAndColumn.getColumn()));
MessageUtil.psiFileToMessageLocation(file, file.getName(), lineAndColumn.getLine(), lineAndColumn.getColumn()));
return diagnostic.getSeverity() == Severity.ERROR;
}