Merge branch 'Veetaha-feat/sync-branch'

[rust.git] / crates / rust-analyzer / tests / heavy_tests / support.rs

diff --git a/crates/rust-analyzer/tests/heavy_tests/support.rs b/crates/rust-analyzer/tests/heavy_tests/support.rs
index 49f194f7efb6593c1a4a09302ea79d7ddcaf26ef..15d2a05a41961896395c6abdae4d85548bb0439e 100644 (file)
--- a/crates/rust-analyzer/tests/heavy_tests/support.rs
+++ b/crates/rust-analyzer/tests/heavy_tests/support.rs
@@ -202,7 +202,11 @@ pub fn wait_until_workspace_is_loaded(&self) {
                     ProgressParams {
                         token: lsp_types::ProgressToken::String(ref token),
                         value: ProgressParamsValue::WorkDone(WorkDoneProgress::End(_)),
+<<<<<<< HEAD
                     } if token == "rustAnalyzer/roots scanned" => true,
+=======
+                    } if token == "rustAnalyzer/rootsScanned" => true,
+>>>>>>> Veetaha-feat/sync-branch
                     _ => false,
                 }
             }