fix #23, Fixed auto-complete tooltip that was showing up also in on_selection_modified event, Updated flow-bin to 0.64.0

Author: pichillilorenzo

.gitignore

@@ -2,4 +2,5 @@
 node_binaries/
 node_modules/
 **/__pycache__
-/helper/bookmarks/bookmarks.json
+/helper/bookmarks/bookmarks.json
+package-lock.json

_generated_2018_01_25_at_15_56_26.py renamed to _generated_2018_01_26_at_21_58_40.py

@@ -5,7 +5,7 @@
 from os import environ
 from subprocess import Popen, PIPE
 
-PLUGIN_VERSION = "0.13.16"
+PLUGIN_VERSION = "0.13.17"
 
 PACKAGE_PATH = os.path.abspath(os.path.dirname(__file__))
 PACKAGE_NAME = os.path.basename(PACKAGE_PATH)
@@ -1336,10 +1336,16 @@ def init(self):
 
     node_modules_path = os.path.join(PACKAGE_PATH, "node_modules")
     npm = NPM()
+
+    if os.path.exists(node_modules_path) and not os.path.exists(os.path.join(node_modules_path, ".bin")):
+      if sublime.platform() == "windows":
+        os.system("taskkill /f /im flow.exe")
+      shutil.rmtree(node_modules_path)
+
     if not os.path.exists(node_modules_path):
       animation_npm_installer = AnimationLoader(["[=     ]", "[ =    ]", "[   =  ]", "[    = ]", "[     =]", "[    = ]", "[   =  ]", "[ =    ]"], 0.067, "JavaScript Enhancements - installing npm dependencies ")
       interval_animation = RepeatedTimer(animation_npm_installer.sec, animation_npm_installer.animate)
-      # sublime.active_window().status_message("JavaScript Enhancements - installing npm dependencies...")
+
       result = npm.install_all()
       if result[0]: 
         animation_npm_installer.on_complete()
@@ -1353,10 +1359,6 @@ def init(self):
           shutil.rmtree(node_modules_path)
         sublime.error_message("Error during installation: can't install npm dependencies for JavaScript Enhancements plugin.\n\nThe error COULD be caused by the npm permission access (EACCES error), so in this case you need to repair/install node.js and npm in a way that doesn't require \"sudo\" command.\n\nFor example you could use a Node Version Manager, such as \"nvm\" or \"nodenv\".\n\nTry to run \"npm install\" inside the package of this plugin to see what you get.")
         return
-    # else:
-    #   result = npm.update_all()
-    #   if not result[0]: 
-    #     sublime.active_window().status_message("Error: JavaScript Enhancements - cannot update npm dependencies.")
 
     sublime.set_timeout_async(lambda: overwrite_default_javascript_snippet())
 
@@ -3825,7 +3827,6 @@ def on_query_completions_async(self, view, prefix, locations):
       self.searching = False
       return
 
-    
     node = NodeJS(check_local=True)
 
     result = node.execute_check_output(
@@ -3851,6 +3852,8 @@ def on_query_completions_async(self, view, prefix, locations):
       if self.modified == True:
         self.searching = False
         return
+
+
 
       result = result[1]
       self.completions = list()
@@ -3923,6 +3926,11 @@ def on_text_command(self, view, command_name, args):
           'hide_auto_complete'
         )
 
+    elif command_name == "drag_select" :
+      if view.sel()[0].begin() < view.word(view.sel()[0].begin()).end():
+        self.modified = True
+        self.searching = False
+
   def on_selection_modified_async(self, view) :
 
     selections = view.sel()
@@ -3936,13 +3944,13 @@ def on_selection_modified_async(self, view) :
     ):
       return
 
-    scope1 = view.scope_name(selections[0].begin()-1).strip()
-    scope2 = view.scope_name(selections[0].begin()-2).strip()
+    scope1 = view.scope_name(sel.begin()-1).strip()
+    scope2 = view.scope_name(sel.begin()-2).strip()
 
-    if (scope1.endswith(" punctuation.accessor.js") or scope1.endswith(" keyword.operator.accessor.js")) and not (scope2.endswith(" punctuation.accessor.js") or scope2.endswith(" keyword.operator.accessor.js")) and view.substr(selections[0].begin()-2).strip() :
-    
+    if (scope1.endswith(" punctuation.accessor.js") or scope1.endswith(" keyword.operator.accessor.js")) and not (scope2.endswith(" punctuation.accessor.js") or scope2.endswith(" keyword.operator.accessor.js")) and view.substr(sel.begin()-2).strip() :
+      
       locations = list()
-      locations.append(selections[0].begin())
+      locations.append(sel.begin())
 
       if not self.searching:
         self.searching = True
@@ -6029,12 +6037,16 @@ def fixPath():
 
 
 def plugin_unloaded():
-  # When we unload, reset PATH to original value. Otherwise, reloads of this plugin will cause
-  # the PATH to be duplicated.
-  environ['PATH'] = fixPathOriginalEnv['PATH']
+  if platform.system() == "Darwin" or platform.system() == "Linux":
+    # When we unload, reset PATH to original value. Otherwise, reloads of this plugin will cause
+    # the PATH to be duplicated.
+    environ['PATH'] = fixPathOriginalEnv['PATH']
+
+    global fixPathSettings
+    fixPathSettings.clear_on_change('fixpath-reload')
 
-  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=os.path.join(PACKAGE_PATH, "flow")))
 
 ##
 ## end - Fix Mac Path plugin code

changelog/0.13.17.txt

@@ -0,0 +1,94 @@
+v0.13.17
+
+## Fixes
+
+- Fixed node_modules folder issue #23 during plugin upgrade on Windows
+- Fixed auto-complete tooltip that was showing up also in on_selection_modified event
+
+## Improvements
+
+- Updated flow-bin to 0.64.0
+
+
+=================================================================
+** THIS PLUGIN IS IN BETA! Thanks for your support in advance! **
+=================================================================
+
+If you like it, remember to star it ⭐ on GitHub: https://github.com/pichillilorenzo/JavaScriptEnhancements
+
+** USAGE **
+===========
+
+See how it works on the Wiki: 👉👉 https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki 👈👈
+
+
+** WHAT IS THIS? **
+===================
+
+This plugin uses Flow (javascript static type checker from Facebook) under the hood.
+
+It offers better javascript autocomplete and a lot of features about creating, 
+developing and managing javascript projects, such as:
+
+- Cordova projects (run cordova emulate, build, compile, serve, etc. directly from Sublime Text!)
+- Ionic v1 and v2 projects (same as Cordova projects!)
+- Angular v1 and v2 projects
+- React projects (only about the creation at this moment)
+- React Native projects (only about the creation at this moment. I will add also NativeScript support)
+- Express projects (only about the creation at this moment)
+- Yeoman generators
+- Local bookmarks project
+- JavaScript real-time errors
+- etc.
+
+You could use it also in existing projects (see the Wiki - https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki/Using-it-with-an-existing-project)!
+
+It turns Sublime Text into a JavaScript IDE like!
+
+This project is based on my other Sublime Text plugin JavaScript Completions (https://github.com/pichillilorenzo/JavaScript-Completions)
+
+** NOTE **
+If you want use this plugin, you may want uninstall/disable the JavaScript Completions plugin, if installed.
+
+** OS SUPPORTED NOW **
+======================
+
+👉 Linux (64-bit)
+👉 Mac OS X 
+👉 Windows (64-bit): released without the use of TerminalView plugin. For each feature (like also creating a project) will be used the cmd.exe shell (so during the creation of a project don't close it until it finishes!). Unfortunately the TerminalView plugin supports only Linux-based OS 😞. Has someone any advice or idea about that? Is there something similar to the TerminalView plugin for Windows?? Thanks!
+
+❗❗ Dependencies ❗❗
+=======================
+
+In order to work properly, this plugin has some dependencies:
+
+👉 Sublime Text 3 (build 3124 or newer)
+👉 Node.js and npm (https://nodejs.org or nvm (https://github.com/creationix/nvm))
+👉 TerminalView (only for Linux and Mac OS X) sublime text plugin (https://github.com/Wramberg/TerminalView)
+
+Not required, but useful for typescript files (Flow wont work on this type of files):
+
+👉 TypeScript sublime text plugin (https://github.com/Microsoft/TypeScript-Sublime-Plugin) 
+
+** Flow Requirements **
+=======================
+
+It use [Flow](https://github.com/facebook/flow) for type checking and auto-completions.
+
+👉 Mac OS X
+👉 Linux (64-bit)
+👉 Windows (64-bit)
+
+Email me for any questions or doubts about this new project on: pichillilorenzo@gmail.com
+
+** Donation **
+==============
+
+If this project help you reduce time to develop and also you like it, please support it with a donation 😄👍. Thanks!
+
+Open Collective: https://opencollective.com/javascriptenhancements/donate
+PayPal: https://www.paypal.me/LorenzoPichilli
+
+Thanks anyway for your support! 😄😄
+
+MIT License

helper/javascript_completions/on_query_completions_event_listener.py

@@ -127,7 +127,6 @@ def on_query_completions_async(self, view, prefix, locations):
       self.searching = False
       return
 
-    
     node = NodeJS(check_local=True)
 
     result = node.execute_check_output(
@@ -153,6 +152,8 @@ def on_query_completions_async(self, view, prefix, locations):
       if self.modified == True:
         self.searching = False
         return
+
+
 
       result = result[1]
       self.completions = list()
@@ -225,6 +226,11 @@ def on_text_command(self, view, command_name, args):
           'hide_auto_complete'
         )
 
+    elif command_name == "drag_select" :
+      if view.sel()[0].begin() < view.word(view.sel()[0].begin()).end():
+        self.modified = True
+        self.searching = False
+
   def on_selection_modified_async(self, view) :
 
     selections = view.sel()
@@ -238,13 +244,13 @@ def on_selection_modified_async(self, view) :
     ):
       return
 
-    scope1 = view.scope_name(selections[0].begin()-1).strip()
-    scope2 = view.scope_name(selections[0].begin()-2).strip()
+    scope1 = view.scope_name(sel.begin()-1).strip()
+    scope2 = view.scope_name(sel.begin()-2).strip()
 
-    if (scope1.endswith(" punctuation.accessor.js") or scope1.endswith(" keyword.operator.accessor.js")) and not (scope2.endswith(" punctuation.accessor.js") or scope2.endswith(" keyword.operator.accessor.js")) and view.substr(selections[0].begin()-2).strip() :
-    
+    if (scope1.endswith(" punctuation.accessor.js") or scope1.endswith(" keyword.operator.accessor.js")) and not (scope2.endswith(" punctuation.accessor.js") or scope2.endswith(" keyword.operator.accessor.js")) and view.substr(sel.begin()-2).strip() :
+      
       locations = list()
-      locations.append(selections[0].begin())
+      locations.append(sel.begin())
 
       if not self.searching:
         self.searching = True

make/_init.py

@@ -5,7 +5,7 @@
 from os import environ
 from subprocess import Popen, PIPE
 
-PLUGIN_VERSION = "0.13.16"
+PLUGIN_VERSION = "0.13.17"
 
 PACKAGE_PATH = os.path.abspath(os.path.dirname(__file__))
 PACKAGE_NAME = os.path.basename(PACKAGE_PATH)
@@ -97,10 +97,16 @@ def init(self):
 
     node_modules_path = os.path.join(PACKAGE_PATH, "node_modules")
     npm = NPM()
+
+    if os.path.exists(node_modules_path) and not os.path.exists(os.path.join(node_modules_path, ".bin")):
+      if sublime.platform() == "windows":
+        os.system("taskkill /f /im flow.exe")
+      shutil.rmtree(node_modules_path)
+
     if not os.path.exists(node_modules_path):
       animation_npm_installer = AnimationLoader(["[=     ]", "[ =    ]", "[   =  ]", "[    = ]", "[     =]", "[    = ]", "[   =  ]", "[ =    ]"], 0.067, "JavaScript Enhancements - installing npm dependencies ")
       interval_animation = RepeatedTimer(animation_npm_installer.sec, animation_npm_installer.animate)
-      # sublime.active_window().status_message("JavaScript Enhancements - installing npm dependencies...")
+
       result = npm.install_all()
       if result[0]: 
         animation_npm_installer.on_complete()
@@ -114,10 +120,6 @@ def init(self):
           shutil.rmtree(node_modules_path)
         sublime.error_message("Error during installation: can't install npm dependencies for JavaScript Enhancements plugin.\n\nThe error COULD be caused by the npm permission access (EACCES error), so in this case you need to repair/install node.js and npm in a way that doesn't require \"sudo\" command.\n\nFor example you could use a Node Version Manager, such as \"nvm\" or \"nodenv\".\n\nTry to run \"npm install\" inside the package of this plugin to see what you get.")
         return
-    # else:
-    #   result = npm.update_all()
-    #   if not result[0]: 
-    #     sublime.active_window().status_message("Error: JavaScript Enhancements - cannot update npm dependencies.")
 
     sublime.set_timeout_async(lambda: overwrite_default_javascript_snippet())
 
@@ -230,12 +232,16 @@ def fixPath():
 
 
 def plugin_unloaded():
-  # When we unload, reset PATH to original value. Otherwise, reloads of this plugin will cause
-  # the PATH to be duplicated.
-  environ['PATH'] = fixPathOriginalEnv['PATH']
+  if platform.system() == "Darwin" or platform.system() == "Linux":
+    # When we unload, reset PATH to original value. Otherwise, reloads of this plugin will cause
+    # the PATH to be duplicated.
+    environ['PATH'] = fixPathOriginalEnv['PATH']
 
-  global fixPathSettings
-  fixPathSettings.clear_on_change('fixpath-reload')
+    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=os.path.join(PACKAGE_PATH, "flow")))
 
 ##
 ## end - Fix Mac Path plugin code

messages.json

@@ -16,5 +16,6 @@
   "0.13.13": "changelog/0.13.13.txt",
   "0.13.14": "changelog/0.13.14.txt",
   "0.13.15": "changelog/0.13.15.txt",
-  "0.13.16": "changelog/0.13.16.txt"
+  "0.13.16": "changelog/0.13.16.txt",
+  "0.13.17": "changelog/0.13.17.txt"
 }