Add support for writing multiline queries

TheRealLorenz · Dec 2, 2023 · 39255e7 · 39255e7
1 parent 40a81e8
commit 39255e7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/demo.http b/demo.http
@@ -24,5 +24,7 @@ GET https://httpbin.org/get?param1=2&param2=3
 
 ###
 
-GET https://httpbin.org/get?param1=" 2"&param2="   3"
+GET https://httpbin.org/get
+    ?param1=" 2"
+    &param2="   3"
 
diff --git a/rq-core/src/grammar.pest b/rq-core/src/grammar.pest
@@ -13,7 +13,7 @@ method = { ("GET" | "DELETE" | "POST" | "PUT") }
 version = { "HTTP/" ~ ("0.9" | "1.0" | "1.1" | "2.0" | "3.0") }
 whitespace = _{ " " | "\t" | NEWLINE }
 
-query = { "?" ~ query_item ~ ("&" ~ query_item)* }
+query = { (NEWLINE ~ (" " | "\t")*)? ~ "?" ~ query_item ~ ((NEWLINE ~ (" " | "\t")*)? ~ "&" ~ query_item)* }
 query_item = { query_name ~ "=" ~ query_value }
 query_name = { (!(NEWLINE | "=") ~ ANY)+ }
 query_value = { (PUSH("'" | "\"") ~ (!PEEK ~ ANY)* ~ POP) | (!(NEWLINE | "&" | " ") ~ ANY)+ }

diff --git a/rq-core/src/parser.rs b/rq-core/src/parser.rs
@@ -299,4 +299,20 @@ authorization: token
         assert_eq!(file.requests[0].query.get("foo").unwrap(), " bar");
         assert_eq!(file.requests[0].query.get("baz").unwrap(), "  &ciao");
     }
+
+    #[test]
+    fn test_multiline_query() {
+        let input = r#"
+POST test.dev
+?foo=bar
+        &baz=42 HTTP/1.0
+authorization: token
+
+"#;
+        let file = assert_parses(input);
+        assert_eq!(file.requests.len(), 1);
+        assert_eq!(file.requests[0].query.len(), 2);
+        assert_eq!(file.requests[0].query.get("foo").unwrap(), "bar");
+        assert_eq!(file.requests[0].query.get("baz").unwrap(), "42");
+    }
 }