Handle in-word underscores

flying-sheep · Jun 3, 2020 · 6c41888 · 6c41888
1 parent ef64405
commit 6c41888
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'rst_parser'
-version = '0.3.1'
+version = '0.3.2'
 authors = ['Philipp A. <[email protected]>']
 edition = '2018'
 description = 'a reStructuredText parser'

diff --git a/parser/src/rst.pest b/parser/src/rst.pest
@@ -148,7 +148,7 @@ literal       =  { (!("`"|" ") ~ inline_nested)+ ~ (" "+ ~ (!("`"|" ") ~ inline_
 // inline links
 reference = { reference_target | reference_explicit | reference_auto }
 
-reference_target = { reference_target_uq ~ "_" | reference_target_qu }
+reference_target = { (reference_target_uq ~ "_" | reference_target_qu) ~ !(LETTER|NUMBER) }
 reference_target_uq =  { (!("_"|":"|"`") ~ nonspacechar)+ }
 reference_target_qu = { ( !("`"? ~ "`_") ~ "`" ~ !"``" ) ~ reference_text? ~ ("<" ~ reference_bracketed ~ ">")? ~ ( "`" ~ !"``" ) ~ "_" }
 reference_text = { !"<" ~ ( !("`"|"<") ~ ANY )+ }

diff --git a/parser/src/tests.rs b/parser/src/tests.rs
@@ -104,6 +104,18 @@ fn two_targets() {
 	};
 }
 
+#[test]
+fn inline_code_literal_with_underscore() {
+    parses_to! {
+        parser: RstParser,
+        input: "``NAME_WITH_UNDERSCORE``",
+        rule: Rule::inline,
+        tokens: [
+            literal(2, 22, [str_nested(2, 22)]),
+        ]
+    };
+}
+
 #[allow(clippy::cognitive_complexity)]
 #[test]
 fn admonitions() {