From df94aee75839befb2b6d102807c3e83b5777b23c Mon Sep 17 00:00:00 2001
From: Julia <floc@unpromptedtirade.com>
Date: Wed, 19 Apr 2023 15:57:20 -0400
Subject: [PATCH] Fix failing tests

Co-Authored-By: Max Brunsfeld <max@zed.dev>
---
 crates/language/src/language.rs        | 4 +++-
 crates/project/src/project_tests.rs    | 4 ++--
 crates/zed/src/languages/typescript.rs | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 7064fa50553a5093b7fb7765a09b9108a9621cc7..38548c02db30d9d8007b941679d1061be32bee23 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -817,7 +817,9 @@ impl LanguageRegistry {
                     .detach();
                 Ok(server)
             });
-            return vec![PendingLanguageServer { server_id: 0, task }];
+
+            let server_id = post_inc(&mut self.state.write().next_language_server_id);
+            return vec![PendingLanguageServer { server_id, task }];
         }
 
         let download_dir = self
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index b3a7cc88b89233b808f3700f0ee577010f738dad..b6e9741aec8b9baa7c736d31c783046f4fea171c 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -400,7 +400,7 @@ async fn test_managing_language_servers(
             .text_document,
         lsp::TextDocumentItem {
             uri: lsp::Url::from_file_path("/the-root/test.rs").unwrap(),
-            version: 1,
+            version: 0,
             text: rust_buffer.read_with(cx, |buffer, _| buffer.text()),
             language_id: Default::default()
         }
@@ -427,7 +427,7 @@ async fn test_managing_language_servers(
             },
             lsp::TextDocumentItem {
                 uri: lsp::Url::from_file_path("/the-root/test3.json").unwrap(),
-                version: 1,
+                version: 0,
                 text: rust_buffer2.read_with(cx, |buffer, _| buffer.text()),
                 language_id: Default::default()
             }
diff --git a/crates/zed/src/languages/typescript.rs b/crates/zed/src/languages/typescript.rs
index ceb1d85402dd530c7b27cf5c1f0e813363ae7dd1..4587aa5bfd730aed81dbc7ad77630da0d83b8552 100644
--- a/crates/zed/src/languages/typescript.rs
+++ b/crates/zed/src/languages/typescript.rs
@@ -1,11 +1,11 @@
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
-use futures::{future::BoxFuture, FutureExt, StreamExt};
-use gpui::{AppContext, Task};
+use futures::{future::BoxFuture, FutureExt};
+use gpui::AppContext;
 use language::{LanguageServerBinary, LanguageServerName, LspAdapter};
 use lsp::CodeActionKind;
 use node_runtime::NodeRuntime;
-use serde_json::{json, Map, Value};
+use serde_json::{json, Value};
 use smol::fs;
 use std::{
     any::Any,