Skip to content

Add support for URI fragments #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 7, 2024
Merged

Add support for URI fragments #1387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
589ee96
Add support for URI fragments
Lysxia Oct 4, 2024
7373d7c
fmt
rgrinberg Oct 7, 2024
73363fd
promote tests
rgrinberg Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions lsp/src/uri0.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ type t = Uri_lexer.t =
; authority : string
; path : string
; query : string option
; fragment : string option
}

let query t = t.query
let fragment t = t.fragment

let backslash_to_slash =
String.map ~f:(function
Expand All @@ -35,7 +37,7 @@ let of_path path =
Uri_lexer.of_path path
;;

let to_path { path; authority; scheme; query } =
let to_path { path; authority; scheme; query; _ } =
let path =
let len = String.length path in
if len = 0
Expand Down Expand Up @@ -104,7 +106,7 @@ let encode ?(allow_slash = false) s =
Buffer.contents buf
;;

let to_string { scheme; authority; path; query } =
let to_string { scheme; authority; path; query; fragment } =
let buff = Buffer.create 64 in
if not (String.is_empty scheme)
then (
Expand Down Expand Up @@ -147,6 +149,11 @@ let to_string { scheme; authority; path; query } =
| Some q ->
Buffer.add_char buff '?';
Buffer.add_string buff (encode q));
(match fragment with
| None -> ()
| Some f ->
Buffer.add_char buff '#';
Buffer.add_string buff (encode f));
Buffer.contents buff
;;

Expand Down
2 changes: 2 additions & 0 deletions lsp/src/uri0.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ val hash : t -> int
val to_path : t -> string
val of_path : string -> t
val to_string : t -> string
val of_string : string -> t
val query : t -> string option
val fragment : t -> string option

module Private : sig
val win32 : bool ref
Expand Down
1 change: 1 addition & 0 deletions lsp/src/uri_lexer.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ type t =
; authority : string
; path : string
; query : string option
; fragment : string option
}

val of_string : string -> t
Expand Down
16 changes: 9 additions & 7 deletions lsp/src/uri_lexer.mll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ type t =
; authority : string
; path : string
; query: string option
; fragment: string option
}

let int_of_hex_char c =
Expand Down Expand Up @@ -84,7 +85,8 @@ and uri = parse
([^':' '/' '?' '#']+ as scheme ':') ?
("//" ([^ '/' '?' '#']* as authority)) ?
([^ '?' '#']* as path)
(('?' ([^ '#']* as raw_query) '#'?)) ?
('?' ([^ '#']* as raw_query)) ?
('#' (_ * as fragment)) ?
{
let scheme = scheme |> Option.value ~default:"file" in
let authority =
Expand All @@ -102,15 +104,15 @@ and uri = parse
| None -> None
| Some c -> Some (query (Buffer.create (String.length c)) (Lexing.from_string c))
in
{ scheme; authority; path; query }
{ scheme; authority; path; query; fragment }
}

and path = parse
| "" { { scheme = "file"; authority = ""; path = "/"; query = None } }
| "//" ([^ '/']* as authority) (['/']_* as path) { { scheme = "file"; authority; path ; query = None } }
| "//" ([^ '/']* as authority) { { scheme = "file"; authority; path = "/" ; query = None } }
| ("/" _* as path) { { scheme = "file"; authority = ""; path ; query = None } }
| (_* as path) { { scheme = "file"; authority = ""; path = "/" ^ path ; query = None } }
| "" { { scheme = "file"; authority = ""; path = "/"; query = None; fragment = None } }
| "//" ([^ '/']* as authority) (['/']_* as path) { { scheme = "file"; authority; path ; query = None ; fragment = None } }
| "//" ([^ '/']* as authority) { { scheme = "file"; authority; path = "/" ; query = None ; fragment = None } }
| ("/" _* as path) { { scheme = "file"; authority = ""; path ; query = None ; fragment = None } }
| (_* as path) { { scheme = "file"; authority = ""; path = "/" ^ path ; query = None ; fragment = None } }

{
let of_string s =
Expand Down
4 changes: 2 additions & 2 deletions lsp/test/uri_tests.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ let%expect_test "of_string -> to_string" =
[%expect
{|
Unix:
file://shares/pröjects/c%23/#l12 -> file://shares/pr%C3%B6jects/c%23/
file://shares/pröjects/c%23/#l12 -> file://shares/pr%C3%B6jects/c%23/#l12
file://sh%c3%a4res/path -> file://sh%C3%A4res/path
untitled:c:/Users/jrieken/Code/abc.txt -> untitled:c%3A/Users/jrieken/Code/abc.txt
untitled:C:/Users/jrieken/Code/abc.txt -> untitled:c%3A/Users/jrieken/Code/abc.txt
Expand All @@ -267,7 +267,7 @@ let%expect_test "of_string -> to_string" =
file:///pro%2Fjects/ -> file:///pro/jects/
vscode://mount/test.ml -> vscode://mount/test.ml
Windows:
file://shares/pröjects/c%23/#l12 -> file://shares/pr%C3%B6jects/c%23/
file://shares/pröjects/c%23/#l12 -> file://shares/pr%C3%B6jects/c%23/#l12
file://sh%c3%a4res/path -> file://sh%C3%A4res/path
untitled:c:/Users/jrieken/Code/abc.txt -> untitled:c%3A/Users/jrieken/Code/abc.txt
untitled:C:/Users/jrieken/Code/abc.txt -> untitled:c%3A/Users/jrieken/Code/abc.txt
Expand Down
Loading