mirror of
https://github.com/helix-editor/helix.git
synced 2025-04-05 20:07:44 +03:00
parent
5d61631507
commit
84e799f0e4
1 changed files with 8 additions and 4 deletions
|
@ -235,7 +235,10 @@ impl Client {
|
||||||
|
|
||||||
pub(crate) async fn initialize(&self) -> Result<lsp::InitializeResult> {
|
pub(crate) async fn initialize(&self) -> Result<lsp::InitializeResult> {
|
||||||
// TODO: delay any requests that are triggered prior to initialize
|
// TODO: delay any requests that are triggered prior to initialize
|
||||||
let root = find_root(None, &self.root_markers)
|
let root_path = find_root(None, &self.root_markers);
|
||||||
|
|
||||||
|
let root_uri = root_path
|
||||||
|
.clone()
|
||||||
.and_then(|root| lsp::Url::from_file_path(root).ok());
|
.and_then(|root| lsp::Url::from_file_path(root).ok());
|
||||||
|
|
||||||
if self.config.is_some() {
|
if self.config.is_some() {
|
||||||
|
@ -245,9 +248,10 @@ impl Client {
|
||||||
#[allow(deprecated)]
|
#[allow(deprecated)]
|
||||||
let params = lsp::InitializeParams {
|
let params = lsp::InitializeParams {
|
||||||
process_id: Some(std::process::id()),
|
process_id: Some(std::process::id()),
|
||||||
// root_path is obsolete, use root_uri
|
// root_path is obsolete, but some clients like pyright still use it so we specify both.
|
||||||
root_path: None,
|
// clients will prefer _uri if possible
|
||||||
root_uri: root,
|
root_path: root_path.and_then(|path| path.to_str().map(|path| path.to_owned())),
|
||||||
|
root_uri,
|
||||||
initialization_options: self.config.clone(),
|
initialization_options: self.config.clone(),
|
||||||
capabilities: lsp::ClientCapabilities {
|
capabilities: lsp::ClientCapabilities {
|
||||||
workspace: Some(lsp::WorkspaceClientCapabilities {
|
workspace: Some(lsp::WorkspaceClientCapabilities {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue