From ce768bac834c1efebf2663b01f6e46db99329631 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Fri, 15 Mar 2024 10:27:43 -0400 Subject: chore(lsp): add tests for compiler options being resolved relative the config file (#22924) Investigation from #17298 --- tests/util/server/src/lib.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tests/util/server/src') diff --git a/tests/util/server/src/lib.rs b/tests/util/server/src/lib.rs index 5fd403992..6bc729199 100644 --- a/tests/util/server/src/lib.rs +++ b/tests/util/server/src/lib.rs @@ -668,7 +668,16 @@ pub fn wildcard_match_detailed( // Normalize line endings let original_text = text.replace("\r\n", "\n"); let mut current_text = original_text.as_str(); - let pattern = pattern.replace("\r\n", "\n"); + // normalize line endings and strip comments + let pattern = pattern + .split('\n') + .map(|line| line.trim_end_matches('\r')) + .filter(|l| { + let is_comment = l.starts_with("[#") && l.ends_with(']'); + !is_comment + }) + .collect::>() + .join("\n"); let mut output_lines = Vec::new(); let parts = parse_wildcard_pattern_text(&pattern).unwrap(); -- cgit v1.2.3