Bump lsp-types from 0.61.0 to 0.73.0

Cargo.toml

@@ -38,7 +38,7 @@ itertools = "0.8"
 jsonrpc-derive = { path = "crates/jsonrpc_derive" }
 lalrpop-util = "0.18"
 log = "0.4"
-lsp-types = { version = "0.61.0", features = ["proposed"] }
+lsp-types = "0.73.0"
 nom = "5.1"
 once_cell = "1.3"
 petgraph = { version = "0.5", features = ["serde-1"] }

src/feature.rs

@@ -309,6 +309,8 @@ impl FeatureTester {
  self.position,
  ),
  context: None,
+ work_done_progress_params: WorkDoneProgressParams::default(),
+ partial_result_params: PartialResultParams::default(),
  };
  let req = self.request(params).await;
  provider.execute(&req).await
@@ -319,7 +321,11 @@ impl FeatureTester {
  F: FeatureProvider<Params = FoldingRangeParams, Output = O>,
  {
  let text_document = self.identifier();
- let params = FoldingRangeParams { text_document };
+ let params = FoldingRangeParams {
+ text_document,
+ work_done_progress_params: WorkDoneProgressParams::default(),
+ partial_result_params: PartialResultParams::default(),
+ };
  let req = self.request(params).await;
  provider.execute(&req).await
  }
@@ -346,6 +352,7 @@ impl FeatureTester {
  context: ReferenceContext {
  include_declaration: self.include_declaration,
  },
+ work_done_progress_params: WorkDoneProgressParams::default(),
  };
  let req = self.request(params).await;
  provider.execute(&req).await
@@ -361,6 +368,7 @@ impl FeatureTester {
  self.position,
  ),
  new_name: self.new_name.clone(),
+ work_done_progress_params: WorkDoneProgressParams::default(),
  };
  let req = self.request(params).await;
  provider.execute(&req).await

src/link/latex_include.rs

@@ -40,6 +40,7 @@ impl LatexIncludeLinkProvider {
  if let Some(link) = req.snapshot().find(target).map(|doc| DocumentLink {
  range: paths[i].range(),
  target: doc.uri.clone().into(),
+ tooltip: None,
  }) {
  links.push(link);
  break;
@@ -70,6 +71,7 @@ mod tests {
  let expected_links = vec![DocumentLink {
  range: Range::new_simple(0, 7, 0, 14),
  target: FeatureTester::uri("bar.tex").into(),
+ tooltip: None,
  }];
 
  assert_eq!(actual_links, expected_links);

src/server.rs

@@ -118,35 +118,34 @@ impl<C: LspClient + Send + Sync + 'static> LatexLspServer<C> {
  "/".into(),
  " ".into(),
  ]),
+ ..CompletionOptions::default()
  }),
- signature_help_provider: None,
  definition_provider: Some(true),
- type_definition_provider: None,
- implementation_provider: None,
  references_provider: Some(true),
  document_highlight_provider: Some(true),
  document_symbol_provider: Some(true),
  workspace_symbol_provider: Some(true),
- code_action_provider: None,
- code_lens_provider: None,
  document_formatting_provider: Some(true),
- document_range_formatting_provider: None,
- document_on_type_formatting_provider: None,
  rename_provider: Some(RenameProviderCapability::Options(RenameOptions {
  prepare_provider: Some(true),
+ work_done_progress_options: WorkDoneProgressOptions::default(),
  })),
  document_link_provider: Some(DocumentLinkOptions {
  resolve_provider: Some(false),
+ work_done_progress_options: WorkDoneProgressOptions::default(),
  }),
- color_provider: None,
  folding_range_provider: Some(FoldingRangeProviderCapability::Simple(true)),
- execute_command_provider: None,
- workspace: None,
- selection_range_provider: None,
+ ..ServerCapabilities::default()
  };
 
  Lazy::force(&COMPONENT_DATABASE);
- Ok(InitializeResult { capabilities })
+ Ok(InitializeResult {
+ capabilities,
+ server_info: Some(ServerInfo {
+ name: "TexLab".to_owned(),
+ version: Some(env!("CARGO_PKG_VERSION").to_owned()),
+ }),
+ })
  }
 
  #[jsonrpc_method("initialized", kind = "notification")]

src/test/mod.rs

@@ -246,6 +246,7 @@ impl TestBed {
  root_uri: None,
  trace: None,
  workspace_folders: None,
+ client_info: None,
  })
  .await
  .unwrap();
@@ -348,6 +349,8 @@ impl TestBed {
  position: Position::new(line, character),
  },
  context: None,
+ work_done_progress_params: WorkDoneProgressParams::default(),
+ partial_result_params: PartialResultParams::default(),
  };
  self.client
  .completion(params)
@@ -359,6 +362,8 @@ impl TestBed {
  pub async fn folding_range(&self, relative_path: &str) -> Option<Vec<FoldingRange>> {
  let params = FoldingRangeParams {
  text_document: self.identifier(relative_path),
+ work_done_progress_params: WorkDoneProgressParams::default(),
+ partial_result_params: PartialResultParams::default(),
  };
  self.client.folding_range(params).await.ok()
  }
@@ -398,6 +403,7 @@ impl TestBed {
  context: ReferenceContext {
  include_declaration,
  },
+ work_done_progress_params: WorkDoneProgressParams::default(),
  };
  self.client.references(params).await.ok()
  }
@@ -426,6 +432,7 @@ impl TestBed {
  Position::new(line, character),
  ),
  new_name: new_name.into(),
+ work_done_progress_params: WorkDoneProgressParams::default(),
  };
  self.client.rename(params).await.ok()
  }

tests/link.rs

@@ -47,10 +47,12 @@ async fn default_settings() {
  DocumentLink {
  range: Range::new_simple(0, 9, 0, 16),
  target: test_bed.uri("foo/bar.tex").into(),
+ tooltip: None,
  },
  DocumentLink {
  range: Range::new_simple(1, 7, 1, 14),
  target: test_bed.uri("qux.tex").into(),
+ tooltip: None,
  },
  ];
  assert_eq!(actual_links, expected_links);
@@ -76,6 +78,7 @@ async fn root_directory() {
  let expected_links = vec![DocumentLink {
  range: Range::new_simple(0, 9, 0, 16),
  target: test_bed.uri("src/foo.tex").into(),
+ tooltip: None,
  }];
  assert_eq!(actual_links, expected_links);
 }
@@ -99,6 +102,7 @@ async fn parent_directory() {
  let expected_links = vec![DocumentLink {
  range: Range::new_simple(0, 16, 0, 26),
  target: test_bed.uri("foo.bib").into(),
+ tooltip: None,
  }];
  assert_eq!(actual_links, expected_links);
 }
@@ -137,6 +141,7 @@ async fn edit_file() {
  let expected_links = vec![DocumentLink {
  range: Range::new_simple(0, 9, 0, 12),
  target: test_bed.uri("foo.tex").into(),
+ tooltip: None,
  }];
  assert_eq!(actual_links, expected_links);
 }
@@ -162,6 +167,7 @@ async fn did_change_configuration() {
  let expected_links = vec![DocumentLink {
  range: Range::new_simple(0, 9, 0, 16),
  target: test_bed.uri("src/foo.tex").into(),
+ tooltip: None,
  }];
  assert_eq!(actual_links, expected_links);
 }

tests/workspace_symbol.rs

@@ -113,6 +113,7 @@ async fn run(query: &str) -> (TestBed, Vec<SymbolInformation>) {
 
  let params = WorkspaceSymbolParams {
  query: query.into(),
+ ..WorkspaceSymbolParams::default()
  };
  let actual_symbols = test_bed.client.workspace_symbol(params).await.unwrap();