renamed DeleteCurrentFile to avoid conflict with built in command del…

…ete_file
yaworsw · Jul 22, 2013 · 489f4d1 · 489f4d1
1 parent e210598
commit 489f4d1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/DeleteFile.py → DeleteCurrentFile.py b/DeleteFile.py → DeleteCurrentFile.py
@@ -1,8 +1,8 @@
 import sublime, sublime_plugin, os
 
-settings = sublime.load_settings('DeleteFile.sublime-settings')
+settings = sublime.load_settings('DeleteCurrentFile.sublime-settings')
 
-class DeleteFileCommand(sublime_plugin.TextCommand):
+class DeleteCurrentFileCommand(sublime_plugin.TextCommand):
   def run(self, edit, prompt_before_delete=None, auto_close_buffer=None):
 
     if prompt_before_delete == None:
@@ -20,8 +20,8 @@ def run(self, edit, prompt_before_delete=None, auto_close_buffer=None):
       if not sublime.ok_cancel_dialog('Are you sure you want to delete \'%s\'?' % file):
         return
 
-    if (file != None and os.path.isfile(view.file_name())):
-      os.remove(file)
-
     if auto_close_buffer:
       window.run_command('close')
+
+    if (file != None and os.path.isfile(view.file_name())):
+      os.remove(file)
diff --git a/DeleteFile.sublime-commands → DeleteCurrentFile.sublime-commands b/DeleteFile.sublime-commands → DeleteCurrentFile.sublime-commands
@@ -1,6 +1,6 @@
 [
   {
     "caption": "File: Delete",
-    "command": "delete_file"
+    "command": "delete_current_file"
   }
 ]
diff --git a/DeleteFile.sublime-project → DeleteCurrentFile.sublime-project b/DeleteFile.sublime-project → DeleteCurrentFile.sublime-project
diff --git a/DeleteFile.sublime-settings → DeleteCurrentFile.sublime-settings b/DeleteFile.sublime-settings → DeleteCurrentFile.sublime-settings
diff --git a/Main.sublime-menu b/Main.sublime-menu
@@ -12,18 +12,18 @@
         "children":
         [
           {
-            "caption": "DeleteFile",
+            "caption": "DeleteCurrentFile",
             "children":
             [
               {
                 "caption": "Settings – Default",
                 "command": "open_file",
-                "args": { "file": "${packages}/DeleteFile/DeleteFile.sublime-settings" },
+                "args": { "file": "${packages}/DeleteFile/DeleteCurrentFile.sublime-settings" },
               },
               {
                 "caption": "Settings – User",
                 "command": "open_file",
-                "args": { "file": "${packages}/User/DeleteFile.sublime-settings" }
+                "args": { "file": "${packages}/User/DeleteCurrentFile.sublime-settings" }
               }
             ]
           }

diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
-# Sublime-DeleteFile
+# Sublime-DeleteCurrentFile
 
 This plugin adds a command to the command palette which will delete the current file and close the buffer.