Skip to content

Commit 14bacca

Browse files
lionel-lionel-
committed
Reformat
1 parent 4a841a2 commit 14bacca

3 files changed

Lines changed: 18 additions & 37 deletions

File tree

‎crates/ark/src/lsp/goto_definition.rs‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,7 @@ mod parked_salsa_tests {
523523
let helpers_uri = lsp_types::Url::from_file_path(dir.path().join("helpers.R")).unwrap();
524524

525525
let mut state = WorldState::default();
526-
state
527-
.insert_document(script_uri.clone(), script_doc.clone());
526+
state.insert_document(script_uri.clone(), script_doc.clone());
528527
state.workspace.folders = vec![lsp_types::Url::from_directory_path(dir.path()).unwrap()];
529528

530529
let params = make_params(script_uri, 1, 0);
@@ -551,8 +550,7 @@ mod parked_salsa_tests {
551550

552551
let mut state = WorldState::default();
553552
state.insert_document(helpers_uri.clone(), helpers_doc);
554-
state
555-
.insert_document(script_uri.clone(), script_doc.clone());
553+
state.insert_document(script_uri.clone(), script_doc.clone());
556554

557555
// Cursor on `helper` (line 1, col 0)
558556
let params = make_params(script_uri, 1, 0);
@@ -632,8 +630,7 @@ mod parked_salsa_tests {
632630
lsp_types::Url::from_file_path(script_dir.path().join("script.R")).unwrap();
633631

634632
let mut state = WorldState::default();
635-
state
636-
.insert_document(script_uri.clone(), script_doc.clone());
633+
state.insert_document(script_uri.clone(), script_doc.clone());
637634
// helpers.R is intentionally NOT inserted into state.documents
638635

639636
let params = make_params(script_uri, 1, 0);
@@ -752,8 +749,7 @@ mod parked_salsa_tests {
752749
let script_uri = lsp_types::Url::from_file_path(dir.path().join("script.R")).unwrap();
753750

754751
let mut state = WorldState::default();
755-
state
756-
.insert_document(script_uri.clone(), script_doc.clone());
752+
state.insert_document(script_uri.clone(), script_doc.clone());
757753

758754
// Should resolve without hanging. Both symbols are reachable
759755
// because a.R is visited first (gets its exports + b.R's exports),
@@ -797,8 +793,7 @@ mod parked_salsa_tests {
797793
let script_uri = lsp_types::Url::from_file_path(dir.path().join("script.R")).unwrap();
798794

799795
let mut state = WorldState::default();
800-
state
801-
.insert_document(script_uri.clone(), script_doc.clone());
796+
state.insert_document(script_uri.clone(), script_doc.clone());
802797

803798
let helpers_uri = lsp_types::Url::from_file_path(dir.path().join("helpers.R")).unwrap();
804799

@@ -843,8 +838,7 @@ mod parked_salsa_tests {
843838
let script_uri = lsp_types::Url::from_file_path(dir.path().join("script.R")).unwrap();
844839

845840
let mut state = WorldState::default();
846-
state
847-
.insert_document(script_uri.clone(), script_doc.clone());
841+
state.insert_document(script_uri.clone(), script_doc.clone());
848842

849843
// `foo` on line 2 should resolve to the LOCAL definition on line 1,
850844
// not to the sourced one from helpers.R.
@@ -891,8 +885,7 @@ mod parked_salsa_tests {
891885
let script_uri = lsp_types::Url::from_file_path(dir.path().join("script.R")).unwrap();
892886

893887
let mut state = WorldState::default();
894-
state
895-
.insert_document(script_uri.clone(), script_doc.clone());
888+
state.insert_document(script_uri.clone(), script_doc.clone());
896889

897890
let helpers_uri = lsp_types::Url::from_file_path(dir.path().join("helpers.R")).unwrap();
898891
let a_uri = lsp_types::Url::from_file_path(dir.path().join("a.R")).unwrap();
@@ -940,8 +933,7 @@ mod parked_salsa_tests {
940933
let script_doc = Document::new("source(\"script.R\")\nmy_var <- 1\nmy_var\n", None);
941934

942935
let mut state = WorldState::default();
943-
state
944-
.insert_document(script_uri.clone(), script_doc.clone());
936+
state.insert_document(script_uri.clone(), script_doc.clone());
945937

946938
// `my_var` (line 2) should resolve to its own definition on line 1,
947939
// not to a Sourced duplicate.
@@ -985,8 +977,7 @@ mod parked_salsa_tests {
985977
let script_uri = lsp_types::Url::from_file_path(dir.path().join("script.R")).unwrap();
986978

987979
let mut state = WorldState::default();
988-
state
989-
.insert_document(script_uri.clone(), script_doc.clone());
980+
state.insert_document(script_uri.clone(), script_doc.clone());
990981

991982
let (index, file_scope) = state.file_analysis(&script_uri, &script_doc);
992983

@@ -1024,8 +1015,7 @@ mod parked_salsa_tests {
10241015
let script_uri = lsp_types::Url::from_file_path(dir.path().join("script.R")).unwrap();
10251016

10261017
let mut state = WorldState::default();
1027-
state
1028-
.insert_document(script_uri.clone(), script_doc.clone());
1018+
state.insert_document(script_uri.clone(), script_doc.clone());
10291019

10301020
let b_uri = lsp_types::Url::from_file_path(dir.path().join("b.R")).unwrap();
10311021

@@ -1053,8 +1043,7 @@ mod parked_salsa_tests {
10531043
let script_uri = lsp_types::Url::from_file_path(dir.path().join("script.R")).unwrap();
10541044

10551045
let mut state = WorldState::default();
1056-
state
1057-
.insert_document(script_uri.clone(), script_doc.clone());
1046+
state.insert_document(script_uri.clone(), script_doc.clone());
10581047

10591048
let helpers_uri = lsp_types::Url::from_file_path(dir.path().join("helpers.R")).unwrap();
10601049

@@ -1092,8 +1081,7 @@ mod parked_salsa_tests {
10921081
let script_uri = lsp_types::Url::from_file_path(dir.path().join("script.R")).unwrap();
10931082

10941083
let mut state = WorldState::default();
1095-
state
1096-
.insert_document(script_uri.clone(), script_doc.clone());
1084+
state.insert_document(script_uri.clone(), script_doc.clone());
10971085

10981086
let helpers_uri = lsp_types::Url::from_file_path(dir.path().join("helpers.R")).unwrap();
10991087

@@ -1126,8 +1114,7 @@ mod parked_salsa_tests {
11261114
let helpers_uri = lsp_types::Url::from_file_path(dir.path().join("helpers.R")).unwrap();
11271115

11281116
let mut state = WorldState::default();
1129-
state
1130-
.insert_document(script_uri.clone(), script_doc.clone());
1117+
state.insert_document(script_uri.clone(), script_doc.clone());
11311118

11321119
// `helper` on line 2 should resolve to helpers.R (source() shadows local)
11331120
let params = make_params(script_uri, 2, 0);
@@ -1164,8 +1151,7 @@ mod parked_salsa_tests {
11641151
let helpers_uri = lsp_types::Url::from_file_path(dir.path().join("helpers.R")).unwrap();
11651152

11661153
let mut state = WorldState::default();
1167-
state
1168-
.insert_document(script_uri.clone(), script_doc.clone());
1154+
state.insert_document(script_uri.clone(), script_doc.clone());
11691155

11701156
// `fn` on line 1 should resolve to the SECOND def in helpers.R (line 1)
11711157
let params = make_params(script_uri, 1, 0);

‎crates/ark/src/lsp/symbols.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use std::result::Result::Ok;
1111

1212
use aether_path::FilePath;
13-
1413
use stdext::unwrap::IntoResult;
1514
use tower_lsp::lsp_types::DocumentSymbol;
1615
use tower_lsp::lsp_types::DocumentSymbolParams;

‎crates/ark/src/lsp/tests/state_handlers.rs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,7 @@ fn test_r_file_changed_for_editor_open_file_is_skipped() {
239239
let mut state = workspace_state(tmp.path());
240240

241241
let url = Url::from_file_path(&path).unwrap();
242-
state
243-
.insert_document(url.clone(), Document::new("editor_v2\n", None));
242+
state.insert_document(url.clone(), Document::new("editor_v2\n", None));
244243
// Pretend the editor pushed its content into oak too.
245244
let url_id = FilePath::from_url(&url);
246245
state
@@ -319,8 +318,7 @@ fn test_r_file_deleted_for_editor_open_file_is_skipped() {
319318
let mut state = workspace_state(tmp.path());
320319

321320
let url = Url::from_file_path(&path).unwrap();
322-
state
323-
.insert_document(url.clone(), Document::new("editor_v2\n", None));
321+
state.insert_document(url.clone(), Document::new("editor_v2\n", None));
324322
let url_id = FilePath::from_url(&url);
325323
state
326324
.oak
@@ -546,8 +544,7 @@ fn test_did_change_workspace_folders_preserves_open_buffer_across_churn() {
546544
let r_path = tmp.path().join("pkg/R/a.R");
547545
let url = Url::from_file_path(&r_path).unwrap();
548546
let url_id = FilePath::from_url(&url);
549-
state
550-
.insert_document(url.clone(), Document::new("editor <- 2\n", None));
547+
state.insert_document(url.clone(), Document::new("editor <- 2\n", None));
551548
state
552549
.oak
553550
.upsert_editor(url_id.clone(), "editor <- 2\n".to_string());
@@ -607,8 +604,7 @@ fn test_did_close_releases_orphan_file_to_stale() {
607604

608605
// Simulate `didOpen` via state mutation (matches the rest of the file's
609606
// pattern).
610-
state
611-
.insert_document(url.clone(), Document::new("edited\n", None));
607+
state.insert_document(url.clone(), Document::new("edited\n", None));
612608
lsp_state
613609
.parsers
614610
.insert(url.clone(), tree_sitter::Parser::new());

0 commit comments

Comments
 (0)