Merge branch 'st3'

Author: colinta

file_diffs.py

@@ -56,8 +56,7 @@ class FileDiffCommand(sublime_plugin.TextCommand):
     def diff_content(self):
         content = ''
 
-        regions = [region for region in self.view.sel()]
-        for region in regions:
+        for region in self.view.sel():
             if region.empty():
                 continue
             content += self.view.substr(region)
@@ -131,16 +130,19 @@ def diff_with_external(self, a, b, from_file=None, to_file=None):
                     self.view.window().run_command("exec", {"cmd": command})
         except Exception as e:
             # some basic logging here, since we are cluttering the /tmp folder
-            print repr(e)
             sublime.status_message(str(e))
 
     def diff_in_sublime(self, diffs):
+        diffs = ''.join(diffs)
         scratch = self.view.window().new_file()
         scratch.set_scratch(True)
         scratch.set_syntax_file('Packages/Diff/Diff.tmLanguage')
-        scratch_edit = scratch.begin_edit('file_diffs')
-        scratch.insert(scratch_edit, 0, ''.join(diffs))
-        scratch.end_edit(scratch_edit)
+        scratch.run_command('file_diff_dummy1', {'content': diffs})
+
+
+class FileDiffDummy1Command(sublime_plugin.TextCommand):
+    def run(self, edit, content):
+        self.view.insert(edit, 0, content)
 
 
 class FileDiffClipboardCommand(FileDiffCommand):
@@ -198,8 +200,7 @@ def run(self, edit, **kwargs):
 class FileDiffSavedCommand(FileDiffCommand):
     def run(self, edit, **kwargs):
         content = ''
-        regions = [region for region in self.view.sel()]
-        for region in regions:
+        for region in self.view.sel():
             if region.empty():
                 continue
             content += self.view.substr(region)
@@ -235,7 +236,7 @@ def on_done(index):
             if index > -1:
                 self.run_diff(self.diff_content(), files[index],
                     from_file=self.view.file_name())
-        self.view.window().show_quick_panel(file_picker, on_done)
+        sublime.set_timeout(lambda: self.view.window().show_quick_panel(file_picker, on_done), 1)
 
     def find_files(self, folders):
         # Cannot access these settings!!  WHY!?
@@ -291,4 +292,4 @@ def on_done(index):
             on_done(0)
         else:
             menu_items = [os.path.basename(f) for f in files]
-            self.view.window().show_quick_panel(menu_items, on_done)
+            sublime.set_timeout(lambda: self.view.window().show_quick_panel(menu_items, on_done), 1)

package.json

@@ -1,7 +1,17 @@
 {
-  "repo": "SublimeFileDiffs",
   "name": "FileDiffs",
   "description": "Shows diffs - also in an external diff tool - between the current file, or selection(s) in the current file, and clipboard, another file, or unsaved changes.",
-  "author": "Colin Thomas-Arnold (colinta), Sebastian Pape (spape), Jiri Urban (jiriurban)",
-  "homepage": "https://github.com/spape/SublimeFileDiffs"
+  "author": "Colin T.A. Gray (colinta), Sebastian Pape (spape), Jiri Urban (jiriurban)",
+  "details": "https://github.com/colinta/SublimeFileDiffs",
+  "labels": ["diff/merge"],
+  "releases": [
+    {
+      "details": "https://github.com/colinta/SublimeFileDiffs/tree/master",
+      "sublime_text": "<3000"
+    },
+    {
+      "details": "https://github.com/colinta/SublimeFileDiffs/tags",
+      "sublime_text": ">=3000"
+    }
+  ]
 }