Merge branch 'main' into fix_lsp_open_docs_root

cli/lsp/config.rs

@@ -592,7 +592,6 @@ impl Config {
  workspace: ModuleSpecifier,
  enabled_paths: Vec<String>,
  ) -> bool {
- let workspace = ensure_directory_specifier(workspace);
  let mut touched = false;
  if !enabled_paths.is_empty() {
  if let Ok(workspace_path) = specifier_to_file_path(&workspace) {

cli/lsp/language_server.rs

@@ -322,7 +322,7 @@ impl LanguageServer {
  }
  }
 
- pub async fn refresh_specifiers_from_client(&self) {
+ pub async fn refresh_specifiers_from_client(&self) -> bool {
  let (client, specifiers) =
  {
  let ls = self.0.read().await;
@@ -365,6 +365,7 @@ impl LanguageServer {
  let mut touched = false;
  if let Some(specifiers) = specifiers {
  let configs_result = client
+ .when_outside_lsp_lock()
  .specifier_configurations(
  specifiers
  .iter()
@@ -375,10 +376,11 @@ impl LanguageServer {
 
  let mut ls = self.0.write().await;
  if let Ok(configs) = configs_result {
- for (i, value) in configs.into_iter().enumerate() {
+ for (value, internal_uri) in
+ configs.into_iter().zip(specifiers.into_iter().map(|s| s.1))
+ {
  match value {
  Ok(specifier_settings) => {
- let internal_uri = specifiers[i].1.clone();
  if ls
  .config
  .set_specifier_settings(internal_uri, specifier_settings)
@@ -403,6 +405,7 @@ impl LanguageServer {
  ls.send_diagnostics_update();
  }
  }
+ touched
  }
 }
 
@@ -1130,55 +1133,14 @@ impl Inner {
 
  fn refresh_documents_config(&mut self) {
  self.documents.update_config(
- self.config.root_dirs(),
  self.maybe_import_map.clone(),
  self.maybe_config_file.as_ref(),
  self.maybe_package_json.as_ref(),
- self.npm_resolver.api().clone(),
- self.npm_resolver.resolution().clone(),
+ self.npm_api.clone(),
+ self.npm_resolution.clone(),
  );
  }
 
- async fn initialized(&mut self, _: InitializedParams) {
- if self
- .config
- .client_capabilities
- .workspace_did_change_watched_files
- {
- // we are going to watch all the JSON files in the workspace, and the
- // notification handler will pick up any of the changes of those files we
- // are interested in.
- let watch_registration_options =
- DidChangeWatchedFilesRegistrationOptions {
- watchers: vec![FileSystemWatcher {
- glob_pattern: "**/*.{json,jsonc}".to_string(),
- kind: Some(WatchKind::Change),
- }],
- };
- let registration = Registration {
- id: "workspace/didChangeWatchedFiles".to_string(),
- method: "workspace/didChangeWatchedFiles".to_string(),
- register_options: Some(
- serde_json::to_value(watch_registration_options).unwrap(),
- ),
- };
- if let Err(err) =
- self.client.register_capability(vec![registration]).await
- {
- warn!("Client errored on capabilities.\n{:#}", err);
- }
- }
-
- if self.config.client_capabilities.testing_api {
- let test_server = testing::TestServer::new(
- self.client.clone(),
- self.performance.clone(),
- self.config.root_uri.clone(),
- );
- self.maybe_testing_server = Some(test_server);
- }
- }
-
  async fn shutdown(&self) -> LspResult<()> {
  Ok(())
  }
@@ -2838,10 +2800,59 @@ impl tower_lsp::LanguageServer for LanguageServer {
  language_server.initialize(params).await
  }
 
- async fn initialized(&self, params: InitializedParams) {
- self.0.write().await.initialized(params).await;
+ async fn initialized(&self, _: InitializedParams) {
+ let mut maybe_registration = None;
+ let client = {
+ let mut ls = self.0.write().await;
+ if ls
+ .config
+ .client_capabilities
+ .workspace_did_change_watched_files
+ {
+ // we are going to watch all the JSON files in the workspace, and the
+ // notification handler will pick up any of the changes of those files we
+ // are interested in.
+ let watch_registration_options =
+ DidChangeWatchedFilesRegistrationOptions {
+ watchers: vec![FileSystemWatcher {
+ glob_pattern: "**/*.{json,jsonc}".to_string(),
+ kind: Some(WatchKind::Change),
+ }],
+ };
+ maybe_registration = Some(Registration {
+ id: "workspace/didChangeWatchedFiles".to_string(),
+ method: "workspace/didChangeWatchedFiles".to_string(),
+ register_options: Some(
+ serde_json::to_value(watch_registration_options).unwrap(),
+ ),
+ });
+ }
 
- self.refresh_specifiers_from_client().await;
+ if ls.config.client_capabilities.testing_api {
+ let test_server = testing::TestServer::new(
+ ls.client.clone(),
+ ls.performance.clone(),
+ ls.config.root_uri.clone(),
+ );
+ ls.maybe_testing_server = Some(test_server);
+ }
+ ls.client.clone()
+ };
+
+ if let Some(registration) = maybe_registration {
+ if let Err(err) = client
+ .when_outside_lsp_lock()
+ .register_capability(vec![registration])
+ .await
+ {
+ warn!("Client errored on capabilities.\n{:#}", err);
+ }
+ }
+
+ if !self.refresh_specifiers_from_client().await {
+ // force update config
+ self.0.write().await.refresh_documents_config();
+ }
 
  lsp_log!("Server ready.");
  }
@@ -2862,7 +2873,8 @@ impl tower_lsp::LanguageServer for LanguageServer {
  let mut inner = self.0.write().await;
  let client = inner.client.clone();
  let client_uri = params.text_document.uri.clone();
- let specifier = inner.url_map.normalize_url(&client_uri);
+ let specifier =
+ inner.url_map.normalize_url(&client_uri, LspUrlKind::File);
  let document = inner.did_open(&specifier, params).await;
  let has_specifier_settings =
  inner.config.has_specifier_settings(&specifier);
@@ -2882,7 +2894,10 @@ impl tower_lsp::LanguageServer for LanguageServer {
  // retrieve the specifier settings outside the lock if
  // they haven't been asked for yet
  if !had_specifier_settings {
- let response = client.specifier_configuration(&client_uri).await;
+ let response = client
+ .when_outside_lsp_lock()
+ .specifier_configuration(&client_uri)
+ .await;
  let mut ls = self.0.write().await;
  match response {
  Ok(specifier_settings) => {
@@ -2903,6 +2918,7 @@ impl tower_lsp::LanguageServer for LanguageServer {
  {
  ls.refresh_documents_config();
  ls.send_diagnostics_update();
+ ls.send_testing_update();
  }
  }
  }
@@ -2979,17 +2995,17 @@ impl tower_lsp::LanguageServer for LanguageServer {
  &self,
  params: DidChangeWorkspaceFoldersParams,
  ) {
- let mark = {
+ let (performance, mark) = {
  let mut ls = self.0.write().await;
  let mark = ls
  .performance
  .mark("did_change_workspace_folders", Some(&params));
  ls.did_change_workspace_folders(params);
- mark
+ (ls.performance.clone(), mark)
  };
 
  self.refresh_specifiers_from_client().await;
- self.0.read().await.performance.measure(mark);
+ performance.measure(mark);
  }
 
  async fn document_symbol(

cli/lsp/tsc.rs

@@ -2749,6 +2749,8 @@ fn op_script_names(state: &mut OpState) -> Vec<String> {
  let state = state.borrow_mut::<State>();
  let documents = &state.state_snapshot.documents;
  let all_docs = documents.documents(false, true);
+ let mut result = Vec::new();
+ let mut seen = HashSet::new();
 
  let mut result = Vec::with_capacity(all_docs.len() + 1);
 
@@ -2767,7 +2769,7 @@ fn op_script_names(state: &mut OpState) -> Vec<String> {
  }
 
  // finally include the documents and all their dependencies
- for doc in &open_docs {
+ for doc in &all_docs {
  let specifier = doc.specifier();
  if seen.insert(specifier.as_str()) {
  result.push(specifier.to_string());
@@ -2788,7 +2790,6 @@ fn op_script_names(state: &mut OpState) -> Vec<String> {
  }
  }
 
- result.extend(all_docs.into_iter().map(|d| d.specifier().to_string()));
  result
 }
 

cli/lsp/urls.rs

@@ -148,13 +148,20 @@ impl LspUrlMap {
  /// converted into proper module specifiers, as well as handle situations
  /// where the client encodes a file URL differently than Rust does by default
  /// causing issues with string matching of URLs.
- pub fn normalize_url(&self, url: &Url) -> ModuleSpecifier {
+ ///
+ /// Note: Sometimes the url provided by the client may not have a trailing slash,
+ /// so we need to force it to in the mapping and nee to explicitly state whether
+ /// this is a file or directory url.
+ pub fn normalize_url(&self, url: &Url, kind: LspUrlKind) -> ModuleSpecifier {
  let mut inner = self.0.lock();
  if let Some(specifier) = inner.get_specifier(url).cloned() {
  specifier
  } else {
  let specifier = if let Ok(path) = url.to_file_path() {
- Url::from_file_path(path).unwrap()
+ match kind {
+ LspUrlKind::Folder => Url::from_directory_path(path).unwrap(),
+ LspUrlKind::File => Url::from_file_path(path).unwrap(),
+ }
  } else {
  url.clone()
  };