Page MenuHomePhabricator
Files F14846777

D20959.id49935.diff
No OneTemporary
Actions

D20959.id49935.diff
View Options

diff --git a/src/applications/differential/parser/DifferentialHunkParser.php b/src/applications/differential/parser/DifferentialHunkParser.php
--- a/src/applications/differential/parser/DifferentialHunkParser.php
+++ b/src/applications/differential/parser/DifferentialHunkParser.php
@@ -354,6 +354,69 @@
return $this;
}
+ public function generateVisibleBlocksMask($lines_context) {
+
+ // See T13468. This is similar to "generateVisibleLinesMask()", but
+ // attempts to work around a series of bugs which cancel each other
+ // out but make a mess of the intermediate steps.
+
+ $old = $this->getOldLines();
+ $new = $this->getNewLines();
+
+ $length = max(count($old), count($new));
+
+ $visible_lines = array();
+ for ($ii = 0; $ii < $length; $ii++) {
+ $old_visible = (isset($old[$ii]) && $old[$ii]['type']);
+ $new_visible = (isset($new[$ii]) && $new[$ii]['type']);
+
+ $visible_lines[$ii] = ($old_visible || $new_visible);
+ }
+
+ $mask = array();
+ $reveal_cursor = -1;
+ for ($ii = 0; $ii < $length; $ii++) {
+
+ // If this line isn't visible, it isn't going to reveal anything.
+ if (!$visible_lines[$ii]) {
+
+ // If it hasn't been revealed by a nearby line, mark it as masked.
+ if (empty($mask[$ii])) {
+ $mask[$ii] = false;
+ }
+
+ continue;
+ }
+
+ // If this line is visible, reveal all the lines nearby.
+
+ // First, compute the minimum and maximum offsets we want to reveal.
+ $min_reveal = max($ii - $lines_context, 0);
+ $max_reveal = min($ii + $lines_context, $length - 1);
+
+ // Naively, we'd do more work than necessary when revealing context for
+ // several adjacent visible lines: we would mark all the overlapping
+ // lines as revealed several times.
+
+ // To avoid duplicating work, keep track of the largest line we've
+ // revealed to. Since we reveal context by marking every consecutive
+ // line, we don't need to touch any line above it.
+ $min_reveal = max($min_reveal, $reveal_cursor);
+
+ // Reveal the remaining unrevealed lines.
+ for ($jj = $min_reveal; $jj <= $max_reveal; $jj++) {
+ $mask[$jj] = true;
+ }
+
+ // Move the cursor to the next line which may still need to be revealed.
+ $reveal_cursor = $max_reveal + 1;
+ }
+
+ $this->setVisibleLinesMask($mask);
+
+ return $mask;
+ }
+
public function generateVisibleLinesMask($lines_context) {
$old = $this->getOldLines();
$new = $this->getNewLines();
@@ -361,6 +424,7 @@
$visible = false;
$last = 0;
$mask = array();
+
for ($cursor = -$lines_context; $cursor < $max_length; $cursor++) {
$offset = $cursor + $lines_context;
if ((isset($old[$offset]) && $old[$offset]['type']) ||
diff --git a/src/applications/files/diff/PhabricatorDocumentEngineBlocks.php b/src/applications/files/diff/PhabricatorDocumentEngineBlocks.php
--- a/src/applications/files/diff/PhabricatorDocumentEngineBlocks.php
+++ b/src/applications/files/diff/PhabricatorDocumentEngineBlocks.php
@@ -59,7 +59,7 @@
->parseHunksForLineData($changeset->getHunks())
->reparseHunksForSpecialAttributes();
- $hunk_parser->generateVisibleLinesMask(2);
+ $hunk_parser->generateVisibleBlocksMask(2);
$mask = $hunk_parser->getVisibleLinesMask();
$old_lines = $hunk_parser->getOldLines();
@@ -72,14 +72,7 @@
$old_line = idx($old_lines, $ii);
$new_line = idx($new_lines, $ii);
- $is_visible = !empty($mask[$ii + 1]);
-
- // TODO: There's currently a bug where one-line files get incorrectly
- // masked. This causes images to completely fail to render. Just ignore
- // the mask if it came back empty.
- if (!$mask) {
- $is_visible = true;
- }
+ $is_visible = !empty($mask[$ii]);
if ($old_line) {
$old_hash = rtrim($old_line['text'], "\n");

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 4, 6:46 AM (16 h, 57 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7089045
Default Alt Text
D20959.id49935.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility