Replace some hsprintf() by phutil_tag()

Test Plan: Looked at a diff with inline comment.

Reviewers: epriestley

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Differential Revision: https://secure.phabricator.com/D7549

src/applications/diffusion/controller/DiffusionCommitController.php

@@ -744,21 +744,26 @@ final class DiffusionCommitController extends DiffusionController {
       'inlineuri'  => '/diffusion/inline/preview/'.$commit->getPHID().'/',
     ));
 
-    $preview_panel = hsprintf(
-      '<div class="aphront-panel-preview aphront-panel-flush">
-        <div id="audit-preview">
-          <div class="aphront-panel-preview-loading-text">
-            Loading preview...
-          </div>
-        </div>
-        <div id="inline-comment-preview">
-        </div>
-      </div>');
+    $loading = phutil_tag_div(
+      'aphront-panel-preview-loading-text',
+      pht('Loading preview...'));
+
+    $preview_panel = phutil_tag_div(
+      'aphront-panel-preview aphront-panel-flush',
+      array(
+        phutil_tag('div', array('id' => 'audit-preview'), $loading),
+        phutil_tag('div', array('id' => 'inline-comment-preview'))
+      ));
 
     // TODO: This is pretty awkward, unify the CSS between Diffusion and
     // Differential better.
     require_celerity_resource('differential-core-view-css');
 
+    $anchor = id(new PhabricatorAnchorView())
+      ->setAnchorName('comment')
+      ->setNavigationMarker(true)
+      ->render();
+
     $comment_box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($form);
@@ -768,14 +773,9 @@ final class DiffusionCommitController extends DiffusionController {
       array(
         'id' => $pane_id,
       ),
-      hsprintf(
-        '<div class="differential-add-comment-panel">%s%s%s</div>',
-        id(new PhabricatorAnchorView())
-          ->setAnchorName('comment')
-          ->setNavigationMarker(true)
-          ->render(),
-        $comment_box,
-        $preview_panel));
+      phutil_tag_div(
+        'differential-add-comment-panel',
+        array($anchor, $comment_box, $preview_panel)));
   }
 
   /**

src/applications/diffusion/controller/DiffusionLintController.php

@@ -69,25 +69,20 @@ final class DiffusionLintController extends DiffusionController {
 
       $total += $code['n'];
 
+      $href_lint = $drequest->generateURI(array(
+        'action' => 'lint',
+        'lint' => $code['code'],
+      ));
+      $href_browse = $drequest->generateURI(array(
+        'action' => 'browse',
+        'lint' => $code['code'],
+      ));
+      $href_repo = $drequest->generateURI(array('action' => 'lint'));
+
       $rows[] = array(
-        hsprintf(
-          '<a href="%s">%s</a>',
-          $drequest->generateURI(array(
-            'action' => 'lint',
-            'lint' => $code['code'],
-          )),
-          $code['n']),
-        hsprintf(
-          '<a href="%s">%s</a>',
-          $drequest->generateURI(array(
-            'action' => 'browse',
-            'lint' => $code['code'],
-          )),
-          $code['files']),
-        hsprintf(
-          '<a href="%s">%s</a>',
-          $drequest->generateURI(array('action' => 'lint')),
-          $drequest->getCallsign()),
+        phutil_tag('a', array('href' => $href_lint), $code['n']),
+        phutil_tag('a', array('href' => $href_browse), $code['files']),
+        phutil_tag('a', array('href' => $href_repo), $drequest->getCallsign()),
         ArcanistLintSeverity::getStringForSeverity($code['maxSeverity']),
         $code['code'],
         $code['maxName'],

src/applications/diffusion/controller/DiffusionLintDetailsController.php

@@ -15,22 +15,22 @@ final class DiffusionLintDetailsController extends DiffusionController {
 
     $rows = array();
     foreach ($messages as $message) {
-      $path = hsprintf(
-        '<a href="%s">%s</a>',
-        $drequest->generateURI(array(
+      $path = phutil_tag(
+        'a',
+        array('href' => $drequest->generateURI(array(
           'action' => 'lint',
           'path' => $message['path'],
-        )),
+        ))),
         substr($message['path'], strlen($drequest->getPath()) + 1));
 
-      $line = hsprintf(
-        '<a href="%s">%s</a>',
-        $drequest->generateURI(array(
+      $line = phutil_tag(
+        'a',
+        array('href' => $drequest->generateURI(array(
           'action' => 'browse',
           'path' => $message['path'],
           'line' => $message['line'],
           'commit' => $branch->getLintCommit(),
-        )),
+        ))),
         $message['line']);
 
       $author = $message['authorPHID'];