8abed3b · helix · git.iko.soy

git.iko.soy/helix

feat(lsp): pass client_info on initialization (#4904)

Pass client name ('helix') and client version (version / git hash) to LSP server on initialization.

commit8abed3bd78200fc5f7e3890fd853c17ce518d157 authorMatouš Dzivjak <matousdzivjak@gmail.com> dateFri 9 Dec 2022, 04:57 (4 years ago) parent6798a66

7 files changed+32−24

compare with master

unifiedsplit

Cargo.lock+1 helix-loader/build.rs+20 helix-loader/src/lib.rs+2 helix-lsp/Cargo.toml+1 helix-lsp/src/client.rs+5−1 helix-term/build.rs−21 helix-term/src/main.rs+3−2

Cargo.lock+1

@@ -1187,6 +1187,7 @@ dependencies = [

11871187 "futures-executor",

11881188 "futures-util",

11891189 "helix-core",

1190+ "helix-loader",

11901191 "log",

11911192 "lsp-types",

11921193 "serde",

helix-loader/build.rs+20

@@ -1,6 +1,26 @@

1+use std::borrow::Cow;

2+use std::process::Command;

4+const VERSION: &str = include_str!("../VERSION");

16fn main() {

7+ let git_hash = Command::new("git")

8+ .args(["rev-parse", "HEAD"])

9+ .output()

10+ .ok()

11+ .filter(|output| output.status.success())

12+ .and_then(|x| String::from_utf8(x.stdout).ok());

13+

14+ let version: Cow<_> = match git_hash {

15+ Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),

16+ None => VERSION.into(),

17+ };

18+

219 println!(

320 "cargo:rustc-env=BUILD_TARGET={}",

421 std::env::var("TARGET").unwrap()

522 );

23+

24+ println!("cargo:rerun-if-changed=../VERSION");

25+ println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);

626}

helix-loader/src/lib.rs+2

@@ -4,6 +4,8 @@ pub mod grammar;

44use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};

55use std::path::PathBuf;

7+pub const VERSION_AND_GIT_HASH: &str = env!("VERSION_AND_GIT_HASH");

79pub static RUNTIME_DIR: once_cell::sync::Lazy<PathBuf> = once_cell::sync::Lazy::new(runtime_dir);

810

911static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();

helix-lsp/Cargo.toml+1

@@ -13,6 +13,7 @@ homepage = "https://helix-editor.com"

1313

1414[dependencies]

1515helix-core = { version = "0.6", path = "../helix-core" }

16+helix-loader = { version = "0.6", path = "../helix-loader" }

1617

1718anyhow = "1.0"

1819futures-executor = "0.3"

helix-lsp/src/client.rs+5−1

@@ -5,6 +5,7 @@ use crate::{

55};

77use helix_core::{find_root, ChangeSet, Rope};

8+use helix_loader::{self, VERSION_AND_GIT_HASH};

89use lsp_types as lsp;

910use serde::Deserialize;

1011use serde_json::Value;

@@ -376,7 +377,10 @@ impl Client {

376377 ..Default::default()

377378 },

378379 trace: None,

379− client_info: None,

380+ client_info: Some(lsp::ClientInfo {

381+ name: String::from("helix"),

382+ version: Some(String::from(VERSION_AND_GIT_HASH)),

383+ }),

380384 locale: None, // TODO

381385 };

382386

helix-term/build.rs−21

@@ -1,30 +1,9 @@

11use helix_loader::grammar::{build_grammars, fetch_grammars};

2−use std::borrow::Cow;

3−use std::process::Command;

4−

5−const VERSION: &str = include_str!("../VERSION");

73fn main() {

8− let git_hash = Command::new("git")

9− .args(["rev-parse", "HEAD"])

10− .output()

11− .ok()

12− .filter(|output| output.status.success())

13− .and_then(|x| String::from_utf8(x.stdout).ok());

14−

15− let version: Cow<_> = match git_hash {

16− Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),

17− None => VERSION.into(),

18− };

19−

204 if std::env::var("HELIX_DISABLE_AUTO_GRAMMAR_BUILD").is_err() {

215 fetch_grammars().expect("Failed to fetch tree-sitter grammars");

226 build_grammars(Some(std::env::var("TARGET").unwrap()))

237 .expect("Failed to compile tree-sitter grammars");

248 }

25−

26− println!("cargo:rerun-if-changed=../runtime/grammars/");

27− println!("cargo:rerun-if-changed=../VERSION");

28−

29− println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);

309}

helix-term/src/main.rs+3−2

@@ -1,5 +1,6 @@

11use anyhow::{Context, Error, Result};

22use crossterm::event::EventStream;

3+use helix_loader::VERSION_AND_GIT_HASH;

34use helix_term::application::Application;

45use helix_term::args::Args;

56use helix_term::config::Config;

@@ -74,7 +75,7 @@ FLAGS:

7475 --hsplit Splits all given files horizontally into different windows

7576",

7677 env!("CARGO_PKG_NAME"),

77− env!("VERSION_AND_GIT_HASH"),

78+ VERSION_AND_GIT_HASH,

7879 env!("CARGO_PKG_AUTHORS"),

7980 env!("CARGO_PKG_DESCRIPTION"),

8081 logpath.display(),

@@ -89,7 +90,7 @@ FLAGS:

8990 }

9091

9192 if args.display_version {

92− println!("helix {}", env!("VERSION_AND_GIT_HASH"));

93+ println!("helix {}", VERSION_AND_GIT_HASH);

9394 std::process::exit(0);

9495 }

9596