Use cmakelang formatter (#52)

regen100 · May 1, 2022 · 1fefcb4 · 1fefcb4
1 parent f0cfa8b
commit 1fefcb4
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 513 deletions.
diff --git a/README.md b/README.md
@@ -12,12 +12,11 @@ Alpha Stage, work in progress.
 ## Features
 - [x] Builtin command completion
 - [x] Documentation for commands and variables on hover
-- [x] Formatting
+- [x] Formatting (by [`cmake-format`](https://github.com/cheshirekow/cmake_format))
 
 ## Commands
 
 - `cmake-language-server`: LSP server
-- `python -m cmake_language_server.formatter`: CLI frontend for formatting
 
 ## Installation
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,13 +20,13 @@ classifiers = [
 [tool.poetry.dependencies]
 python = "^3.6"
 pygls = "^0.11"
-pyparsing = "^2.4"
 importlib-metadata = {version = "^4.8", python = "<3.8"}
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2"
 pytest-datadir = "^1.3"
 pytest-cov = "^2.11"
+cmakelang = "^0.6.13"
 
 [tool.poetry.scripts]
 cmake-language-server = "cmake_language_server.server:main"

diff --git a/src/cmake_language_server/formatter.py b/src/cmake_language_server/formatter.py
diff --git a/src/cmake_language_server/parser.py b/src/cmake_language_server/parser.py