Merge pull request #134 from fsouza/optional-columns-preview_fzf_grep

preview_fzf_grep: optional support for columns
yuki-yano · Jun 30, 2020 · b769e2e · b769e2e
2 parents 81498ad + 876052a
commit b769e2e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bin/preview_fzf_grep b/bin/preview_fzf_grep
@@ -9,7 +9,7 @@ import os
 bat_theme = (os.environ.get('FZF_PREVIEW_PREVIEW_BAT_THEME', 'ansi-dark'))
 
 GREP_OUTPUT_REGEX = re.compile(
-    r'(?P<dev_icon>.\s\s)?(?P<file_name>.+):(?P<line_num>\d+)(:(?P<match>.*))?'
+    r'(?P<dev_icon>.\s\s)?(?P<file_name>[^:]+):(?P<line_num>\d+)(:(?P<col>\d+))?(:(?P<match>.*))?'
 )
 CLEAN_LINE_REGEX = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
 
@@ -27,7 +27,7 @@ if not match:
     )
     sys.exit(1)
 
-file_name = match.group('file_name').split(':')[0]
+file_name = match.group('file_name')
 line_num = int(match.group('line_num'))
 start = max(line_num - 10, 1)
 last = line_num + 100