Merge branch 'release/0.0.5'

Author: John Towers

README.md

@@ -13,10 +13,11 @@ Supports most useful CLI commands including:
 * Push\Pull source
 * Create Apex classes
 * Run tests for an org or specific class
-
+* Code completion
+* Diagnostics
 Uses syntax highlighting from MavensMate
 
-Supports code completion with the [Apex Language Server](https://developer.salesforce.com/docs/atlas.en-us.sfdx_ide2.meta/sfdx_ide2/sfdx_ide2_build_app_apex_language_server_protocol.htm)
+Language services (e.g., code completion and diagnostics) are provided by the [Apex Language Server](https://developer.salesforce.com/docs/atlas.en-us.sfdx_ide2.meta/sfdx_ide2/sfdx_ide2_build_app_apex_language_server_protocol.htm)
 
 ## Settings
 

apex-jorje-lsp.jar

@@ -14,6 +14,7 @@
 from .lib.languageServer import *
 from .lib.event_hub import EventHub
 from .lib.util import *
+from .lib.diagnostic import *
 import ntpath
 
 
@@ -148,7 +149,7 @@ def __init__(self):
         self.refreshing = False
 
     def on_pre_close(self, view):
-        EventHub.publish('on_pre_close')
+        EventHub.publish('on_pre_close', view)
 
 
     def on_close(self, view):
@@ -161,6 +162,22 @@ def on_post_save_async(self, view):
         EventHub.publish('on_post_save_async', view)
     def on_close(self, view):
         EventHub.publish('on_close', view)
+    def on_hover(self, view, point, hover_zone):
+        EventHub.publish('on_hover', view, point, hover_zone)
+    def on_window_command(self, window, command_name, *args):
+        if command_name == 'exit':
+            EventHub.publish('exit', window, *args)
+        elif command_name == 'close_window':
+            EventHub.publish('close_window', window, *args)
+        else:
+            EventHub.publish('on_window_command', window, command_name, *args)
+    def on_text_command(self, window, command_name, *args):
+        if command_name == 'exit':
+            EventHub.publish('exit', window, *args)
+        elif command_name == 'close_window':
+            EventHub.publish('close_window', window, *args)
+        else:
+            EventHub.publish('on_window_command', window, command_name, *args)
     def on_modified_async(self, view):
         active_file_extension = file_extension(view)
         if active_file_extension != '.cls' and active_file_extension != '.trigger':
@@ -252,6 +269,8 @@ def is_enabled(self):
         self.active_file = active_file()
         if not self.active_file.endswith('.cls'):
             return False
+        if not file_is_test(self.window.active_view()):
+            return False
         return True
 
     def run_command(self):

dxmate.py

@@ -36,7 +36,6 @@
 from urllib.request import url2pathname
 from .request import Request
 from .notification import Notification
-
 client = None
 
 
@@ -161,6 +160,7 @@ def initialize_document_sync(text_document_sync_kind):
 def handle_initialize_result(result, client, window, config):
     global didopen_after_initialize
     capabilities = result.get("capabilities")
+    debug(capabilities)
     client.set_capabilities(capabilities)
 
     # TODO: These handlers is already filtered by syntax but does not need to
@@ -170,8 +170,7 @@ def handle_initialize_result(result, client, window, config):
     if document_sync:
         initialize_document_sync(document_sync)
 
-    EventHub.subscribe('document.diagnostics', handle_diagnostics)
-    EventHub.subscribe('on_close', remove_diagnostics)
+    
     for view in didopen_after_initialize:
         notify_did_open(view)
     if show_status_messages:
@@ -234,6 +233,9 @@ def start_server():
     except Exception as err:
         debug(err)
 
+def get_client():
+    global client
+    return client
 
 def start_client():
     global client
@@ -250,6 +252,9 @@ def start_client():
                     "completionItem": {
                         "snippetSupport": True
                     }
+                },
+                "hover":{
+                    "dynamicRegistration": True
                 }
             }
         }

lib/languageServer.py

@@ -9,7 +9,7 @@
 from .languageServer import *
 from .event_hub import EventHub
 import json
-
+import re
 settings = None
 
 def load_settings():
@@ -37,6 +37,10 @@ def dxProjectFolder():
                         return folder
     return ''
 
+def file_is_test(view):
+    contents = view.substr(sublime.Region(0, view.size()))
+    debug(contents)
+    return '@istest' in contents.lower() or 'testmethod' in contents.lower()
 
 def run_events():
     if dxProjectFolder() != '':
@@ -59,6 +63,13 @@ def file_extension(view):
         return file_extension
 
 
+def is_apex_file(view):
+    ext = file_extension(view)
+    if ext and (ext == '.cls' or ext == '.trigger'):
+        return True
+    return False
+
+
 def get_plugin_folder():
     packages_path = os.path.join(sublime.packages_path(), plugin_name())
     debug(packages_path)
@@ -99,10 +110,17 @@ def debug(*args):
         print(plugin_name(), ': ', *args)
 
 
-def handle_close():
-    if dxProjectFolder() == '':
+
+def handle_close(window, *args):
+    if dxProjectFolder() == '' and client:
+        client.kill()
+
+def handle_exit(window, *args):
+    if client:
         client.kill()
 
+EventHub.subscribe('exit', handle_exit)
+EventHub.subscribe('close_window', handle_close)
 
 def format_request(payload: 'Dict[str, Any]'):
     """Converts the request into json and adds the Content-Length header"""