Skip to content

Speedup linenum header parsing and allow extra spaces in between the two sets of numbers #41

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

Draft
kit-ty-kate wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Speedup linenum header parsing and allow extra spaces in between the two sets of numbers #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions src/patch.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,21 +118,23 @@ let rec apply_hunk ~cleanly ~fuzz (last_matched_line, offset, rope) ({mine_start

let to_start_len data =
(* input being "?19,23" *)
match Lib.String.cut ',' (Lib.String.slice ~start:1 data) with
| None when data = "+1" || data = "-1" -> (1, 1)
| None -> invalid_arg ("start_len broken in " ^ data)
| Some (start, len) -> (int_of_string start, int_of_string len)
if data = "+1" || data = "-1" then
(1, 1)
else
match Lib.String.cut ',' data with
| None -> invalid_arg ("start_len broken in " ^ data)
| Some (start, len) -> (Int.abs (int_of_string start), Int.abs (int_of_string len))

let count_to_sl_sl data =
if Lib.String.is_prefix ~prefix:"@@ -" data then
(* input: "@@ -19,23 +19,12 @@ bla" *)
(* output: ((19,23), (19, 12)) *)
match List.filter (function "" -> false | _ -> true) (Lib.String.cuts '@' data) with
| numbers::_ ->
match String.split_on_char '@' data with
| ""::""::numbers::_ ->
let nums = String.trim numbers in
(match Lib.String.cut ' ' nums with
| None -> invalid_arg "couldn't find space in count"
| Some (mine, theirs) -> Some (to_start_len mine, to_start_len theirs))
| Some (mine, theirs) -> Some (to_start_len mine, to_start_len (String.trim theirs)))
| _ -> invalid_arg "broken line!"
else
None
Expand Down
Loading