From 627e47bcceed6c0963a93ec5c84a11938c5d942f Mon Sep 17 00:00:00 2001
From: Steven Arcangeli <stevearc@stevearc.com>
Date: Wed, 8 Jan 2020 18:23:54 -0800
Subject: [PATCH] Fix a race condition when setting diagnostic signs

---
 src/language_server_protocol.rs | 54 ++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/language_server_protocol.rs b/src/language_server_protocol.rs
index 35d95faa1..052bffb30 100644
--- a/src/language_server_protocol.rs
+++ b/src/language_server_protocol.rs
@@ -2516,49 +2516,47 @@ impl LanguageClient {
                 .map(|(line, severity)| Sign::new(line, format!("LanguageClient{:?}", severity)))
                 .collect())
         })?;
-        let signs_prev: Vec<_> = self.update(|state| {
-            Ok(state
+        self.update(|state| {
+            let signs_prev: Vec<_> = state
                 .signs
                 .entry(filename.clone())
                 .or_default()
                 .iter()
                 .map(|(_, sign)| sign.clone())
-                .collect())
-        })?;
-        let mut signs_to_add = vec![];
-        let mut signs_to_delete = vec![];
-        let diffs = diff::slice(&signs_next, &signs_prev);
-        for diff in diffs {
-            match diff {
-                diff::Result::Left(s) => {
-                    signs_to_add.push(s.clone());
-                }
-                diff::Result::Right(s) => {
-                    signs_to_delete.push(s.clone());
+                .collect();
+            let mut signs_to_add = vec![];
+            let mut signs_to_delete = vec![];
+            let diffs = diff::slice(&signs_next, &signs_prev);
+            for diff in diffs {
+                match diff {
+                    diff::Result::Left(s) => {
+                        signs_to_add.push(s.clone());
+                    }
+                    diff::Result::Right(s) => {
+                        signs_to_delete.push(s.clone());
+                    }
+                    _ => {}
                 }
-                _ => {}
             }
-        }
-        for sign in &mut signs_to_add {
-            if sign.id == 0 {
-                sign.id = self.update(|state| {
+            for sign in &mut signs_to_add {
+                if sign.id == 0 {
                     state.sign_next_id += 1;
-                    Ok(state.sign_next_id)
-                })?;
+                    sign.id = state.sign_next_id;
+                }
             }
-        }
-        self.vim()?
-            .set_signs(&filename, &signs_to_add, &signs_to_delete)?;
-        self.update(|state| {
+
             let signs = state.signs.entry(filename.clone()).or_default();
             // signs might be deleted AND added in the same line to change severity,
             // so deletions must be before additions
-            for sign in signs_to_delete {
+            for sign in &signs_to_delete {
                 signs.remove(&sign.line);
             }
-            for sign in signs_to_add {
-                signs.insert(sign.line, sign);
+            for sign in &signs_to_add {
+                signs.insert(sign.line, sign.clone());
             }
+            state
+                .vim
+                .set_signs(&filename, &signs_to_add, &signs_to_delete)?;
             Ok(())
         })?;