Rename lsp_client_py and pylspc to lsp

Author: kristopher-h

plugin/tox.ini

@@ -15,7 +15,7 @@ setenv = PYTHONDONTWRITEBYTECODE=1
 basepython = python
 commands =
     flake8 vimliq/ \
-        vendor/lsp_client_py/pylspc/ \
+        vendor/lsp_client_py/lsp/ \
         vim_liq.py \
         install_lsp_servers.py
 deps =

plugin/vendor/lsp_client_py/Makefile renamed to plugin/vendor/lsp/Makefile

@@ -2,6 +2,6 @@ test:
 	py.test tests/
 
 lint:
-	pycodestyle --max-line-length=100 pylspc/
+	pycodestyle --max-line-length=100 lsp/
 	pycodestyle --ignore=E402 --max-line-length=100 tests/
-	# pydocstyle pylspc/
+	# pydocstyle lsp/

plugin/vendor/lsp_client_py/README.rst renamed to plugin/vendor/lsp/README.rst

@@ -17,4 +17,4 @@
 import os
 import sys
 sys.path.insert(0, os.path.abspath('..'))
-import pylspc
+import lsp

plugin/vendor/lsp_client_py/pylspc/__init__.py renamed to plugin/vendor/lsp/lsp/__init__.py

@@ -22,21 +22,21 @@
 
 import pytest
 
-from .context import pylspc
+from .context import lsp
 
 logging.basicConfig(level=logging.DEBUG)
 
 
 @pytest.fixture(scope="module")
 def lsp_pipe():
-    thing = pylspc.jsonrpc.JsonRpcStdInOut(["pyls"])
+    thing = lsp.jsonrpc.JsonRpcStdInOut(["pyls"])
     return thing
 
 
 @pytest.fixture(scope="module")
 def lsp_client():
-    pipe = pylspc.jsonrpc.JsonRpcStdInOut(["pyls"])
-    thing = pylspc.client.LspClient(pipe)
+    pipe = lsp.jsonrpc.JsonRpcStdInOut(["pyls"])
+    thing = lsp.client.LspClient(pipe)
     return thing
 
 

plugin/vendor/lsp_client_py/pylspc/client.py renamed to plugin/vendor/lsp/lsp/client.py

@@ -39,7 +39,7 @@ python import os
 python import sys
 python import vim
 python sys.path.append(vim.eval('expand("<sfile>:h")'))
-python sys.path.append(os.path.join(vim.eval('expand("<sfile>:h")'), "vendor/lsp_client_py"))
+python sys.path.append(os.path.join(vim.eval('expand("<sfile>:h")'), "vendor/lsp"))
 python from vim_liq import LSP
 python from vim_liq import LSP_LOG
 

plugin/vendor/lsp_client_py/pylspc/jsonrpc.py renamed to plugin/vendor/lsp/lsp/jsonrpc.py

@@ -21,8 +21,8 @@
 import os
 import re
 
-import pylspc.client
-import pylspc.jsonrpc
+import lsp.client
+import lsp.jsonrpc
 
 from . import vimutils as V
 
@@ -121,11 +121,11 @@ def shutdown(self):
     def start_server(self):
         """Start the LSP client and the server."""
         if self._transport == "STDIO":
-            rpc_class = pylspc.jsonrpc.JsonRpcStdInOut
+            rpc_class = lsp.jsonrpc.JsonRpcStdInOut
         else:
             raise VimLspError("Unknown transport protocol: {}".format(self._transport))
 
-        self._client = pylspc.client.LspClient(self._start_cmd, rpc_class=rpc_class)
+        self._client = lsp.client.LspClient(self._start_cmd, rpc_class=rpc_class)
         path = os.getcwd()
         # TODO: What happens if init fails?
         self._client.initialize(root_path=path, root_uri=path)

plugin/vendor/lsp_client_py/requirements.txt renamed to plugin/vendor/lsp/requirements.txt

@@ -21,8 +21,8 @@
 import logging
 import os
 
-import pylspc.client
-import pylspc.jsonrpc
+import lsp.client
+import lsp.jsonrpc
 
 from . import client
 from . import vimutils as V
@@ -38,7 +38,7 @@ def handle_error(func):
     def wrapper(*args, **kwargs):
         try:
             func(*args, **kwargs)
-        except pylspc.client.LspError as exc:
+        except lsp.client.LspError as exc:
             log.debug("Got error from LSP server. message=%s, code=%s, data=%s",
                       exc, exc.code, exc.data)
         except Exception: