mirror of
https://github.com/ilyakooo0/helix.git
synced 2024-09-11 07:56:00 +03:00
feat(lsp): pass client_info on initialization (#4904)
Pass client name ('helix') and client version (version / git hash) to LSP server on initialization.
This commit is contained in:
parent
6798a6651f
commit
8abed3bd78
1
Cargo.lock
generated
1
Cargo.lock
generated
@ -1187,6 +1187,7 @@ dependencies = [
|
||||
"futures-executor",
|
||||
"futures-util",
|
||||
"helix-core",
|
||||
"helix-loader",
|
||||
"log",
|
||||
"lsp-types",
|
||||
"serde",
|
||||
|
@ -1,6 +1,26 @@
|
||||
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(),
|
||||
};
|
||||
|
||||
println!(
|
||||
"cargo:rustc-env=BUILD_TARGET={}",
|
||||
std::env::var("TARGET").unwrap()
|
||||
);
|
||||
|
||||
println!("cargo:rerun-if-changed=../VERSION");
|
||||
println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
|
||||
}
|
||||
|
@ -4,6 +4,8 @@
|
||||
use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
|
||||
use std::path::PathBuf;
|
||||
|
||||
pub const VERSION_AND_GIT_HASH: &str = env!("VERSION_AND_GIT_HASH");
|
||||
|
||||
pub static RUNTIME_DIR: once_cell::sync::Lazy<PathBuf> = once_cell::sync::Lazy::new(runtime_dir);
|
||||
|
||||
static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
|
||||
|
@ -13,6 +13,7 @@ homepage = "https://helix-editor.com"
|
||||
|
||||
[dependencies]
|
||||
helix-core = { version = "0.6", path = "../helix-core" }
|
||||
helix-loader = { version = "0.6", path = "../helix-loader" }
|
||||
|
||||
anyhow = "1.0"
|
||||
futures-executor = "0.3"
|
||||
|
@ -5,6 +5,7 @@
|
||||
};
|
||||
|
||||
use helix_core::{find_root, ChangeSet, Rope};
|
||||
use helix_loader::{self, VERSION_AND_GIT_HASH};
|
||||
use lsp_types as lsp;
|
||||
use serde::Deserialize;
|
||||
use serde_json::Value;
|
||||
@ -376,7 +377,10 @@ pub(crate) async fn initialize(&self) -> Result<lsp::InitializeResult> {
|
||||
..Default::default()
|
||||
},
|
||||
trace: None,
|
||||
client_info: None,
|
||||
client_info: Some(lsp::ClientInfo {
|
||||
name: String::from("helix"),
|
||||
version: Some(String::from(VERSION_AND_GIT_HASH)),
|
||||
}),
|
||||
locale: None, // TODO
|
||||
};
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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 @@ async fn main_impl() -> Result<i32> {
|
||||
--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 @@ async fn main_impl() -> Result<i32> {
|
||||
}
|
||||
|
||||
if args.display_version {
|
||||
println!("helix {}", env!("VERSION_AND_GIT_HASH"));
|
||||
println!("helix {}", VERSION_AND_GIT_HASH);
|
||||
std::process::exit(0);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user