From 0f763b514a8e1cbe724ef2ae177c250f98b810f5 Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Thu, 1 Aug 2019 17:23:23 +0200
Subject: [PATCH] Refactoring: introduce s:parse_hunk()

---
 autoload/sy/repo.vim |  6 +-----
 autoload/sy/sign.vim | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/autoload/sy/repo.vim b/autoload/sy/repo.vim
index 7e71fdd..37033c3 100644
--- a/autoload/sy/repo.vim
+++ b/autoload/sy/repo.vim
@@ -376,11 +376,7 @@ function! s:strip_context(context)
 
     if state == 0
       if line =~ "^@@ "
-        let tokens = matchlist(line, '^@@ -\v(\d+),?(\d*) \+(\d+),?(\d*)')
-        let old_line = str2nr(tokens[1])
-        let new_line = str2nr(tokens[3])
-        let old_count = empty(tokens[2]) ? 1 : str2nr(tokens[2])
-        let new_count = empty(tokens[4]) ? 1 : str2nr(tokens[4])
+        let [old_line, new_line, old_count, new_count] = sy#sign#parse_hunk(line)
         let hunk = []
         let state = 1
       else
diff --git a/autoload/sy/sign.vim b/autoload/sy/sign.vim
index 23b7038..f41deba 100644
--- a/autoload/sy/sign.vim
+++ b/autoload/sy/sign.vim
@@ -60,13 +60,7 @@ function! sy#sign#process_diff(sy, vcs, diff) abort
     let a:sy.lines = []
     let ids        = []
 
-    let tokens = matchlist(line, '^@@ -\v(\d+),?(\d*) \+(\d+),?(\d*)')
-
-    let old_line = str2nr(tokens[1])
-    let new_line = str2nr(tokens[3])
-
-    let old_count = empty(tokens[2]) ? 1 : str2nr(tokens[2])
-    let new_count = empty(tokens[4]) ? 1 : str2nr(tokens[4])
+    let [old_line, new_line, old_count, new_count] = sy#sign#parse_hunk(line)
 
     " Workaround for non-conventional diff output in older Fossil versions:
     " https://fossil-scm.org/forum/forumpost/834ce0f1e1
@@ -227,6 +221,18 @@ function! sy#sign#remove_all_signs(bufnr) abort
   let sy.hunks = []
 endfunction
 
+" Function: #parse_hunk {{{1
+" Parse a hunk as '@@ -273,3 +267,14' into [old_line, new_line, old_count, new_count]
+function! sy#sign#parse_hunk(diffline) abort
+  let tokens = matchlist(a:diffline, '^@@ -\v(\d+),?(\d*) \+(\d+),?(\d*)')
+  return [
+        \ str2nr(tokens[1]),
+        \ str2nr(tokens[3]),
+        \ empty(tokens[2]) ? 1 : str2nr(tokens[2]),
+        \ empty(tokens[4]) ? 1 : str2nr(tokens[4])
+        \ ]
+endfunction
+
 " Function: s:add_sign {{{1
 function! s:add_sign(sy, line, type, ...) abort
   call add(a:sy.lines, a:line)
@@ -272,4 +278,3 @@ function! s:external_sign_present(sy, line) abort
     return 1
   endif
 endfunction
-