Merge 132566b into 94a22ef

timbrel · Feb 2, 2019 · cceed7e · cceed7e
2 parents 94a22ef + 132566b
commit cceed7e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/core/commands/diff.py b/core/commands/diff.py
@@ -93,7 +93,7 @@ def run_async(self, in_cached_mode=False, file_path=None, current_file=False, ba
             # Clickable line:
             # @@ -69,6 +69,7 @@ class GsHandleVintageousCommand(TextCommand):
             #           ^^ we want the second (current) line offset of the diff
-            settings.set("result_line_regex", r"^@@ [^+]*\+(\d+),")
+            settings.set("result_line_regex", r"^@@ [^+]*\+(\d+)")
             settings.set("result_base_dir", repo_path)
 
             if not title:

diff --git a/tests/fixtures/diff_1.txt b/tests/fixtures/diff_1.txt
@@ -6,7 +6,7 @@ diff --git a/core/commands/custom.py b/core/commands/custom.py
 index 1facb191..8b079d4d 100644
 --- a/core/commands/custom.py
 +++ b/core/commands/custom.py
-@@ -16,7 +16,7 @@ class CustomCommandThread(threading.Thread):
+@@ -16 +16 @@ class CustomCommandThread(threading.Thread):
          self.daemon = True
 
      def run(self):

diff --git a/tests/test_diff_view.py b/tests/test_diff_view.py
@@ -42,7 +42,6 @@ def tearDown(self):
 
     def test_extract_clickable_lines(self):
         REPO_PATH = '/not/there'
-        FILE_PATH = '/not/there/README.md'
         DIFF = fixture('diff_1.txt')
 
         when(GsDiffRefreshCommand).git('diff', ...).thenReturn(DIFF)
@@ -64,7 +63,6 @@ def test_extract_clickable_lines(self):
 
     def test_result_file_regex(self):
         REPO_PATH = '/not/there'
-        FILE_PATH = '/not/there/README.md'
         DIFF = fixture('diff_1.txt')
 
         when(GsDiffRefreshCommand).git('diff', ...).thenReturn(DIFF)