aboutsummaryrefslogtreecommitdiff
path: root/helix-term
diff options
context:
space:
mode:
authorMatouš Dzivjak2022-12-09 03:57:03 +0000
committerGitHub2022-12-09 03:57:03 +0000
commit8abed3bd78200fc5f7e3890fd853c17ce518d157 (patch)
tree8edd1bf79e309fe32bb3cd6dad9848a4113ffdc8 /helix-term
parent6798a6651f9d314eacefddfd051661b030ca9d78 (diff)
feat(lsp): pass client_info on initialization (#4904)
Pass client name ('helix') and client version (version / git hash) to LSP server on initialization.
Diffstat (limited to 'helix-term')
-rw-r--r--helix-term/build.rs21
-rw-r--r--helix-term/src/main.rs5
2 files changed, 3 insertions, 23 deletions
diff --git a/helix-term/build.rs b/helix-term/build.rs
index 719113ff..b47dae8e 100644
--- a/helix-term/build.rs
+++ b/helix-term/build.rs
@@ -1,30 +1,9 @@
use helix_loader::grammar::{build_grammars, fetch_grammars};
-use std::borrow::Cow;
-use std::process::Command;
-
-const VERSION: &str = include_str!("../VERSION");
fn main() {
- let git_hash = Command::new("git")
- .args(["rev-parse", "HEAD"])
- .output()
- .ok()
- .filter(|output| output.status.success())
- .and_then(|x| String::from_utf8(x.stdout).ok());
-
- let version: Cow<_> = match git_hash {
- Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),
- None => VERSION.into(),
- };
-
if std::env::var("HELIX_DISABLE_AUTO_GRAMMAR_BUILD").is_err() {
fetch_grammars().expect("Failed to fetch tree-sitter grammars");
build_grammars(Some(std::env::var("TARGET").unwrap()))
.expect("Failed to compile tree-sitter grammars");
}
-
- println!("cargo:rerun-if-changed=../runtime/grammars/");
- println!("cargo:rerun-if-changed=../VERSION");
-
- println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
}
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index 96b695c6..aac5c537 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -1,5 +1,6 @@
use anyhow::{Context, Error, Result};
use crossterm::event::EventStream;
+use helix_loader::VERSION_AND_GIT_HASH;
use helix_term::application::Application;
use helix_term::args::Args;
use helix_term::config::Config;
@@ -74,7 +75,7 @@ FLAGS:
--hsplit Splits all given files horizontally into different windows
",
env!("CARGO_PKG_NAME"),
- env!("VERSION_AND_GIT_HASH"),
+ VERSION_AND_GIT_HASH,
env!("CARGO_PKG_AUTHORS"),
env!("CARGO_PKG_DESCRIPTION"),
logpath.display(),
@@ -89,7 +90,7 @@ FLAGS:
}
if args.display_version {
- println!("helix {}", env!("VERSION_AND_GIT_HASH"));
+ println!("helix {}", VERSION_AND_GIT_HASH);
std::process::exit(0);
}