Changed gutter color (using other available sublime scopes) for errors and unused variable features, added new test, updated .travis.yml and CONTRIBUTING.md, updated flow_cli.py, vue projects can now choose template

Author: pichillilorenzo

.travis.yml

@@ -25,6 +25,7 @@ install:
       fi
     - sh travis.sh bootstrap
     - sh travis.sh install_color_scheme_unit
+    - sh travis.sh install_keypress
     - sh travis.sh install_terminal_view_package
 
 script:

CONTRIBUTING.md

@@ -16,7 +16,7 @@ Working on your first Pull Request? You can learn how from this *free* series, [
 
 ## Submitting code
 
-Any code change should be submitted as a pull request. Please, before submit it, run the tests using the [UnitTesting](https://github.com/SublimeText/UnitTesting) Sublime Text package. The description should explain what the code does and give steps to execute it. If necessary, the description should also contain screenshots showing up the new behaviour. The pull request should also contain tests.
+Any code change should be submitted as a pull request. Please, before submit it, run the tests using the [UnitTesting](https://github.com/SublimeText/UnitTesting) Sublime Text package (in this case you need to install manually also this package: [Keypress](https://github.com/randy3k/Keypress)). The description should explain what the code does and give steps to execute it. If necessary, the description should also contain screenshots showing up the new behaviour. The pull request should also contain tests.
 When you are changing the code of this plugin, I recommend to use [AutomaticPackageReloader](https://github.com/randy3k/AutomaticPackageReloader) to test quickly the new changes. It automatically reload submodules while developing a Sublime Text package without the need of reopening the editor.
 
 ## Code review process

changelog/0.16.0.txt

@@ -19,6 +19,8 @@ v0.16.0
 - Improved completions detection from default_autocomplete.json
 - Added flow warnings
 
+## Misc
+- Changed gutter color (using other available sublime scopes) for errors and unused variable features.
 
 =================================================================
 ** THIS PLUGIN IS IN BETA! Thanks for your support in advance! **

main.py

@@ -164,9 +164,11 @@ def plugin_unloaded():
     global fixPathSettings
     fixPathSettings.clear_on_change('fixpath-reload')
 
-  node = NodeJS(check_local=True)
-  sublime.set_timeout_async(lambda: node.execute("flow", ["stop"], is_from_bin=True, chdir=FLOW_DEFAULT_CONFIG_PATH))
-
+  flow_ide_clients_copy = flow_ide_clients.copy()
+  for root, client in flow_ide_clients_copy.items():
+    flow_ide_clients[root].stop()
+    flow_cli = FlowCLI(None)
+    flow_cli.stop(root=root)
 
 def plugin_loaded():
 

src/commands/project/vue/main.py

@@ -7,7 +7,11 @@
 from ....libs import Hook
 
 def vue_ask_custom_path(project_path, type):
-    sublime.active_window().show_input_panel("Vue CLI custom path", "vue", lambda vue_custom_path: vue_prepare_project(project_path, vue_custom_path) if type == "create_new_project" or type == "add_project_type" else add_vue_settings(project_path, vue_custom_path), None, None)
+
+  def vue_ask_project_template(project_path, vue_custom_path):
+    sublime.active_window().show_input_panel("Vue project template", "webpack", lambda vue_project_template: vue_prepare_project(project_path, vue_custom_path, vue_project_template), None, None)
+
+  sublime.active_window().show_input_panel("Vue CLI custom path", "vue", lambda vue_custom_path: vue_ask_project_template(project_path, vue_custom_path) if type == "create_new_project" or type == "add_project_type" else add_vue_settings(project_path, vue_custom_path), None, None)
 
 def add_vue_settings(working_directory, vue_custom_path):
   project_path = working_directory
@@ -44,16 +48,16 @@ def add_vue_settings(working_directory, vue_custom_path):
   with open(vue_settings, 'w+', encoding="utf-8") as file:
     file.write(json.dumps(default_config, indent=2))
 
-def vue_prepare_project(project_path, vue_custom_path):
+def vue_prepare_project(project_path, vue_custom_path, vue_project_template):
 
   terminal = Terminal(cwd=project_path)
 
   if sublime.platform() != "windows": 
     open_project = ["&&", shlex.quote(util.sublime_executable_path()), shlex.quote(util.get_project_settings(project_path)["project_file_name"])] if not util.is_project_open(util.get_project_settings(project_path)["project_file_name"]) else []
-    terminal.run([shlex.quote(vue_custom_path), "init", "webpack", "."] + open_project)
+    terminal.run([shlex.quote(vue_custom_path), "init", vue_project_template, "."] + open_project)
   else:
     open_project = [util.sublime_executable_path(), util.get_project_settings(project_path)["project_file_name"], "&&", "exit"] if not util.is_project_open(util.get_project_settings(project_path)["project_file_name"]) else []
-    terminal.run([vue_custom_path, "init", "webpack", "."])
+    terminal.run([vue_custom_path, "init", vue_project_template, "."])
     if open_project:
       terminal.run(open_project)
 

src/commands/refactor/safe_delete.py

@@ -1,5 +1,5 @@
 import sublime, sublime_plugin
-import os, shutil, traceback, json
+import os, traceback, json
 from ...libs import util
 from ...libs import window_view_manager
 from ...libs import FlowCLI

src/libs/flow/flow_cli.py

@@ -246,11 +246,45 @@ def get_imports(self, files=[], options=[], **kwargs):
 
     return result
 
+  def stop(self, root=FLOW_DEFAULT_CONFIG_PATH, options=[], **kwargs):
+
+    self.flow_cli = "flow"
+    self.is_from_bin = True
+    self.chdir = root
+    self.use_node = True
+    self.bin_path = ""
+
+    settings = util.get_project_settings(project_dir_name=root)
+    if settings and settings["project_settings"]["flow_cli_custom_path"]:
+      self.flow_cli = os.path.basename(settings["project_settings"]["flow_cli_custom_path"])
+      self.bin_path = os.path.dirname(settings["project_settings"]["flow_cli_custom_path"])
+      self.is_from_bin = False
+      self.chdir = settings["project_dir_name"]
+      self.use_node = False
+
+    node = NodeJS(check_local=True)
+    
+    result = node.execute(
+      self.flow_cli,
+      [
+        'stop',
+        '--from', 'sublime_text',
+        './'
+      ] + options,
+      is_from_bin=self.is_from_bin,
+      chdir=self.chdir,
+      bin_path=self.bin_path,
+      use_node=self.use_node
+    )
+    
+    return result
+
   @staticmethod
   def parse_cli_dependencies(view, **kwargs):
+
     filename = view.file_name()
-    
     project_settings = util.get_project_settings()
+
     if project_settings:
       project_root = project_settings["project_dir_name"]
     else:

src/libs/node.py

@@ -53,7 +53,7 @@ def execute(self, command, command_args, is_from_bin=False, chdir="", wait_termi
         args = ([self.node_js_path] if use_node else []) + [os.path.join( (bin_path or NODE_MODULES_BIN_PATH), command)] + command_args
     else :
       args = ([self.node_js_path] if use_node else []) + [os.path.join( (bin_path or NODE_MODULES_BIN_PATH), command)] + command_args
-    
+
     return util.execute(args[0], args[1:], chdir=chdir, wait_terminate=wait_terminate, func_stdout=func_stdout, args_func_stdout=args_func_stdout)
 
   def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_temp=False, use_only_filename_view_flow=False, fp_temp_contents="", is_output_json=False, chdir="", clean_output_flow=False, bin_path="", use_node=True, command_arg_escape=True) :

src/listeners/project/npm/Main_disabled.sublime-menu

@@ -1 +1 @@
-[{"id": "tools", "children": [{"id": "npm_scripts", "children": [], "caption": "Npm/Yarn Scripts"}], "caption": "Tools"}]
+[{"id": "tools", "caption": "Tools", "children": [{"id": "npm_scripts", "caption": "Npm/Yarn Scripts", "children": []}]}]

src/listeners/show_flow_errors.py

@@ -13,7 +13,6 @@
 
 class JavascriptEnhancementsShowFlowErrorsViewEventListener(JavascriptEnhancementsWaitModifiedAsyncViewEventListener, sublime_plugin.ViewEventListener):
 
-  description_by_row = {}
   description_by_row_column = {}
   diagnostics = {
     "error": [],
@@ -23,6 +22,10 @@ class JavascriptEnhancementsShowFlowErrorsViewEventListener(JavascriptEnhancemen
     "error": [],
     "warning": []
   }
+  diagnostic_scope = {
+    "error": "storage",
+    "warning": "keyword"
+  }
   callback_setted_use_flow_checker_on_current_view = False
   prefix_thread_name = "javascript_enhancements_show_flow_errors_view_event_listener"
   wait_time = .15
@@ -128,7 +131,6 @@ def on_modified_async_with_thread(self, recheck=True):
         "error": [],
         "warning": []
      }
-    self.description_by_row = {}
     self.description_by_row_column = {}
 
     if result[0] and len(result[1]['errors']) > 0:
@@ -166,15 +168,6 @@ def on_modified_async_with_thread(self, recheck=True):
             description += " " + message['descr']
 
         if row >= 0 :
-          row_description = self.description_by_row.get(row)
-          if not row_description:
-            self.description_by_row[row] = {
-              "col": col,
-              "description": description
-            }
-          if row_description and description not in row_description:
-            self.description_by_row[row]["description"] += '; ' + description
-
           self.description_by_row_column[str(row)+":"+str(endrow)+":"+str(col)+":"+str(endcol)+":"+error_level] = description
 
     if not self.modified :
@@ -186,7 +179,7 @@ def on_modified_async_with_thread(self, recheck=True):
 
         if value:
 
-          view.add_regions( 'javascript_enhancements_flow_' + key, value, 'keyword', 'dot', sublime.DRAW_SQUIGGLY_UNDERLINE | sublime.DRAW_NO_FILL | sublime.DRAW_NO_OUTLINE )
+          view.add_regions( 'javascript_enhancements_flow_' + key, value, self.diagnostic_scope[key], 'dot', sublime.DRAW_SQUIGGLY_UNDERLINE | sublime.DRAW_NO_FILL | sublime.DRAW_NO_OUTLINE )
 
           if not need_update_sublime_status:
             need_update_sublime_status = True