walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #368 from matthiaskrgr/htmlreport_inconclusive 

htmlreport: fix #5963, handle inconclusive messages and underlay them in grey color.
This commit is contained in:
Daniel Marjamäki 2014-07-18 11:17:17 +02:00
parent 946c139043 fadf9baf46
commit 6c44c20183
1 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
htmlreport/cppcheck-htmlreport
View File

@ -45,6 +45,16 @@ h1 {
margin-left: 4px; margin-left: 4px;
} }
.inconclusive {
background-color: #B6B6B4;
}
.inconclusive2 {
background-color: #B6B6B4;
border: 1px dotted black;
display: inline-block;
margin-left: 4px;
}
.highlight .hll { .highlight .hll {
padding: 1px; padding: 1px;
} }
@ -151,7 +161,7 @@ HTML_FOOTER = """
""" """
HTML_ERROR = "<span class='error2'>&lt;--- %s</span>\n" HTML_ERROR = "<span class='error2'>&lt;--- %s</span>\n"
HTML_INCONCLUSIVE = "<span class='inconclusive2'>&lt;--- %s</span>\n"
class AnnotateCodeFormatter(HtmlFormatter): class AnnotateCodeFormatter(HtmlFormatter):
errors = [] errors = []
@ -164,7 +174,12 @@ class AnnotateCodeFormatter(HtmlFormatter):
if i == 1: if i == 1:
for error in self.errors: for error in self.errors:
if error['line'] == line_no: if error['line'] == line_no:
try:
if error['inconclusive'] == 'true':
t = t.replace('\n', HTML_INCONCLUSIVE % error['msg'])
except KeyError:
t = t.replace('\n', HTML_ERROR % error['msg']) t = t.replace('\n', HTML_ERROR % error['msg'])
line_no = line_no + 1 line_no = line_no + 1
yield i, t yield i, t
@ -204,6 +219,16 @@ class CppCheckHandler(XmlContentHandler):
if name == 'cppcheck': if name == 'cppcheck':
self.versionCppcheck = attributes['version'] self.versionCppcheck = attributes['version']
if name == 'error': if name == 'error':
try:
self.errors.append({
'file': '',
'line': 0,
'id': attributes['id'],
'severity': attributes['severity'],
'msg': attributes['msg'],
'inconclusive': attributes['inconclusive']
})
except KeyError:
self.errors.append({ self.errors.append({
'file': '', 'file': '',
'line': 0, 'line': 0,
@ -348,11 +373,16 @@ if __name__ == '__main__':
"\n <tr><td colspan='4'><a href='%s'>%s</a></td></tr>" % "\n <tr><td colspan='4'><a href='%s'>%s</a></td></tr>" %
(data['htmlfile'], filename)) (data['htmlfile'], filename))
for error in data['errors']: for error in data['errors']:
error_class = ''
try:
if error['inconclusive'] == 'true':
error_class = 'class="inconclusive"'
error['severity'] += ", inconcl."
except KeyError:
pass
if error['severity'] == 'error': if error['severity'] == 'error':
error_class = 'class="error"' error_class = 'class="error"'
else:
error_class = ''
if error['id'] == 'missingInclude': if error['id'] == 'missingInclude':
output_file.write( output_file.write(
'\n <tr><td></td><td>%s</td><td>%s</td><td>%s</td></tr>' % '\n <tr><td></td><td>%s</td><td>%s</td><td>%s</td></tr>' %