Merge branch 'hotfix/fix-dependencies'

Author: John Towers

dependencies.json

@@ -0,0 +1,5 @@
+"*": {
+		"*": [
+			"mdpopups"
+		]
+	}

dxmate.py

@@ -563,8 +563,70 @@ def run_command(self):
             printer.write('\n' + str(err, 'utf-8'))
 
 
-class DxmateCreateApexClassCommand(sublime_plugin.WindowCommand):
+class DxmateRunSoqlCommand(sublime_plugin.WindowCommand):
+
+    def run(self):
+        sublime.active_window().show_input_panel(
+            'Query', '', self.run_query, None, None)
+
+    def is_enabled(self, paths=[]):
+        dx_folder = dxProjectFolder()
+        if(dx_folder == ''):
+            return False
+        return True
 
+    def run_query(self, input):
+        self.query = input
+        printer.show()
+        t = threading.Thread(target=self.run_command)
+        t.start()
+        t.printer = printer
+        t.process_id = time.strftime("%a, %d %b %Y %H:%M:%S", time.localtime())
+        ThreadProgress(t, 'Running query', 'Query run')
+        printer.write('\nRunning query')
+        printer.write('\nResult: ')
+        PanelThreadProgress(t, 'Query run')
+
+    def run_command(self):
+        dx_folder = dxProjectFolder()
+        args = ['sfdx', 'force:data:soql:query',
+                '-q', self.query]
+        startupinfo = None
+        if os.name == 'nt':
+            startupinfo = subprocess.STARTUPINFO()
+            startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+        p = subprocess.Popen(args, stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE, startupinfo=startupinfo, cwd=dx_folder)
+
+        p.wait()
+
+        out, err = p.communicate()
+        r = p.returncode
+        if p.returncode == 0:
+            printer.write('\nOpening results file')
+            content = str(out,'UTF-8')
+            #try:
+            #    parsed = json.loads(content)
+            #    content = json.dumps(parsed,  sort_keys=True,indent=1, separators=(',', ':'))
+            #    debug(content)
+            #except Exception as e:
+            #    debug('could not format query results\n', e)
+            file = sublime.active_window().new_file()
+            file.set_scratch(True)
+            file.set_name('SOQL')
+            syntax_path = None
+            if "linux" in sys.platform or "darwin" in sys.platform:
+                syntax_path = os.path.join("Packages",plugin_name(),"sublime","lang","JSON.tmLanguage")
+            else:
+                syntax_path = os.path.join("Packages/"+plugin_name()+"/sublime/lang/JSON.tmLanguage")
+            #file.set_syntax_file(syntax_path)
+            file.run_command("insert", {"characters":content})
+        else:
+            printer.write('\nError running query:')
+            printer.write('\n' + str(err, 'utf-8'))
+
+
+class DxmateCreateApexClassCommand(sublime_plugin.WindowCommand):
     def run(self, paths=[]):
         if len(paths) != 1 or (len(paths) > 0 and os.path.isfile(paths[0])):
             printer.show()

lib/languageServer.py

@@ -60,7 +60,7 @@ def get_document_state(path: str) -> DocumentState:
     return document_states[path]
 
 def notify_did_open(view: sublime.View):
-    if client and view and view.file_name():
+    if client and view and view.file_name() and is_apex_file(view):
         view.settings().set("show_definitions", False)
         if view.file_name() not in document_states:
             get_document_state(view.file_name())
@@ -75,15 +75,15 @@ def notify_did_open(view: sublime.View):
 
 
 def notify_did_close(view: sublime.View):
-    if view.file_name() in document_states:
+    if is_apex_file(view) and view.file_name() in document_states:
         del document_states[view.file_name()]
         if client:
             params = {"textDocument": {"uri": filename_to_uri(view.file_name())}}
             client.send_notification(Notification.didClose(params))
 
 
 def notify_did_save(view: sublime.View):
-    if view.file_name() in document_states:
+    if is_apex_file(view) and view.file_name() in document_states:
         if client:
             params = {"textDocument": {"uri": filename_to_uri(view.file_name())}}
             client.send_notification(Notification.didSave(params))
@@ -122,7 +122,7 @@ def queue_did_change(view: sublime.View):
 
 
 def notify_did_change(view: sublime.View):
-    if view.buffer_id() in pending_buffer_changes:
+    if is_apex_file(view) and view.buffer_id() in pending_buffer_changes:
         del pending_buffer_changes[view.buffer_id()]
     if client:
         document_state = get_document_state(view.file_name())

lib/util.py

@@ -79,7 +79,6 @@ def get_plugin_folder():
 def get_syntax_folder():
     plugin_folder = get_plugin_folder()
     syntax_folder = os.path.join(plugin_folder, "sublime", "lang")
-    debug(syntax_folder)
     return syntax_folder
 
 
@@ -112,10 +111,12 @@ def debug(*args):
 
 
 def handle_close(window, *args):
+    client = get_client()
     if dxProjectFolder() == '' and client:
         client.kill()
 
 def handle_exit(window, *args):
+    client = get_client()
     if client:
         client.kill()
 

sublime/Default.sublime-commands

@@ -30,5 +30,9 @@
 	{
 		"caption" : "dxmate: Run Tests for This Class",
 		"command": "dxmate_run_file_tests"
+	},
+	{
+		"caption" : "dxmate: Run SOQL Query",
+		"command": "dxmate_run_soql"
 	}
 ]

sublime/Main.sublime-menu

@@ -4,6 +4,16 @@
     "caption" : "DXMate",
     "children":
 	    [
+	    	{
+	    		"caption": "Data",
+	    		"children" :
+	    		[
+	    			{
+			    		"caption": "SOQL Query",
+			    		"command" : "dxmate_run_soql"
+	    			}
+	    		]
+	    	},
 	    	{
 	    		"caption": "Project",
 	    		"children" :