Ignore punctuation characters before and after preview offset column

This is to allow line numbers in a ctags output (e.g. 123;")

2 files changed, 13 insertions, 4 deletions

diff --git a/src/terminal.go b/src/terminal.go
index 87703d3e..a7e9e9b2 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -23,12 +23,14 @@ import (
 // import "github.com/pkg/profile"
 
 var placeholder *regexp.Regexp
+var numericPrefix *regexp.Regexp
 var activeTempFiles []string
 
 const ellipsis string = ".."
 
 func init() {
 	placeholder = regexp.MustCompile(`\\?(?:{[+sf]*[0-9,-.]*}|{q}|{\+?f?nf?})`)
+	numericPrefix = regexp.MustCompile(`^[[:punct:]]*([0-9]+)`)
 	activeTempFiles = []string{}
 }
 
@@ -1361,7 +1363,11 @@ func (t *Terminal) replacePlaceholder(template string, forcePlus bool, input str
 
 // Ascii to positive integer
 func atopi(s string) int {
-	n, e := strconv.Atoi(strings.ReplaceAll(s, "'", ""))
+	matches := numericPrefix.FindStringSubmatch(s)
+	if len(matches) < 2 {
+		return 0
+	}
+	n, e := strconv.Atoi(matches[1])
 	if e != nil || n < 1 {
 		return 0
 	}
diff --git a/test/test_go.rb b/test/test_go.rb
index 2afb5b81..bb5eb45f 100755
--- a/test/test_go.rb
+++ b/test/test_go.rb
@@ -1801,9 +1801,12 @@ class TestGoFZF < TestBase
   end
 
   def test_preview_scroll_begin_and_offset
-    tmux.send_keys "echo foo 123 321 | #{FZF} --preview 'seq 1000' --preview-window left:+{2}-2", :Enter
-    tmux.until { |lines| lines.item_count == 1 }
-    tmux.until { |lines| assert_match %r{121.*121/1000}, lines[1] }
+    ['echo foo 123 321', 'echo foo :123: 321'].each do |input|
+      tmux.send_keys "#{input} | #{FZF} --preview 'seq 1000' --preview-window left:+{2}-2", :Enter
+      tmux.until { |lines| lines.item_count == 1 }
+      tmux.until { |lines| assert_match %r{121.*121/1000}, lines[1] }
+      tmux.send_keys 'C-c'
+    end
   end
 
   def test_normalized_match