Minor fixes from refactoring

Author: skuroda

advanced_new_file/commands/copy_file_command.py

@@ -34,8 +34,9 @@ def entered_file_action(self, path):
                 print("Exception: %s '%s'" % (e.strerror, e.filename))
 
         if attempt_copy:
-            if self._copy_file(path):
-                self.open_file(path)
+            copy_success, new_file = self._copy_file(path)
+            if copy_success:
+                self.open_file(new_file)
 
     def _copy_file(self, path):
         if os.path.isdir(path) or re.search(r"(/|\\)$", path):
@@ -52,7 +53,7 @@ def _copy_file(self, path):
             copied = False
             sublime.error_message("Unable to copy file. No source file to move")
 
-        return copied
+        return (copied, path)
 
     def copy_from_view(self, source_view, target):
         source = source_view.file_name()

advanced_new_file/commands/duplicate_file_base.py

@@ -62,8 +62,6 @@ def is_copy_original_name(self, path):
 
     def try_append_extension(self, path):
         append_setting = self.get_append_extension_setting()
-        print(append_setting)
-        print(self.settings.get(append_setting))
         if self.settings.get(append_setting, False):
             if not self.is_copy_original_name(path):
                 _, new_path_extension = os.path.splitext(path)

advanced_new_file/commands/move_file_command.py

@@ -84,10 +84,11 @@ def move_from_view(self, source_view, target):
         self.open_file(target)
 
     def move_file_from_disk(self, source, target):
+        window = self.window
         self.view.run_command("save")
         window.focus_view(self.view)
         window.run_command("close")
-        self._move_action(filename, file_path)
+        self._move_action(source, target)
 
     def move_file_from_buffer(self, source_view, target):
         window = self.window