From 3d9f7244f006e5186391b72c1c962df8c6b08119 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Tue, 7 May 2019 16:38:08 -0400
Subject: [PATCH] Update issue messages after merge instead of by invalidating
 issues

---
 modules/ui/commit_warnings.js |  8 ++++++--
 modules/ui/entity_issues.js   |  9 ++++++---
 modules/ui/issues.js          | 10 +++++++---
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/modules/ui/commit_warnings.js b/modules/ui/commit_warnings.js
index 83edd3dc3..09d9cafd3 100644
--- a/modules/ui/commit_warnings.js
+++ b/modules/ui/commit_warnings.js
@@ -39,7 +39,7 @@ export function uiCommitWarnings(context) {
 
 
             var items = container.select('ul').selectAll('li')
-                .data(issues, function(d) { return d.message() + d.id; });
+                .data(issues, function(d) { return d.id; });
 
             items.exit()
                 .remove();
@@ -53,7 +53,7 @@ export function uiCommitWarnings(context) {
 
             itemsEnter
                 .append('strong')
-                .text(function(d) { return d.message(); });
+                .attr('class', 'issue-message');
 
             itemsEnter.filter(function(d) { return d.tooltip; })
                 .call(tooltip()
@@ -64,6 +64,10 @@ export function uiCommitWarnings(context) {
             items = itemsEnter
                 .merge(items);
 
+            items.selectAll('.issue-message')
+                .text(function(d) {
+                    return d.message();
+                });
 
             items
                 .on('mouseover', function(d) {
diff --git a/modules/ui/entity_issues.js b/modules/ui/entity_issues.js
index c8c8d95c9..a49b04521 100644
--- a/modules/ui/entity_issues.js
+++ b/modules/ui/entity_issues.js
@@ -49,7 +49,7 @@ export function uiEntityIssues(context) {
 
 
         var containers = selection.selectAll('.issue-container')
-            .data(issues, function(d) { return d.message() + d.id; });
+            .data(issues, function(d) { return d.id; });
 
         // Exit
         containers.exit()
@@ -108,8 +108,7 @@ export function uiEntityIssues(context) {
 
         textEnter
             .append('span')
-            .attr('class', 'issue-message')
-            .text(function(d) { return d.message(); });
+            .attr('class', 'issue-message');
 
 
         var infoButton = labelsEnter
@@ -173,6 +172,10 @@ export function uiEntityIssues(context) {
             .merge(containersEnter)
             .classed('active', function(d) { return d.id === _activeIssueID; });
 
+        containers.selectAll('.issue-message')
+            .text(function(d) {
+                return d.message();
+            });
 
         // fixes
         var fixLists = containers.selectAll('.issue-fix-list');
diff --git a/modules/ui/issues.js b/modules/ui/issues.js
index 50c1c2aba..90f973857 100644
--- a/modules/ui/issues.js
+++ b/modules/ui/issues.js
@@ -73,7 +73,7 @@ export function uiIssues(context) {
 
 
         var items = list.selectAll('li')
-            .data(issues, function(d) { return d.message() + d.id; });
+            .data(issues, function(d) { return d.id; });
 
         // Exit
         items.exit()
@@ -126,8 +126,7 @@ export function uiIssues(context) {
 
         textEnter
             .append('span')
-            .attr('class', 'issue-message')
-            .text(function(d) { return d.message(); });
+            .attr('class', 'issue-message');
 
 
         labelsEnter
@@ -160,6 +159,11 @@ export function uiIssues(context) {
             .merge(itemsEnter)
             .order();
 
+        items.selectAll('.issue-message')
+            .text(function(d) {
+                return d.message();
+            });
+
 
         // autofix
         var canAutoFix = issues.filter(function(issue) { return issue.autoFix; });