language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-28 04:45:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[red-knot] MDTest: Fix line numbers in error messages (#15932)

Browse source 
## Summary

Fix line number reporting in MDTest error messages.

## Test Plan

Introduced an error in a Markdown test and made sure that the line in
the error message matches.
This commit is contained in:
David Peter 2025-02-04 14:44:05 +01:00 • committed by GitHub
parent b5e5271adf
commit cc60701b59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/red_knot_test/src/lib.rs
View file

@ -135,7 +135,7 @@ fn run_test(db: &mut db::Db, test: &parser::MarkdownTest) -> Result<(), Failures
Some(TestFile { Some(TestFile {
file, file,
backtick_offset: embedded.md_offset, backtick_offset: embedded.backtick_offset,
}) })
}) })
.collect(); .collect();

15
crates/red_knot_test/src/parser.rs
View file

@ -148,7 +148,7 @@ pub(crate) struct EmbeddedFile<'s> {
pub(crate) code: &'s str, pub(crate) code: &'s str,
/// The offset of the backticks beginning the code block within the markdown file /// The offset of the backticks beginning the code block within the markdown file
pub(crate) md_offset: TextSize, pub(crate) backtick_offset: TextSize,
} }
#[derive(Debug)] #[derive(Debug)]
@ -306,6 +306,8 @@ impl<'s> Parser<'s> {
if self.cursor.eat_char2('`', '`') { if self.cursor.eat_char2('`', '`') {
// We saw the triple-backtick beginning of a code block. // We saw the triple-backtick beginning of a code block.
let backtick_offset = self.offset() - "```".text_len();
if self.preceding_blank_lines < 1 && self.explicit_path.is_none() { if self.preceding_blank_lines < 1 && self.explicit_path.is_none() {
bail!("Code blocks must start on a new line and be preceded by at least one blank line."); bail!("Code blocks must start on a new line and be preceded by at least one blank line.");
} }
@ -333,7 +335,7 @@ impl<'s> Parser<'s> {
code = &code[..code.len() - '\n'.len_utf8()]; code = &code[..code.len() - '\n'.len_utf8()];
} }
self.process_code_block(lang, code)?; self.process_code_block(lang, code, backtick_offset)?;
} else { } else {
let code_block_start = self.cursor.token_len(); let code_block_start = self.cursor.token_len();
let line = self.source.count_lines(TextRange::up_to(code_block_start)); let line = self.source.count_lines(TextRange::up_to(code_block_start));
@ -414,7 +416,12 @@ impl<'s> Parser<'s> {
Ok(()) Ok(())
} }
fn process_code_block(&mut self, lang: &'s str, code: &'s str) -> anyhow::Result<()> { fn process_code_block(
&mut self,
lang: &'s str,
code: &'s str,
backtick_offset: TextSize,
) -> anyhow::Result<()> {
// We never pop the implicit root section. // We never pop the implicit root section.
let section = self.stack.top(); let section = self.stack.top();
@ -457,7 +464,7 @@ impl<'s> Parser<'s> {
section, section,
lang, lang,
code, code,
md_offset: self.offset(), backtick_offset,
}); });
if let Some(current_files) = &mut self.current_section_files { if let Some(current_files) = &mut self.current_section_files {