Merge branch 'fix-parse-commands'

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         python: [3.6, 3.7, 3.8]
-        os: [ubuntu-18.04, windows-latest]
+        os: [ubuntu-18.04, windows-2016]
     steps:
       - uses: actions/checkout@v1
       - name: Set up Python ${{ matrix.python }}

src/cmake_language_server/api.py

@@ -186,9 +186,9 @@ endforeach()
         matches = re.finditer(
             r'''
 (?P<command>.+)\n
--+\n\n
+-+\n+?
 [\s\S]*?
-(?P<signature>\ (?P=command)\s*\([^)]*\))
+(?P<signature>(?P=command)\s*\([^)]*\))
 ''', p.stdout, re.VERBOSE)
         self._builtin_commands.clear()
         for match in matches:

tests/conftest.py

@@ -15,8 +15,9 @@ def cmake_build(shared_datadir):
     if p.returncode != 0:
         import logging
         import os
-        logging.error(os.environ)
+        import pprint
-        logging.error(p.stdout)
+        logging.error('env:\n' + pprint.pformat(os.environ))
-        logging.error(p.stderr)
+        logging.error('stdout:\n' + p.stdout)
+        logging.error('stderr:\n' + p.stderr)
         raise RuntimeError("CMake failed")
     yield build

tox.ini

@@ -12,15 +12,13 @@ python =
 [testenv]
 whitelist_externals = poetry
 skip_install = true
-passenv = INCLUDE LIB LIBPATH
+passenv = INCLUDE LIB LIBPATH Platform VCTools* VSCMD_* WindowsSDK*
 commands_pre =
     poetry install
 commands =
     poetry run pytest -sv tests
 
 [testenv:lint]
-whitelist_externals = poetry
-skip_install = true
 commands =
     poetry run isort -c -rc src tests
     poetry run yapf -d -r src tests