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

Warnings fixed, annotations added

Browse Source
This commit is contained in:
Andrey Breslav
2013-01-21 19:39:14 -08:00
parent 56acd57e73
commit 2cb530a6d1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageUtil.java
+9 -2
View File
@@ -16,14 +16,21 @@
package org.jetbrains.jet.cli.common.messages; package org.jetbrains.jet.cli.common.messages;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
public class MessageUtil { public class MessageUtil {
public static CompilerMessageLocation psiElementToMessageLocation(PsiElement element) { private MessageUtil() {}
@NotNull
public static CompilerMessageLocation psiElementToMessageLocation(@NotNull PsiElement element) {
PsiFile file = element.getContainingFile(); PsiFile file = element.getContainingFile();
DiagnosticUtils.LineAndColumn lineAndColumn = DiagnosticUtils.getLineAndColumnInPsiFile(file, element.getTextRange()); DiagnosticUtils.LineAndColumn lineAndColumn = DiagnosticUtils.getLineAndColumnInPsiFile(file, element.getTextRange());
return CompilerMessageLocation.create(file.getVirtualFile().getPath(), lineAndColumn.getLine(), lineAndColumn.getColumn()); VirtualFile virtualFile = file.getVirtualFile();
String path = virtualFile == null ? "<no path>" : virtualFile.getPath();
return CompilerMessageLocation.create(path, lineAndColumn.getLine(), lineAndColumn.getColumn());
} }
} }