aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Driver/HTMLDiagnostics.cpp13
-rw-r--r--lib/Rewrite/HTMLRewrite.cpp1
2 files changed, 13 insertions, 1 deletions
diff --git a/Driver/HTMLDiagnostics.cpp b/Driver/HTMLDiagnostics.cpp
index 5e4ba971eb..6583064d18 100644
--- a/Driver/HTMLDiagnostics.cpp
+++ b/Driver/HTMLDiagnostics.cpp
@@ -13,6 +13,7 @@
#include "HTMLDiagnostics.h"
#include "clang/Basic/SourceManager.h"
+#include "clang/Basic/FileManager.h"
#include "clang/AST/ASTContext.h"
#include "clang/Analysis/PathDiagnostic.h"
#include "clang/Rewrite/Rewriter.h"
@@ -105,11 +106,21 @@ void HTMLDiagnostics::HandlePathDiagnostic(const PathDiagnostic& D) {
}
// Add line numbers, header, footer, etc.
+
unsigned FileID = R.getSourceMgr().getMainFileID();
html::EscapeText(R, FileID);
html::AddLineNumbers(R, FileID);
- // FIXME: Add the number of the file here.
+ // Add the name of the file.
+
+ {
+ std::ostringstream os;
+ const FileEntry* Entry = SMgr.getFileEntryForID(FileID);
+
+ os << "<h1>" << Entry->getName() << "</h1>\n";
+
+ R.InsertStrBefore(SourceLocation::getFileLoc(FileID, 0), os.str());
+ }
// Add CSS, header, and footer.
diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/HTMLRewrite.cpp
index 6538d9e072..b886bec38b 100644
--- a/lib/Rewrite/HTMLRewrite.cpp
+++ b/lib/Rewrite/HTMLRewrite.cpp
@@ -138,6 +138,7 @@ void html::AddHeaderFooterInternalBuiltinCSS(Rewriter& R, unsigned FileID) {
os << "<html>\n<head>\n"
<< "<style type=\"text/css\">\n"
<< " body { color:#000000; background-color:#ffffff }\n"
+ << " body { font-family:Helvetica, sans-serif }\n"
<< " .code { border-spacing:0px; width:100%; }\n"
<< " .code { font-family: \"Andale Mono\", fixed; font-size:10pt }\n"
<< " .code { line-height: 1.2em }\n"