fixed #13 issue (initial sublime text freezing), fixed #34 issue ((Not working) 'Create class from object literal'), fixed #30 issue (Global autocompletions aren't loaded)

Author: pichillilorenzo

_generated_2017_03_05_at_21_51_28.py renamed to _generated_2017_03_30_at_17_44_57.py

@@ -84,22 +84,31 @@ def init(self):
 
     if int(sublime.version()) >= 3000 :
 
-      installer.install(node_variables.NODE_JS_VERSION)
+      sublime.set_timeout_async(lambda: installer.install(node_variables.NODE_JS_VERSION))
 
 mainPlugin = startPlugin()
 
+import json
+
 JC_SETTINGS_FOLDER_NAME = "javascript_completions"
 JC_SETTINGS_FOLDER = os.path.join(PACKAGE_PATH, JC_SETTINGS_FOLDER_NAME)
 
 class JavaScriptCompletions():
   def init(self):
     self.api = {}
     self.API_Setup = sublime.load_settings('JavaScript-Completions.sublime-settings').get('completion_active_list')
+    sublime.set_timeout_async(self.load_api)
 
+  def load_api(self):
     # Caching completions
     if self.API_Setup:
       for API_Keyword in self.API_Setup:
-        self.api[API_Keyword] = sublime.load_settings( API_Keyword + '.sublime-settings')
+        self.api[API_Keyword] = sublime.load_settings( API_Keyword + '.sublime-settings' )
+        if self.api[API_Keyword].get("scope") == None :
+          path_to_json = os.path.join(PACKAGE_PATH, "sublime-completions", API_Keyword + '.sublime-settings' )
+          if os.path.isfile(path_to_json):
+            with open(path_to_json) as json_file:
+              self.api[API_Keyword] = json.load(json_file)
 
   def get(self, key):
     return sublime.load_settings('JavaScript-Completions.sublime-settings').get(key)
@@ -1109,6 +1118,8 @@ def is_visible(self, **args) :
           return False
       return True
 
+  import re
+  
   class create_class_from_object_literalCommand(sublime_plugin.TextCommand):
     def run(self, edit, **args):
       view = self.view
@@ -1126,6 +1137,7 @@ def run(self, edit, **args):
           object_literal = item_object_literal.get("region_string_stripped")
           from node.main import NodeJS
           node = NodeJS()
+          object_literal = re.sub(r'[\n\r\t]', ' ', object_literal)
           object_literal = json.loads(node.eval("JSON.stringify("+object_literal+")", "print"))
           object_literal = [(key, json.dumps(value)) for key, value in object_literal.items()]
 

helper/create_class_from_object_literal_command.py

@@ -1,3 +1,5 @@
+import re
+
 class create_class_from_object_literalCommand(sublime_plugin.TextCommand):
   def run(self, edit, **args):
     view = self.view
@@ -15,6 +17,7 @@ def run(self, edit, **args):
         object_literal = item_object_literal.get("region_string_stripped")
         from node.main import NodeJS
         node = NodeJS()
+        object_literal = re.sub(r'[\n\r\t]', ' ', object_literal)
         object_literal = json.loads(node.eval("JSON.stringify("+object_literal+")", "print"))
         object_literal = [(key, json.dumps(value)) for key, value in object_literal.items()]
 

javascript_completions/javascript_completions_class.py

@@ -1,15 +1,24 @@
+import json
+
 JC_SETTINGS_FOLDER_NAME = "javascript_completions"
 JC_SETTINGS_FOLDER = os.path.join(PACKAGE_PATH, JC_SETTINGS_FOLDER_NAME)
 
 class JavaScriptCompletions():
   def init(self):
     self.api = {}
     self.API_Setup = sublime.load_settings('JavaScript-Completions.sublime-settings').get('completion_active_list')
+    sublime.set_timeout_async(self.load_api)
 
+  def load_api(self):
     # Caching completions
     if self.API_Setup:
       for API_Keyword in self.API_Setup:
-        self.api[API_Keyword] = sublime.load_settings( API_Keyword + '.sublime-settings')
+        self.api[API_Keyword] = sublime.load_settings( API_Keyword + '.sublime-settings' )
+        if self.api[API_Keyword].get("scope") == None :
+          path_to_json = os.path.join(PACKAGE_PATH, "sublime-completions", API_Keyword + '.sublime-settings' )
+          if os.path.isfile(path_to_json):
+            with open(path_to_json) as json_file:
+              self.api[API_Keyword] = json.load(json_file)
 
   def get(self, key):
     return sublime.load_settings('JavaScript-Completions.sublime-settings').get(key)

make/_init.py

@@ -84,7 +84,7 @@ def init(self):
 
     if int(sublime.version()) >= 3000 :
 
-      installer.install(node_variables.NODE_JS_VERSION)
+      sublime.set_timeout_async(lambda: installer.install(node_variables.NODE_JS_VERSION))
 
 mainPlugin = startPlugin()