From d987b9b75b8f09ca9a07cbdc40995f2dd6bfb690 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sun, 8 Oct 2023 13:02:09 -0400
Subject: [PATCH] Remove line breaks from path and do not allow search option
 for protocol links.

---
 src/compare/diff.rs      |  2 +-
 src/parser/angle_link.rs |  7 ++-----
 src/types/object.rs      | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/compare/diff.rs b/src/compare/diff.rs
index 46319f9..c4a3967 100644
--- a/src/compare/diff.rs
+++ b/src/compare/diff.rs
@@ -3024,7 +3024,7 @@ fn compare_angle_link<'b, 's>(
         ),
         (
             EmacsField::Required(":path"),
-            |r| Some(r.path),
+            |r| Some(r.get_path()),
             compare_property_quoted_string
         ),
         (
diff --git a/src/parser/angle_link.rs b/src/parser/angle_link.rs
index 2b92e48..46a55fa 100644
--- a/src/parser/angle_link.rs
+++ b/src/parser/angle_link.rs
@@ -138,16 +138,13 @@ fn parse_protocol_angle_link<'b, 'g, 'r, 's>(
         tuple((parser_with_context!(protocol)(context), tag(":"))),
         |(protocol, _)| LinkType::Protocol(protocol.into()),
     )(input)?;
-    let (remaining, path) = alt((take_until("::"), rest))(remaining)?;
-    let (remaining, search_option) = opt(map(tuple((tag("::"), rest)), |(_, search_option)| {
-        search_option
-    }))(remaining)?;
+    let (remaining, path) = rest(remaining)?;
     Ok((
         remaining,
         PathAngle {
             link_type,
             path: path.into(),
-            search_option: search_option.map(Into::<&str>::into),
+            search_option: None,
             application: None,
         },
     ))
diff --git a/src/types/object.rs b/src/types/object.rs
index e1754f9..1eb54ab 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -732,3 +732,33 @@ impl<'s> RadioLink<'s> {
         self.path
     }
 }
+
+enum PathState {
+    Normal,
+    HasLineBreak(String),
+}
+
+impl<'s> AngleLink<'s> {
+    /// Remove line breaks but preserve multiple consecutive spaces.
+    pub fn get_path(&self) -> Cow<'s, str> {
+        let mut state = PathState::Normal;
+        for (offset, c) in self.path.char_indices() {
+            match (&mut state, c) {
+                (PathState::Normal, '\n') => {
+                    let mut ret = String::with_capacity(self.path.len());
+                    ret.push_str(&self.path[..offset]);
+                    state = PathState::HasLineBreak(ret);
+                }
+                (PathState::Normal, _) => {}
+                (PathState::HasLineBreak(_), '\n') => {}
+                (PathState::HasLineBreak(ret), _) => {
+                    ret.push(c);
+                }
+            }
+        }
+        match state {
+            PathState::Normal => Cow::Borrowed(self.path),
+            PathState::HasLineBreak(ret) => Cow::Owned(ret),
+        }
+    }
+}