development/deno
development/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno synced 2024-08-27 03:50:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(lsp): include scope uri in "deno/didChangeDenoConfiguration" (#22002)

Browse source
This commit is contained in:
Nayeem Rahman 2024-01-23 06:12:41 +00:00 committed by GitHub
parent 2af0c0a3c6
commit ec97c7dd4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 74 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
cli/lsp/language_server.rs
View file

@ -1630,19 +1630,23 @@ impl Inner {
{
files_to_check.insert(url.clone());
}
config_changes.extend(
params
.changes
.iter()
.filter(|e| files_to_check.contains(&e.uri))
.map(|e| lsp_custom::DenoConfigurationChangeEvent {
uri: e.uri.clone(),
typ: lsp_custom::DenoConfigurationChangeType::from_file_change_type(
e.typ,
),
configuration_type: lsp_custom::DenoConfigurationType::DenoJson,
}),
);
if let Some(root_uri) = self.config.root_uri() {
config_changes.extend(
params
.changes
.iter()
.filter(|e| files_to_check.contains(&e.uri))
.map(|e| lsp_custom::DenoConfigurationChangeEvent {
scope_uri: root_uri.clone(),
file_uri: e.uri.clone(),
typ:
lsp_custom::DenoConfigurationChangeType::from_file_change_type(
e.typ,
),
configuration_type: lsp_custom::DenoConfigurationType::DenoJson,
}),
);
}
if let Err(err) = self.update_tsconfig().await {
self.client.show_message(MessageType::WARNING, err);
}
@ -1664,19 +1668,24 @@ impl Inner {
if let Some(package_json) = &self.maybe_package_json {
files_to_check.insert(package_json.specifier());
}
config_changes.extend(
params
.changes
.iter()
.filter(|e| files_to_check.contains(&e.uri))
.map(|e| lsp_custom::DenoConfigurationChangeEvent {
uri: e.uri.clone(),
typ: lsp_custom::DenoConfigurationChangeType::from_file_change_type(
e.typ,
),
configuration_type: lsp_custom::DenoConfigurationType::PackageJson,
}),
);
if let Some(root_uri) = self.config.root_uri() {
config_changes.extend(
params
.changes
.iter()
.filter(|e| files_to_check.contains(&e.uri))
.map(|e| lsp_custom::DenoConfigurationChangeEvent {
scope_uri: root_uri.clone(),
file_uri: e.uri.clone(),
typ:
lsp_custom::DenoConfigurationChangeType::from_file_change_type(
e.typ,
),
configuration_type:
lsp_custom::DenoConfigurationType::PackageJson,
}),
);
}
touched = true;
}
@ -3317,27 +3326,31 @@ impl tower_lsp::LanguageServer for LanguageServer {
ls.maybe_testing_server = Some(test_server);
}
let mut config_events = vec![];
if let Some(config_file) = ls.config.maybe_config_file() {
config_events.push(lsp_custom::DenoConfigurationChangeEvent {
uri: config_file.specifier.clone(),
typ: lsp_custom::DenoConfigurationChangeType::Added,
configuration_type: lsp_custom::DenoConfigurationType::DenoJson,
});
}
if let Some(package_json) = &ls.maybe_package_json {
config_events.push(lsp_custom::DenoConfigurationChangeEvent {
uri: package_json.specifier(),
typ: lsp_custom::DenoConfigurationChangeType::Added,
configuration_type: lsp_custom::DenoConfigurationType::PackageJson,
});
}
if !config_events.is_empty() {
ls.client.send_did_change_deno_configuration_notification(
lsp_custom::DidChangeDenoConfigurationNotificationParams {
changes: config_events,
},
);
if let Some(root_uri) = ls.config.root_uri() {
let mut config_events = vec![];
if let Some(config_file) = ls.config.maybe_config_file() {
config_events.push(lsp_custom::DenoConfigurationChangeEvent {
scope_uri: root_uri.clone(),
file_uri: config_file.specifier.clone(),
typ: lsp_custom::DenoConfigurationChangeType::Added,
configuration_type: lsp_custom::DenoConfigurationType::DenoJson,
});
}
if let Some(package_json) = &ls.maybe_package_json {
config_events.push(lsp_custom::DenoConfigurationChangeEvent {
scope_uri: root_uri.clone(),
file_uri: package_json.specifier(),
typ: lsp_custom::DenoConfigurationChangeType::Added,
configuration_type: lsp_custom::DenoConfigurationType::PackageJson,
});
}
if !config_events.is_empty() {
ls.client.send_did_change_deno_configuration_notification(
lsp_custom::DidChangeDenoConfigurationNotificationParams {
changes: config_events,
},
);
}
}
(ls.client.clone(), ls.http_client.clone())

3
cli/lsp/lsp_custom.rs
View file

@ -89,7 +89,8 @@ pub enum DenoConfigurationType {
#[derive(Debug, Eq, Hash, PartialEq, Clone, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct DenoConfigurationChangeEvent {
pub uri: lsp::Url,
pub scope_uri: lsp::Url,
pub file_uri: lsp::Url,
#[serde(rename = "type")]
pub typ: DenoConfigurationChangeType,
pub configuration_type: DenoConfigurationType,

18
cli/tests/integration/lsp_tests.rs
View file

@ -856,7 +856,8 @@ fn lsp_did_change_deno_configuration_notification() {
res,
Some(json!({
"changes": [{
"uri": temp_dir.uri().join("deno.json").unwrap(),
"scopeUri": temp_dir.uri(),
"fileUri": temp_dir.uri().join("deno.json").unwrap(),
"type": "added",
"configurationType": "denoJson"
}],
@ -879,7 +880,8 @@ fn lsp_did_change_deno_configuration_notification() {
res,
Some(json!({
"changes": [{
"uri": temp_dir.uri().join("deno.json").unwrap(),
"scopeUri": temp_dir.uri(),
"fileUri": temp_dir.uri().join("deno.json").unwrap(),
"type": "changed",
"configurationType": "denoJson"
}],
@ -899,7 +901,8 @@ fn lsp_did_change_deno_configuration_notification() {
res,
Some(json!({
"changes": [{
"uri": temp_dir.uri().join("deno.json").unwrap(),
"scopeUri": temp_dir.uri(),
"fileUri": temp_dir.uri().join("deno.json").unwrap(),
"type": "removed",
"configurationType": "denoJson"
}],
@ -919,7 +922,8 @@ fn lsp_did_change_deno_configuration_notification() {
res,
Some(json!({
"changes": [{
"uri": temp_dir.uri().join("package.json").unwrap(),
"scopeUri": temp_dir.uri(),
"fileUri": temp_dir.uri().join("package.json").unwrap(),
"type": "added",
"configurationType": "packageJson"
}],
@ -939,7 +943,8 @@ fn lsp_did_change_deno_configuration_notification() {
res,
Some(json!({
"changes": [{
"uri": temp_dir.uri().join("package.json").unwrap(),
"scopeUri": temp_dir.uri(),
"fileUri": temp_dir.uri().join("package.json").unwrap(),
"type": "changed",
"configurationType": "packageJson"
}],
@ -959,7 +964,8 @@ fn lsp_did_change_deno_configuration_notification() {
res,
Some(json!({
"changes": [{
"uri": temp_dir.uri().join("package.json").unwrap(),
"scopeUri": temp_dir.uri(),
"fileUri": temp_dir.uri().join("package.json").unwrap(),
"type": "removed",
"configurationType": "packageJson"
}],