Add LanguageClient::new to fix visibility of struct fields (autozimu#1149)

Author: martskins

src/language_client.rs

@@ -15,12 +15,24 @@ use std::{
 
 #[derive(Clone)]
 pub struct LanguageClient {
- pub version: String,
- pub state_mutex: Arc<Mutex<State>>,
- pub clients_mutex: Arc<Mutex<HashMap<LanguageId, Arc<Mutex<()>>>>>,
+ version: String,
+ state_mutex: Arc<Mutex<State>>,
+ clients_mutex: Arc<Mutex<HashMap<LanguageId, Arc<Mutex<()>>>>>,
 }
 
 impl LanguageClient {
+ pub fn new(version: String, state: State) -> Self {
+ LanguageClient {
+ version,
+ state_mutex: Arc::new(Mutex::new(state)),
+ clients_mutex: Arc::new(Mutex::new(HashMap::new())),
+ }
+ }
+
+ pub fn version(&self) -> String {
+ self.version.clone()
+ }
+
  // NOTE: Don't expose this as public.
  // MutexGuard could easily halt the program when one guard is not released immediately after use.
  fn lock(&self) -> Result<MutexGuard<State>> {

src/language_server_protocol.rs

@@ -1108,7 +1108,7 @@ impl LanguageClient {
  InitializeParams {
  client_info: Some(ClientInfo {
  name: "LanguageClient-neovim".into(),
- version: Some(self.version.clone()),
+ version: Some(self.version()),
  }),
  process_id: Some(u64::from(std::process::id())),
  /* deprecated in lsp types, but can't initialize without it */

src/main.rs

@@ -13,8 +13,7 @@ mod vimext;
 mod watcher;
 
 use anyhow::Result;
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
+use language_client::LanguageClient;
 use types::State;
 
 #[macro_use]
@@ -26,11 +25,8 @@ fn main() -> Result<()> {
  let _ = clap::app_from_crate!().get_matches();
 
  let (tx, rx) = crossbeam::channel::unbounded();
- let language_client = language_client::LanguageClient {
- version: env!("CARGO_PKG_VERSION").into(),
- state_mutex: Arc::new(Mutex::new(State::new(tx)?)),
- clients_mutex: Arc::new(Mutex::new(HashMap::new())),
- };
-
+ let version = env!("CARGO_PKG_VERSION").into();
+ let state = State::new(tx)?;
+ let language_client = LanguageClient::new(version, state);
  language_client.loop_call(&rx)
 }