From f1d80a40689e6aa8f4407a47fdfa1ab37d0c3e04 Mon Sep 17 00:00:00 2001
From: konstin <konstin@mailbox.org>
Date: Tue, 20 Feb 2024 12:21:06 +0100
Subject: [PATCH 1/2] Better error message for missing space before semicolon
 in requirements

PEP 508 requires a space between a URL and the semicolon separating it from the markers to disambiguate it from a url ending with a semicolon. This is easy to get wrong because the space is not required after a plain name of PEP 440 specifier. The new error message explicitly points out the missing space.

Fixes #1637.
---
 crates/pep508-rs/src/lib.rs | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/crates/pep508-rs/src/lib.rs b/crates/pep508-rs/src/lib.rs
index c1a8c43d2e08..1dbb72ffd8ed 100644
--- a/crates/pep508-rs/src/lib.rs
+++ b/crates/pep508-rs/src/lib.rs
@@ -931,12 +931,16 @@ fn parse(cursor: &mut Cursor, working_dir: Option<&Path>) -> Result<Requirement,
 
     // ( url_req | name_req )?
     let requirement_kind = match cursor.peek_char() {
+        // url_req
         Some('@') => {
             cursor.next();
             Some(VersionOrUrl::Url(parse_url(cursor, working_dir)?))
         }
+        // name_req
         Some('(') => parse_version_specifier_parentheses(cursor)?,
+        // name_req
         Some('<' | '=' | '>' | '~' | '!') => parse_version_specifier(cursor)?,
+        // No requirements / any version
         Some(';') | None => None,
         Some(other) => {
             // Rewind to the start of the version specifier, to see if the user added a URL without
@@ -963,6 +967,8 @@ fn parse(cursor: &mut Cursor, working_dir: Option<&Path>) -> Result<Requirement,
         }
     };
 
+    let requirement_end = cursor.pos;
+
     // wsp*
     cursor.eat_whitespace();
     // quoted_marker?
@@ -976,12 +982,24 @@ fn parse(cursor: &mut Cursor, working_dir: Option<&Path>) -> Result<Requirement,
     // wsp*
     cursor.eat_whitespace();
     if let Some((pos, char)) = cursor.next() {
+        if let Some(VersionOrUrl::Url(url)) = requirement_kind {
+            // Unwrap safety: The `VerbatimUrl` we just parsed has a string source.
+            if url.given().unwrap().ends_with(';') && marker.is_none() {
+                return Err(Pep508Error {
+                    message: Pep508ErrorSource::String("Missing space before ';'".to_string()),
+                    start: requirement_end - ';'.len_utf8(),
+                    len: ';'.len_utf8(),
+                    input: cursor.to_string(),
+                });
+            }
+        }
+        let message = if marker.is_none() {
+            format!(r#"Expected end of input or ';', found '{char}'"#)
+        } else {
+            format!(r#"Expected end of input, found '{char}'"#)
+        };
         return Err(Pep508Error {
-            message: Pep508ErrorSource::String(if marker.is_none() {
-                format!(r#"Expected end of input or ';', found '{char}'"#)
-            } else {
-                format!(r#"Expected end of input, found '{char}'"#)
-            }),
+            message: Pep508ErrorSource::String(message),
             start: pos,
             len: char.len_utf8(),
             input: cursor.to_string(),
@@ -1470,9 +1488,9 @@ mod tests {
         assert_err(
             r#"name @ https://example.com/; extra == 'example'"#,
             indoc! {"
-                Expected end of input or ';', found 'e'
+                Missing space before ';'
                 name @ https://example.com/; extra == 'example'
-                                             ^"
+                                           ^"
             },
         );
     }

From bd4b2c10938a11d09d92180780748d9b10fc6a26 Mon Sep 17 00:00:00 2001
From: konstin <konstin@mailbox.org>
Date: Tue, 20 Feb 2024 17:29:40 +0100
Subject: [PATCH 2/2] More context for error message

---
 crates/pep508-rs/src/lib.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/pep508-rs/src/lib.rs b/crates/pep508-rs/src/lib.rs
index 1dbb72ffd8ed..e3b53747cc03 100644
--- a/crates/pep508-rs/src/lib.rs
+++ b/crates/pep508-rs/src/lib.rs
@@ -986,7 +986,9 @@ fn parse(cursor: &mut Cursor, working_dir: Option<&Path>) -> Result<Requirement,
             // Unwrap safety: The `VerbatimUrl` we just parsed has a string source.
             if url.given().unwrap().ends_with(';') && marker.is_none() {
                 return Err(Pep508Error {
-                    message: Pep508ErrorSource::String("Missing space before ';'".to_string()),
+                    message: Pep508ErrorSource::String(
+                        "Missing space before ';', the end of the URL is ambiguous".to_string(),
+                    ),
                     start: requirement_end - ';'.len_utf8(),
                     len: ';'.len_utf8(),
                     input: cursor.to_string(),
@@ -1488,7 +1490,7 @@ mod tests {
         assert_err(
             r#"name @ https://example.com/; extra == 'example'"#,
             indoc! {"
-                Missing space before ';'
+                Missing space before ';', the end of the URL is ambiguous
                 name @ https://example.com/; extra == 'example'
                                            ^"
             },