Reply with correct server information

Author: jrentlez

src/cli/lsp.rs

@@ -4,8 +4,8 @@ use lsp_server::{Connection, ErrorCode, Message, Response};
 use lsp_textdocument::{FullTextDocument, TextDocuments};
 use lsp_types::{
     request::{Formatting, RangeFormatting, Request},
-    DocumentFormattingParams, DocumentRangeFormattingParams, FormattingOptions, OneOf,
-    Position, Range, ServerCapabilities, ServerInfo, TextDocumentSyncCapability,
+    DocumentFormattingParams, DocumentRangeFormattingParams, FormattingOptions, InitializeResult,
+    OneOf, Position, Range, ServerCapabilities, ServerInfo, TextDocumentSyncCapability,
     TextDocumentSyncKind, TextEdit, Uri,
 };
 use stylua_lib::{format_code, IndentType, OutputVerification};
@@ -139,14 +139,22 @@ fn handle_request(
 }
 
 fn main_loop(connection: Connection, config_resolver: &mut ConfigResolver) -> anyhow::Result<()> {
-    let capabilities = ServerCapabilities {
-        document_formatting_provider: Some(OneOf::Left(true)),
-        text_document_sync: Some(TextDocumentSyncCapability::Kind(
-            TextDocumentSyncKind::INCREMENTAL,
-        )),
-        ..Default::default()
+    let initialize_result = InitializeResult {
+        capabilities: ServerCapabilities {
+            document_formatting_provider: Some(OneOf::Left(true)),
+            text_document_sync: Some(TextDocumentSyncCapability::Kind(
+                TextDocumentSyncKind::INCREMENTAL,
+            )),
+            ..Default::default()
+        },
+        server_info: Some(ServerInfo {
+            name: "stylua".to_string(),
+            version: Some(env!("CARGO_PKG_VERSION").to_string()),
+        }),
     };
-    connection.initialize(serde_json::to_value(capabilities)?)?;
+
+    let (id, _) = connection.initialize_start()?;
+    connection.initialize_finish(id, serde_json::to_value(initialize_result)?)?;
 
     let mut documents = TextDocuments::new();
     for msg in &connection.receiver {
@@ -198,7 +206,9 @@ mod tests {
         FormattingOptions, InitializeParams, Position, Range, TextDocumentIdentifier,
         TextDocumentItem, TextEdit, Uri, WorkDoneProgressParams,
     };
-    use lsp_types::{OneOf, ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind};
+    use lsp_types::{
+        OneOf, ServerCapabilities, ServerInfo, TextDocumentSyncCapability, TextDocumentSyncKind,
+    };
     use serde::de::DeserializeOwned;
     use serde_json::to_value;
 
@@ -249,7 +259,12 @@ mod tests {
                             TextDocumentSyncKind::INCREMENTAL,
                         )),
                         ..Default::default()
-                    }}) => {}
+                    },
+                    "serverInfo": Some(ServerInfo {
+                        name: "stylua".to_string(),
+                        version: Some(env!("CARGO_PKG_VERSION").to_string()),
+                    }),
+                    }) => {}
             _ => panic!("assertion failed"),
         }
     }