Add heuristic to better highlight block reindents
If the leading indentation is being changed on a block, it can
easily show up as a series of consecutive edits where there is
only one line of gap between each edit, due to these lines being
either blank lines, or relatively trivial contexts like "\t}\n"
to close a code block.
Combine the edits together into a single edit before we enter the
intraline difference algorithm. This will permit us to instead see
the whitespace introduction or removal at the start of the line(s)
affected, while retaining context through the rest of the region.
The heuristic assumes a C/C++/Java/Objective-C/JavaScript style of
language where "}" or "/*" on a line by itself would be common as
meaningless context in a multi-line region. We also try to catch
really common control keywords, like "try {" or "} finally {" that
appear on a line by themselves by looking for these cases which end
with the opening brace. To also try to cater to the Python style
of language families, we also permit ":" on the end of the line.
This partially improves the nasty rewrite situation identified in
issue 245, so I'm tagging this commit as though it fixed the bug,
as in general even rewrites look better due to the insanely common
"\s+}\n" tokens being collapsed into the region.
Bug: issue 245
Change-Id: Ie9f4210c2618ac0859e1087c54bd65bc4595495a
Signed-off-by: Shawn O. Pearce <sop@google.com>
1 file changed
