From ae3e33131f14eee0d4ba8a9184104998265a4847 Mon Sep 17 00:00:00 2001 From: Andrew Niefer Date: Thu, 7 Jul 2005 20:30:52 +0000 Subject: [PATCH] bug 102847 line numbers on scanner problems --- .../core/parser/scanner2/ScannerASTProblem.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/ScannerASTProblem.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/ScannerASTProblem.java index a13b0f385e8..267adf15966 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/ScannerASTProblem.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/ScannerASTProblem.java @@ -16,6 +16,7 @@ import java.util.Map; import org.eclipse.cdt.core.dom.ast.ASTNodeProperty; import org.eclipse.cdt.core.dom.ast.ASTVisitor; +import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTProblem; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; @@ -268,7 +269,17 @@ public class ScannerASTProblem extends ASTNode implements IASTProblem { msg = MessageFormat.format(msg, new Object[] { new String(arg) }); } - Object[] args = new Object[] { msg, new String(""), new Integer(0) }; //$NON-NLS-1$ + IASTFileLocation f = getFileLocation(); + String file = null; + int line = 0; + if( f == null ) + { + file = ""; //$NON-NLS-1$ + } else { + file = f.getFileName(); + line = f.getStartingLineNumber(); + } + Object[] args = new Object[] { msg, file, new Integer(line) }; //$NON-NLS-1$ message = ParserMessages.getFormattedString(PROBLEM_PATTERN, args); return message; }