diff --git a/editor-plugin/package-lock.json b/editor-plugin/package-lock.json index d4c0954..1fc7f1a 100644 --- a/editor-plugin/package-lock.json +++ b/editor-plugin/package-lock.json @@ -910,7 +910,6 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.13.1.tgz", "integrity": "sha512-1ELDPlnLvDQ5ybTSrMhRTFDfOQEOXNM+eP+3HT/Yq7ruWpciQw+Avi73pdEbA4SooCawEWo3dtYbF68gN7Ed1A==", "dev": true, - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "7.13.1", "@typescript-eslint/types": "7.13.1", @@ -1400,7 +1399,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", "dev": true, - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -2167,7 +2165,6 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "dev": true, - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -4404,7 +4401,6 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "dev": true, - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/lang_server/src/server.rs b/lang_server/src/server.rs index 430da7a..26970ea 100644 --- a/lang_server/src/server.rs +++ b/lang_server/src/server.rs @@ -1,4 +1,4 @@ -use std::{collections::HashMap, error::Error, path::PathBuf, str::FromStr}; +use std::{collections::HashMap, error::Error, path::PathBuf}; use anyhow::{anyhow, Context}; use cargo_scan::{ @@ -105,7 +105,9 @@ fn runner( .and_then(|folders| folders.first().map(|folder| folder.uri.clone())) .ok_or_else(|| anyhow!("Couldn't get root path from workspace folders"))?; - let root_crate_path = std::path::PathBuf::from_str(root_uri.path())?; + let root_crate_path = root_uri + .to_file_path() + .map_err(|_| anyhow!("Could not convert root URI to file path"))?; info!("Crate path received in cargo-scan LSP server: {}", root_crate_path.display()); let scan_res =