From f0a62730c12d2e4d3150dc89608a8aec19641faf Mon Sep 17 00:00:00 2001 From: Alessandro Scandone Date: Sun, 5 Jan 2025 23:30:53 +0100 Subject: [PATCH] fix: fix rebase issues --- compiler-core/src/language_server/tests.rs | 4 ++-- compiler-core/src/language_server/tests/completion.rs | 3 ++- compiler-core/src/language_server/tests/inlay_hints.rs | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/compiler-core/src/language_server/tests.rs b/compiler-core/src/language_server/tests.rs index 41868cb2d06..e60cd37997f 100644 --- a/compiler-core/src/language_server/tests.rs +++ b/compiler-core/src/language_server/tests.rs @@ -528,14 +528,14 @@ impl<'a> TestProject<'a> { engine } - fn build_path() -> TextDocumentIdentifier { + pub fn build_path() -> TextDocumentIdentifier { let path = Utf8PathBuf::from(if cfg!(target_family = "windows") { r"\\?\C:\src\app.gleam" } else { "/src/app.gleam" }); - let url = Url::from_file_path(path).expect("valid path"); + let url = Url::from_file_path(path).unwrap(); TextDocumentIdentifier::new(url) } diff --git a/compiler-core/src/language_server/tests/completion.rs b/compiler-core/src/language_server/tests/completion.rs index 4cbd08ae39c..206042f3004 100644 --- a/compiler-core/src/language_server/tests/completion.rs +++ b/compiler-core/src/language_server/tests/completion.rs @@ -367,7 +367,8 @@ pub opaque type Wibble { let _ = engine.compile_please(); // update src to the one we want to test _ = io.src_module("app", src); - let param = tester.build_path(position); + + let param = TextDocumentPositionParams::new(TestProject::build_path(), position); let response = engine.completion(param, src.into()); let mut completions = response.result.unwrap().unwrap_or_default(); diff --git a/compiler-core/src/language_server/tests/inlay_hints.rs b/compiler-core/src/language_server/tests/inlay_hints.rs index b0562eb52d1..31737f2832c 100644 --- a/compiler-core/src/language_server/tests/inlay_hints.rs +++ b/compiler-core/src/language_server/tests/inlay_hints.rs @@ -1,6 +1,6 @@ use crate::language_server::{ configuration::{Configuration, InlayHintsConfig}, - tests::{setup_engine, LanguageServerTestIO}, + tests::{setup_engine, LanguageServerTestIO, TestProject}, }; use lsp_types::{InlayHintParams, Position, Range}; @@ -186,7 +186,7 @@ fn inlay_hints_for_config(src: &str, user_config: Configuration) -> String { assert!(response.result.is_ok()); let params = InlayHintParams { - text_document: super::TestProject::build_path(), + text_document: TestProject::build_path(), work_done_progress_params: Default::default(), range: Range::new( Position::new(0, 0),