Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

Implement server_info (#1341)

Julien Voisin745cb2fc5bd9
diff --git a/harper-ls/src/backend.rs b/harper-ls/src/backend.rs
index 9785894fc..73dd35497 100644
--- a/harper-ls/src/backend.rs
+++ b/harper-ls/src/backend.rs
@@ -27,7 +27,7 @@ use tower_lsp_server::lsp_types::{
DidCloseTextDocumentParams, DidOpenTextDocumentParams, ExecuteCommandOptions,
ExecuteCommandParams, FileChangeType, FileSystemWatcher, GlobPattern, InitializeParams,
InitializeResult, InitializedParams, MessageType, PublishDiagnosticsParams, Range,
- Registration, ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind,
+ Registration, ServerCapabilities, ServerInfo, TextDocumentSyncCapability, TextDocumentSyncKind,
TextDocumentSyncOptions, TextDocumentSyncSaveOptions, Uri, WatchKind,
};
use tower_lsp_server::{Client, LanguageServer, UriExt};
@@ -41,6 +41,11 @@ use crate::ignored_lints_io::{load_ignored_lints, save_ignored_lints};
use crate::io_utils::fileify_path;
use harper_stats::{Record, Stats};
+/// Return harper-ls version
+pub fn ls_version() -> &'static str {
+ env!("CARGO_PKG_VERSION")
+}
+
pub struct Backend {
client: Client,
config: RwLock<Config>,
@@ -429,7 +434,10 @@ impl Backend {
impl LanguageServer for Backend {
async fn initialize(&self, _: InitializeParams) -> JsonResult<InitializeResult> {
Ok(InitializeResult {
- server_info: None,
+ server_info: Some(ServerInfo {
+ name: "harper-ls".to_owned(),
+ version: Some(ls_version().to_owned()),
+ }),
capabilities: ServerCapabilities {
code_action_provider: Some(CodeActionProviderCapability::Simple(true)),
execute_command_provider: Some(ExecuteCommandOptions {
diff --git a/harper-ls/src/main.rs b/harper-ls/src/main.rs
index 7c6686d7b..f3d039090 100644
--- a/harper-ls/src/main.rs
+++ b/harper-ls/src/main.rs
@@ -22,11 +22,6 @@ use tracing_subscriber::FmtSubscriber;
static DEFAULT_ADDRESS: &str = "127.0.0.1:4000";
-/// Return harper-ls version
-pub fn ls_version() -> &'static str {
- env!("CARGO_PKG_VERSION")
-}
-
/// Start a language server to provide grammar checking inside of developer
/// environments.
///
@@ -103,5 +98,5 @@ async fn log_version_info() {
"Current harper-core version: {}",
harper_core::core_version()
);
- info!("Current harper-ls version: {}", ls_version());
+ info!("Current harper-ls version: {}", backend::ls_version());
}