Merge branch 'release/0.0.7'

Author: John Towers

README.md

@@ -3,7 +3,8 @@ Sublime Text 3 plugin to provide integration with the Salesforce DX CLI
 
 ## Instructions
 1. Install the [DX CLI](https://developer.salesforce.com/tools/sfdxcli)
-2. Run `Package Control: Install Package` from the command palette in Sublime and search for 'dxmate' or clone this package into your Packages directory
+2. Run `Package Control: Install Package` from the command palette in Sublime and search for 'dxmate'
+3. In the command pallette run `Package Control: Satisfy Dependencies`
 
 ## Features
 Supports most useful CLI commands including:

dependencies.json

@@ -1,5 +1,13 @@
-"*": {
-		"*": [
-			"mdpopups"
-		]
-	}
+{
+    "*": {
+        ">=3124": [
+            "pygments",
+            "python-markdown",
+            "mdpopups",
+            "python-jinja2",
+            "markupsafe",
+            "pymdownx",
+            "pyyaml"
+        ]
+    }
+}

lib/languageServer.py

@@ -24,7 +24,6 @@
 import sublime_plugin
 import os
 import subprocess
-from .util import *
 from .event_hub import EventHub
 from .client import Client
 import threading
@@ -36,6 +35,7 @@
 from urllib.request import url2pathname
 from .request import Request
 from .notification import Notification
+from .util import *
 client = None
 
 

lib/printer.py

@@ -3,9 +3,8 @@
 import unicodedata
 import time
 import json
-import MavensMate.config as config
 from .threads import ThreadTracker
-
+from .util import *
 def write_to_active_printer(message, show=True):
     active_window_id = sublime.active_window().id()
     p = PanelPrinter.get(active_window_id)
@@ -132,7 +131,7 @@ def scroll_to_bottom(self):
         sublime.set_timeout(lambda : self.panel.show(size, True), 2)
 
     def write_callback(self):
-        if config.sublime_version >= 3000:
+        if sublime_version >= 3000:
             found = False
             for key in self.strings.keys():
                 if len(self.strings[key]):

lib/util.py

@@ -12,6 +12,9 @@
 import re
 settings = None
 
+global sublime_version
+sublime_version = int(float(sublime.version()))
+
 def load_settings():
     return sublime.load_settings('dxmate.sublime-settings')