Make marking comments as "Done" work cleanly on EditEngine

Summary: Ref T11114. Fixes T10323.

Test Plan:
  - Marked comments as done only: no warning about not leaving a comment.
  - Did nothing: warning about posting an empty comment.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11114, T10323

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

src/applications/differential/editor/DifferentialRevisionEditEngine.php

@@ -262,6 +262,31 @@ final class DifferentialRevisionEditEngine
         ->attachComment($inline);
     }
 
+    $viewer_phid = $viewer->getPHID();
+    $viewer_is_author = ($object->getAuthorPHID() == $viewer_phid);
+    if ($viewer_is_author) {
+      $state_map = PhabricatorTransactions::getInlineStateMap();
+
+      $inlines = id(new DifferentialDiffInlineCommentQuery())
+        ->setViewer($viewer)
+        ->withRevisionPHIDs(array($object->getPHID()))
+        ->withFixedStates(array_keys($state_map))
+        ->execute();
+      if ($inlines) {
+        $old_value = mpull($inlines, 'getFixedState', 'getPHID');
+        $new_value = array();
+        foreach ($old_value as $key => $state) {
+          $new_value[$key] = $state_map[$state];
+        }
+
+        $xactions[] = id(new DifferentialTransaction())
+          ->setTransactionType(PhabricatorTransactions::TYPE_INLINESTATE)
+          ->setIgnoreOnNoEffect(true)
+          ->setOldValue($old_value)
+          ->setNewValue($new_value);
+      }
+    }
+
     return $xactions;
   }
 

src/applications/differential/editor/DifferentialTransactionEditor.php

@@ -58,6 +58,7 @@ final class DifferentialTransactionEditor
     $types[] = PhabricatorTransactions::TYPE_COMMENT;
     $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
+    $types[] = PhabricatorTransactions::TYPE_INLINESTATE;
 
     $types[] = DifferentialTransaction::TYPE_ACTION;
     $types[] = DifferentialTransaction::TYPE_INLINE;
@@ -256,6 +257,23 @@ final class DifferentialTransactionEditor
     return parent::applyCustomInternalTransaction($object, $xaction);
   }
 
+  protected function expandTransactions(
+    PhabricatorLiskDAO $object,
+    array $xactions) {
+
+    // If we have an "Inline State" transaction already, the caller built it
+    // for us so we don't need to expand it again.
+    foreach ($xactions as $xaction) {
+      switch ($xaction->getTransactionType()) {
+        case PhabricatorTransactions::TYPE_INLINESTATE:
+          $this->didExpandInlineState = true;
+          break;
+      }
+    }
+
+    return parent::expandTransactions($object, $xactions);
+  }
+
   protected function expandTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {