From cdfc4d0a31b1918184b96538787af179b42ea758 Mon Sep 17 00:00:00 2001 From: Ekaterina Ryazantseva Date: Sat, 6 Jul 2024 21:11:45 +0300 Subject: [PATCH] add bold text check --- eipw-lint/src/lints/markdown/link_eip.rs | 11 +++++++---- eipw-lint/tests/lint_markdown_link_eip.rs | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/eipw-lint/src/lints/markdown/link_eip.rs b/eipw-lint/src/lints/markdown/link_eip.rs index 7659aa29..98f03e70 100644 --- a/eipw-lint/src/lints/markdown/link_eip.rs +++ b/eipw-lint/src/lints/markdown/link_eip.rs @@ -33,6 +33,7 @@ where re, slug, link_depth: 0, + text_depth: 0, current_link: Link { url: String::new(), text: String::new(), @@ -55,6 +56,7 @@ struct Visitor<'a, 'b, 'c> { re: Regex, slug: &'c str, link_depth: usize, + text_depth: usize, current_link: Link, } @@ -91,7 +93,7 @@ impl<'a, 'b, 'c> Visitor<'a, 'b, 'c> { }; let text_re = Regex::new(&dynamic_pattern).map_err(Error::custom)?; - if text_re.is_match(&self.current_link.text) { + if text_re.is_match(&self.current_link.text) && self.text_depth <= 1 { return Ok(Next::TraverseChildren); }; @@ -157,8 +159,9 @@ impl<'a, 'b, 'c> tree::Visitor for Visitor<'a, 'b, 'c> { Ok(Next::TraverseChildren) } - fn depart_link(&mut self, _: &Ast, _: &NodeLink) -> Result<(), Self::Error> { + fn depart_link(&mut self, ast: &Ast, _: &NodeLink) -> Result<(), Self::Error> { if self.link_depth > 0 { + self.check(ast)?; self.link_depth -= 1; } Ok(()) @@ -166,8 +169,8 @@ impl<'a, 'b, 'c> tree::Visitor for Visitor<'a, 'b, 'c> { fn enter_text(&mut self, ast: &Ast, txt: &str) -> Result { if self.link_depth > 0 { - self.current_link.text = txt.to_owned(); - self.check(ast)?; + self.text_depth += 1; + self.current_link.text.push_str(txt); } Ok(Next::SkipChildren) } diff --git a/eipw-lint/tests/lint_markdown_link_eip.rs b/eipw-lint/tests/lint_markdown_link_eip.rs index 5c5ae66a..7cc05bc1 100644 --- a/eipw-lint/tests/lint_markdown_link_eip.rs +++ b/eipw-lint/tests/lint_markdown_link_eip.rs @@ -147,7 +147,14 @@ header: value1 .await .unwrap() .into_inner(); - assert_ne!(reports, ""); + assert_eq!(reports, + r#"error[markdown-link-eip]: link text does not match link destination + | +4 | [EIP-1**EIP-1**](./eip-1.md) + | + = help: use `[EIP-1](./eip-1.md)` instead +"# + ); } #[tokio::test] @@ -169,7 +176,14 @@ header: value1 .await .unwrap() .into_inner(); - assert_ne!(reports, ""); + assert_eq!(reports, + r#"error[markdown-link-eip]: link text does not match link destination + | +4 | [EIP-1: eip motivation**EIP-1: eip motivation**](./eip-1.md#eip-motivation) + | + = help: use `[EIP-1: Eip motivation](./eip-1.md#eip-motivation)` instead +"# + ); } #[tokio::test]