Add new special value <filedirectory> for rename default.

Author: skuroda

AdvancedNewFile.sublime-settings

@@ -108,7 +108,10 @@
 
     // Default input for renaming a file. Special value <filename> will be replaced
     // with the current file name. Special value <filepath> will be replaced with
-    // the complete filepath (i.e. it already includes the filename).
+    // the complete filepath, including the filename. Special value <filedirectory>
+    // will be replaced with the filepath, not including the filename. Note that a
+    // colon as the default will resolve to the same path as <filedirectory>, if the
+    // file exists on disk.
     "rename_default": "",
 
     // Setting to control if VCS management is used when moving and removing files.

README.md

@@ -150,7 +150,7 @@ String representing permissions to be applied to newly created files. E.g. "777"
 
 `rename_default`:
 
-Default input for renaming a file. Special value `<filename>` will be replaced with the current file name. Special value `<filepath>` will be replaced with the absolute path of the current file.
+Default input for renaming a file. Special value `<filename>` will be replaced with the current file name. Special value `<filepath>` will be replaced with the complete filepath, including the filename. Special value `<filedirectory>` will be replaced with the filepath, not including the filename. Note that a colon as the default will resolve to the same path as `<filedirectory>`, if the file exists on disk.
 
 `vcs_management`:
 

advanced_new_file/commands/move_file_command.py

@@ -21,8 +21,9 @@ def run(self, is_python=False, initial_path=None, rename_file=None):
         path = self.settings.get(RENAME_DEFAULT_SETTING)
         current_file = self.view.file_name()
         if current_file:
+            directory, current_file_name = os.path.split(current_file)
             path = path.replace("<filepath>", current_file)
-            current_file_name = os.path.basename(self.view.file_name())
+            path = path.replace("<filedirectory>", directory + os.sep)
         else:
             current_file_name = ""