revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-25 16:22:43 +01:00
Code Issues Releases Wiki Activity

When an inline was left on a rendered DocumentEngine document, don't include an email context patch

Browse source 
Summary:
Ref T13513. If you leave an inline on line 20 of a Jupyter document, we currently render context around *raw* line 20, which is inevitably some unrelated piece of JSON.

Instead, drop this context. (Ideal behavior would be to render context around Jupyter block 20, but that's a whole lot of work.)

Test Plan:
  - On Jupyter changes and normal source changes, made and submitted inline comments, then viewed text and HTML mail.
  - Saw no context on Jupyter comments (instead of bad context), and unchanged behavior (useful context) on normal source changes.

Maniphest Tasks: T13513

Differential Revision: https://secure.phabricator.com/D21242
This commit is contained in:
epriestley 2020-05-12 13:55:00 -07:00
parent acc1fa1655
commit e8109e4a92
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/applications/differential/mail/DifferentialInlineCommentMailView.php
View file

@ -59,6 +59,9 @@ final class DifferentialInlineCommentMailView
$comment = $inline->getComment();
$parent_phid = $comment->getReplyToCommentPHID();
$inline_object = $comment->newInlineCommentObject();
$document_engine_key = $inline_object->getDocumentEngineKey();
$is_last_inline = ($inline_key == $last_inline_key);
$context_text = null;
@ -70,6 +73,17 @@ final class DifferentialInlineCommentMailView
$context_text = $this->renderInline($parent, false, true);
$context_html = $this->renderInline($parent, true, true);
}
} else if ($document_engine_key !== null) {
// See T13513. If an inline was left on a rendered document, don't
// include the patch context. Document engines currently can not
// render to mail targets, and using the line numbers as raw source
// lines produces misleading context.
$patch_text = null;
$context_text = $this->renderPatch($comment, $patch_text, false);
$patch_html = null;
$context_html = $this->renderPatch($comment, $patch_html, true);
} else {
$patch_text = $this->getPatch($hunk_parser, $comment, false);
$context_text = $this->renderPatch($comment, $patch_text, false);
@ -374,16 +388,24 @@ final class DifferentialInlineCommentMailView
$is_html) {
if ($is_html) {
$patch = $this->renderCodeBlock($patch);
if ($patch !== null) {
$patch = $this->renderCodeBlock($patch);
}
}
$header = $this->renderHeader($comment, $is_html, false);
$patch = array(
$header,
"\n",
$patch,
);
if ($patch === null) {
$patch = array(
$header,
);
} else {
$patch = array(
$header,
"\n",
$patch,
);
}
if (!$is_html) {
$patch = implode('', $patch);