This is an archive of the discontinued LLVM Phabricator instance.

Differential D36685

[clang-diff] HTML diff navigation
ClosedPublic

Authored by johannes on Aug 14 2017, 8:55 AM.

Details

Reviewers
arphaman
Commits
rG8796049fc551: [clang-diff] HTML diff navigation
rC311570: [clang-diff] HTML diff navigation
rL311570: [clang-diff] HTML diff navigation
Summary

This adds shortcuts j and k to jump between changes.
It is especially useful in diffs with few changes.

Diff Detail

Repository
rL LLVM

Event Timeline

johannes created this revision.Aug 14 2017, 8:55 AM
johannes added a parent revision: D36187: [clang-diff] Use the relative name for NamedDecls.Aug 14 2017, 8:56 AM
johannes updated this revision to Diff 112126.Aug 22 2017, 2:01 AM

some refactoring

Harbormaster completed remote builds in B9502: Diff 112126.Aug 22 2017, 2:02 AM
arphaman edited edge metadata.EditedAug 23 2017, 12:17 AM

LGTM. There are some unrelated highlighting bugs in HTML though, for example if you take:

before:

int foo();

void bar(int x) {
  switch (x) {
  case 0:
    bar(2);
  }
}

after:

void bar(int x) {
  switch (x) {
  case 4:
    bar(2);
    break;
  case 1:
    bar(3);
    break;
  }
}

int foo();

int zed();

Then first time bar is selected in the new source the whole function is highlighted. Then, if you select 4 in the new source and then re-select the function bar again, bar is highlighted, but there's a gap where 4 is. It should be addressed in another patch though.

Closed by commit rL311570: [clang-diff] HTML diff navigation (authored by krobelus). · Explain WhyAug 23 2017, 9:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
tools/
clang-diff/
65 lines

Diff 112389

cfe/trunk/tools/clang-diff/ClangDiff.cpp

Show First 20 Lines • Show All 133 Lines • ▼ Show 20 Linesdiv.code {
border-radius: 5px; border-radius: 5px;
} }
</style> </style>
</head> </head>
<script type='text/javascript'> <script type='text/javascript'>
highlightStack = [] highlightStack = []
function clearHighlight() { function clearHighlight() {
while (highlightStack.length) { while (highlightStack.length) {
let [l, r] = highlightStack.pop() var [l, r] = highlightStack.pop()
document.getElementById(l).style.backgroundColor = 'white' document.getElementById(l).style.backgroundColor = 'white'
if (r[1] != '-')
document.getElementById(r).style.backgroundColor = 'white' document.getElementById(r).style.backgroundColor = 'white'
} }
} }
function highlight(event) { function highlight(event) {
id = event.target['id'] var id = event.target['id']
doHighlight(id) doHighlight(id)
} }
function doHighlight(id) { function doHighlight(id) {
clearHighlight() clearHighlight()
source = document.getElementById(id) source = document.getElementById(id)
if (!source.attributes['tid']) if (!source.attributes['tid'])
return return
tid = source.attributes['tid'].value var mapped = source
while (mapped && mapped.parentElement && mapped.attributes['tid'].value.substr(1) === '-1')
mapped = mapped.parentElement
var tid = null, target = null
if (mapped) {
tid = mapped.attributes['tid'].value
target = document.getElementById(tid) target = document.getElementById(tid)
if (!target || source.parentElement && source.parentElement.classList.contains('code')) }
if (source.parentElement && source.parentElement.classList.contains('code'))
return return
source.style.backgroundColor = target.style.backgroundColor = 'lightgrey' source.style.backgroundColor = 'lightgrey'
highlightStack.push([id, tid])
source.scrollIntoView() source.scrollIntoView()
if (target) {
if (mapped === source)
target.style.backgroundColor = 'lightgrey'
target.scrollIntoView() target.scrollIntoView()
}
highlightStack.push([id, tid])
location.hash = '#' + id location.hash = '#' + id
} }
function scrollToBoth() { function scrollToBoth() {
doHighlight(location.hash.substr(1)) doHighlight(location.hash.substr(1))
} }
function changed(elem) {
return elem.classList.length == 0
}
function nextChangedNode(prefix, increment, number) {
do {
number += increment
var elem = document.getElementById(prefix + number)
} while(elem && !changed(elem))
return elem ? number : null
}
function handleKey(e) {
var down = e.code === "KeyJ"
var up = e.code === "KeyK"
if (!down && !up)
return
var id = highlightStack[0] ? highlightStack[0][0] : 'R0'
var oldelem = document.getElementById(id)
var number = parseInt(id.substr(1))
var increment = down ? 1 : -1
var lastnumber = number
var prefix = id[0]
do {
number = nextChangedNode(prefix, increment, number)
var elem = document.getElementById(prefix + number)
if (up && elem) {
while (elem.parentElement && changed(elem.parentElement))
elem = elem.parentElement
number = elem.id.substr(1)
}
} while ((down && id !== 'R0' && oldelem.contains(elem)))
if (!number)
number = lastnumber
elem = document.getElementById(prefix + number)
doHighlight(prefix + number)
}
window.onload = scrollToBoth window.onload = scrollToBoth
window.onkeydown = handleKey
</script> </script>
<body> <body>
<div onclick='highlight(event)'> <div onclick='highlight(event)'>
)"; )";
static void printHtml(raw_ostream &OS, char C) { static void printHtml(raw_ostream &OS, char C) {
switch (C) { switch (C) {
case '&': case '&':
▲ Show 20 Lines • Show All 313 Lines • Show Last 20 Lines