diff --git a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php index c7cc8890c6..0ca028d42d 100644 --- a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php +++ b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php @@ -1,167 +1,157 @@ 'num')), phutil_tag('col', array('class' => 'num')), phutil_tag('col', array('class' => 'copy')), phutil_tag('col', array('class' => 'unified')), )); } public function renderTextChange( $range_start, $range_len, $rows) { $primitives = $this->buildPrimitives($range_start, $range_len); list($left_prefix, $right_prefix) = $this->getLineIDPrefixes(); $no_copy = phutil_tag('td', array('class' => 'copy')); $no_coverage = null; $column_width = 4; $out = array(); foreach ($primitives as $p) { $type = $p['type']; switch ($type) { case 'old': case 'new': $out[] = hsprintf(''); if ($type == 'old') { if ($p['htype']) { $class = 'left old'; } else { $class = 'left'; } if ($left_prefix) { $left_id = $left_prefix.$p['line']; } else { $left_id = null; } $out[] = phutil_tag('th', array('id' => $left_id), $p['line']); $out[] = phutil_tag('th', array()); $out[] = $no_copy; $out[] = phutil_tag('td', array('class' => $class), $p['render']); $out[] = $no_coverage; } else { if ($p['htype']) { $class = 'right new'; $out[] = phutil_tag('th', array()); } else { $class = 'right'; if ($left_prefix) { $left_id = $left_prefix.$p['oline']; } else { $left_id = null; } $out[] = phutil_tag('th', array('id' => $left_id), $p['oline']); } if ($right_prefix) { $right_id = $right_prefix.$p['line']; } else { $right_id = null; } $out[] = phutil_tag('th', array('id' => $right_id), $p['line']); $out[] = $no_copy; $out[] = phutil_tag('td', array('class' => $class), $p['render']); $out[] = $no_coverage; } $out[] = hsprintf(''); break; case 'inline': $inline = $this->buildInlineComment( $p['comment'], $p['right']); - - $out[] = phutil_tag( - 'tr', - array(), - array( - phutil_tag('th'), - phutil_tag('th'), - $no_copy, - phutil_tag('td', array(), $inline), - $no_coverage, - )); + $out[] = $this->getRowScaffoldForInline($inline); break; case 'no-context': $out[] = phutil_tag( 'tr', array(), phutil_tag( 'td', array( 'class' => 'show-more', 'colspan' => $column_width, ), pht('Context not available.'))); break; case 'context': $top = $p['top']; $len = $p['len']; $links = $this->renderShowContextLinks($top, $len, $rows); $out[] = javelin_tag( 'tr', array( 'sigil' => 'context-target', ), phutil_tag( 'td', array( 'class' => 'show-more', 'colspan' => $column_width, ), $links)); break; default: $out[] = hsprintf('%s', $type); break; } } if ($out) { return $this->wrapChangeInTable(phutil_implode_html('', $out)); } return null; } public function renderFileChange( $old_file = null, $new_file = null, $id = 0, $vs = 0) { throw new PhutilMethodNotImplementedException(); } public function getRowScaffoldForInline(PHUIDiffInlineCommentView $view) { return id(new PHUIDiffOneUpInlineCommentRowScaffold()) ->addInlineView($view); } }