Miscellaneous refinement and bug fix

Author: lushang

aura.py

@@ -196,12 +196,13 @@ def __init__(self, *args, **kwargs):
         super(DestructLightningFromServer, self).__init__(*args, **kwargs)
 
     def run(self, dirs):
-        if sublime.ok_cancel_dialog("This will Delete the whole folder both from the server and local!" +
-                                    " Confirm to continue?"):
+        _, bundle_name = os.path.split(dirs[0])
+        if sublime.ok_cancel_dialog("This will Delete %s !" % bundle_name + " Confirm to continue?"):
             processor.handle_destructive_files(dirs, ignore_folder=False)
 
     def is_visible(self, dirs):
-        if len(dirs) == 0: return False
+        if len(dirs) == 0:
+            return False
         self.settings = context.get_settings()
         for _dir in dirs:
             attributes = util.get_file_attributes(_dir)
@@ -226,7 +227,7 @@ def run(self, dirs, element=""):
         template = templates.get("AuraElement").get(element)
         settings = context.get_settings()
         templates_path = os.path.join(settings["workspace"],
-            ".templates", template["directory"])
+                                      ".templates", template["directory"])
         with open(templates_path) as fp:
             body = fp.read()
 
@@ -297,15 +298,15 @@ def __init__(self, *args, **kwargs):
     def run(self, _type=""):
         self._type = _type
         self.window.show_input_panel("Please Input %s Name: " % _type,
-            "", self.on_input, None, None)
+                                     "", self.on_input, None, None)
 
     def on_input(self, lightning_name):
         # Create component to local according to user input
         if not re.match('^[a-zA-Z]+\\w+$', lightning_name):
             message = 'Invalid format, do you want to try again?'
             if not sublime.ok_cancel_dialog(message): return
             self.window.show_input_panel("Please Input %s Name: " % self._type,
-                "", self.on_input, None, None)
+                                         "", self.on_input, None, None)
             return
 
         # Get settings
@@ -326,10 +327,10 @@ def on_input(self, lightning_name):
             message = "%s is already exist, do you want to try again?" % lightning_name
             if not sublime.ok_cancel_dialog(message, "Try Again?"): return
             self.window.show_input_panel("Please Input Lightning Name: ",
-                "", self.on_input, None, None)
+                                         "", self.on_input, None, None)
             return
 
-        lightning_file = os.path.join(component_dir, lightning_name+template["extension"])
+        lightning_file = os.path.join(component_dir, lightning_name + template["extension"])
 
         # Create Aura lightning file
         with open(lightning_file, "w") as fp:

lwc.py

@@ -158,7 +158,8 @@ def create_resource(self, js_file_name=None):
                                       ".templates", template["directory"])
 
         extension = template["extension"]
-        element_name = (self.lwc_name if js_file_name is None else self.lwc_name + js_file_name) + extension
+        element_name = self.lwc_name if js_file_name is None else js_file_name
+        element_name += extension
 
         # Combine lwc element component name
         element_file = os.path.join(self._dir, element_name)