changed css and height of on_hover_description tooltip (#14)

pichillilorenzo · pichillilorenzo · commit 97a52631af93 · 2018-01-16T20:27:48.000+01:00
diff --git a/README.md b/README.md
@@ -69,9 +69,11 @@ With [Package Control](https://packagecontrol.io/) (**NOT PUBLISHED YET**):
 
 Manually:
 
-1. Download [latest release](https://github.com/pichillilorenzo/JavaScriptEnhancements/releases) and unzip it into your **Packages folder** (go to `Preferences > Browse Packages...` menu item to open this folder)
+1. Download [latest release](https://github.com/pichillilorenzo/JavaScriptEnhancements/releases) (**DON'T CLONE THE REPOSITORY!**) and unzip it into your **Packages folder** (go to `Preferences > Browse Packages...` menu item to open this folder)
 2. Rename the folder with `JavaScript Enhancements` name (**THIS STEP IS IMPORTANT**).
 
+If all is going in the right way, you will see `JavaScript Enhancements - installing npm dependencies...` and, after a while, `JavaScript Enhancements - npm dependencies installed correctly.` messages in the status bar of Sublime Text 3. Now the plugin is ready!
+
 ### Fixing node.js and npm custom path
 
 If the plugin gives to you message errors like `Error during installation: "node.js" seems not installed on your system...` but instead you have installed node.js and npm (for example using [nvm](https://github.com/creationix/nvm)), then you could try to set your custom path in the [Global settings](https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki/Global-settings) of the plugin and then restart Sublime Text.
diff --git a/_generated_2018_01_16_at_20_17_34.py b/_generated_2018_01_16_at_20_17_34.py
@@ -3,7 +3,7 @@
 from shutil import copyfile
 from threading import Timer
 
-PLUGIN_VERSION = "0.13.1"
+PLUGIN_VERSION = "0.13.2"
 
 PACKAGE_PATH = os.path.abspath(os.path.dirname(__file__))
 PACKAGE_NAME = os.path.basename(PACKAGE_PATH)
@@ -4174,6 +4174,7 @@ def on_hover_description_async(view, point, hover_zone, popup_position, show_hin
   )
 
   html = ""
+  results_found = 0
 
   if result[0]:
     descriptions = result[1]["result"] + load_default_autocomplete(view, result[1]["result"], word, region.begin(), True)
@@ -4185,6 +4186,8 @@ def on_hover_description_async(view, point, hover_zone, popup_position, show_hin
           sub_completions = description['type'].split("&")
           for sub_comp in sub_completions :
 
+            results_found += 1
+
             sub_comp = sub_comp.strip()
             sub_type = sub_comp[1:-1] if description['type'].startswith("((") else sub_comp
                        
@@ -4251,6 +4254,9 @@ def on_hover_description_async(view, point, hover_zone, popup_position, show_hin
     )
 
     if result[0] and result[1].get("type") and result[1]["type"] != "(unknown)":
+
+      results_found = 1
+
       description = dict()
       description["name"] = ""
       description['func_details'] = dict()
@@ -4312,12 +4318,12 @@ def on_hover_description_async(view, point, hover_zone, popup_position, show_hin
 
   if html:
       view.show_popup("""
-      <html><head></head><body>
+      <html><head></head><body class=\""""+("single-result-found" if results_found == 1 else "more-results-found")+"""\">
       """+js_css+"""
         <div class=\"container-hint-popup\">
           """ + html + """    
         </div>
-      </body></html>""", sublime.COOPERATE_WITH_AUTO_COMPLETE | sublime.HIDE_ON_MOUSE_MOVE_AWAY, popup_position, 1150, 80, func_action )
+      </body></html>""", sublime.COOPERATE_WITH_AUTO_COMPLETE | sublime.HIDE_ON_MOUSE_MOVE_AWAY, popup_position, 1150, 80 if results_found == 1 else 160, func_action )
   
 
 import sublime, sublime_plugin
@@ -5890,7 +5896,7 @@ def start():
 
   try:
     sys.modules["JavaScript Completions"]
-    sublime.error_message("Please uninstall/disable JavaScript Completions plugin.")
+    sublime.error_message("Please uninstall/disable my other plugin \"JavaScript Completions\". It could conflict with this one!")
     return
   except Exception as err:
     pass
diff --git a/helper/can_i_use/can_i_use_data.json b/helper/can_i_use/can_i_use_data.json
diff --git a/helper/javascript_completions/on_hover_description_event_listener.py b/helper/javascript_completions/on_hover_description_event_listener.py
@@ -122,6 +122,7 @@ def on_hover_description_async(view, point, hover_zone, popup_position, show_hin
   )
 
   html = ""
+  results_found = 0
 
   if result[0]:
     descriptions = result[1]["result"] + load_default_autocomplete(view, result[1]["result"], word, region.begin(), True)
@@ -133,6 +134,8 @@ def on_hover_description_async(view, point, hover_zone, popup_position, show_hin
           sub_completions = description['type'].split("&")
           for sub_comp in sub_completions :
 
+            results_found += 1
+
             sub_comp = sub_comp.strip()
             sub_type = sub_comp[1:-1] if description['type'].startswith("((") else sub_comp
                        
@@ -199,6 +202,9 @@ def on_hover_description_async(view, point, hover_zone, popup_position, show_hin
     )
 
     if result[0] and result[1].get("type") and result[1]["type"] != "(unknown)":
+
+      results_found = 1
+
       description = dict()
       description["name"] = ""
       description['func_details'] = dict()
@@ -260,10 +266,10 @@ def on_hover_description_async(view, point, hover_zone, popup_position, show_hin
 
   if html:
       view.show_popup("""
-      <html><head></head><body>
+      <html><head></head><body class=\""""+("single-result-found" if results_found == 1 else "more-results-found")+"""\">
       """+js_css+"""
         <div class=\"container-hint-popup\">
           """ + html + """    
         </div>
-      </body></html>""", sublime.COOPERATE_WITH_AUTO_COMPLETE | sublime.HIDE_ON_MOUSE_MOVE_AWAY, popup_position, 1150, 80, func_action )
+      </body></html>""", sublime.COOPERATE_WITH_AUTO_COMPLETE | sublime.HIDE_ON_MOUSE_MOVE_AWAY, popup_position, 1150, 80 if results_found == 1 else 160, func_action )
   
diff --git a/helper/javascript_completions/style.css b/helper/javascript_completions/style.css
@@ -7,6 +7,12 @@ body{
   margin: 0;
   padding: 0;
   font-size: 0.9rem;
+}
+body.single-result-found{
+  
+}
+body.more-results-found{
+
 }
 .container{
   background-color: #202A31;
@@ -44,9 +50,12 @@ body{
   font-style: normal;
   color: #fff;
 }
-.container-hint-popup .container-description{
+body.single-result-found .container-hint-popup .container-description{
   margin-bottom: 5px;
 }
+body.more-results-found .container-hint-popup .container-description{
+  margin-bottom: 10px;
+}
 .container-hint-popup .container-info{
   display: inline;
   position: relative;
diff --git a/make/_init.py b/make/_init.py
@@ -3,7 +3,7 @@
 from shutil import copyfile
 from threading import Timer
 
-PLUGIN_VERSION = "0.13.1"
+PLUGIN_VERSION = "0.13.2"
 
 PACKAGE_PATH = os.path.abspath(os.path.dirname(__file__))
 PACKAGE_NAME = os.path.basename(PACKAGE_PATH)
@@ -142,7 +142,7 @@ def start():
 
   try:
     sys.modules["JavaScript Completions"]
-    sublime.error_message("Please uninstall/disable JavaScript Completions plugin.")
+    sublime.error_message("Please uninstall/disable my other plugin \"JavaScript Completions\". It could conflict with this one!")
     return
   except Exception as err:
     pass
diff --git a/project/npm/Main_disabled.sublime-menu b/project/npm/Main_disabled.sublime-menu
@@ -1 +1 @@
-[{"id": "tools", "children": [{"id": "npm_scripts", "children": [], "caption": "Npm/Yarn Scripts"}], "caption": "Tools"}]
+[{"caption": "Tools", "children": [{"caption": "Npm/Yarn Scripts", "children": [], "id": "npm_scripts"}], "id": "tools"}]

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-[{"id": "tools", "children": [{"id": "npm_scripts", "children": [], "caption": "Npm/Yarn Scripts"}], "caption": "Tools"}]`
	`1`	`+[{"caption": "Tools", "children": [{"caption": "Npm/Yarn Scripts", "children": [], "id": "npm_scripts"}], "id": "tools"}]`