Formatting

tests/test_clangd_integration.py

@@ -21,7 +21,6 @@ class lsp_session:
     self.reader.start()
     self.next_id = 0
     self.pending = []
-
   def read_messages(self):
     try:
       while True:
@@ -38,12 +37,10 @@ class lsp_session:
         self.messages.put(json.loads(self.process.stdout.read(int(headers["content-length"]))))
     except Exception as error:
       self.messages.put(error)
-
   def send(self, message):
     body = json.dumps({"jsonrpc": "2.0", **message}).encode()
     self.process.stdin.write(f"Content-Length: {len(body)}\r\n\r\n".encode() + body)
     self.process.stdin.flush()
-
   def wait(self, predicate, timeout=90):
     deadline = time.monotonic() + timeout
     while True:
@@ -58,7 +55,6 @@ class lsp_session:
         self.log.seek(0)
         raise AssertionError(f"{message}\n{self.log.read().decode(errors='replace')}")
       self.pending.append(message)
-
   def request(self, method, params):
     self.next_id += 1
     self.send({"id": self.next_id, "method": method, "params": params})
@@ -66,20 +62,17 @@ class lsp_session:
     if "error" in response:
       raise AssertionError(response["error"])
     return response.get("result")
-
   def initialize(self, root):
     result = self.request("initialize", {"processId": os.getpid(), "rootUri": root.as_uri(),
       "capabilities": {"textDocument": {"publishDiagnostics": {"versionSupport": True}}}})
     self.send({"method": "initialized", "params": {}})
     return result
-
   def open(self, path, text):
     uri = path.as_uri()
     self.send({"method": "textDocument/didOpen", "params": {"textDocument": {
       "uri": uri, "languageId": "cpp", "version": 1, "text": text}}})
     return self.wait(lambda message: message.get("method") == "textDocument/publishDiagnostics"
-                     and message["params"]["uri"] == uri)["params"]["diagnostics"]
-
+      and message["params"]["uri"] == uri)["params"]["diagnostics"]
   def close(self):
     if self.process.poll() is None:
       self.process.terminate()
@@ -93,26 +86,24 @@ class lsp_session:
 class container_clangd_test(unittest.TestCase):
   def roots(self):
     return [pathlib.Path(root).resolve() for root in os.environ["MODULUS_LSP_TEST_ROOTS"].split(os.pathsep)]
-
   @unittest.skipUnless(shutil.which("nvim"), "Neovim is not installed")
   def test_neovim_attachment_and_readonly_navigation(self):
     script = pathlib.Path(__file__).with_name("nvim_clangd.lua")
     for root in self.roots():
       database = json.loads((root / "build/build_x86_debug/compile_commands.json").read_text())
       source = next(pathlib.Path(entry["file"]) for entry in database
-                    if pathlib.Path(entry["file"]).is_relative_to(root / "src"))
+        if pathlib.Path(entry["file"]).is_relative_to(root / "src"))
       sources = [(source, "cstdint")]
       if (root / "src/vamp_pico/main.cpp").exists():
         sources.append((root / "src/vamp_pico/main.cpp", "pico/stdlib.h"))
       for source, header in sources:
         with self.subTest(repo=root.name, source=str(source)):
           env = {**os.environ, "MODULUS_LSP_REPO": str(root), "MODULUS_LSP_SOURCE": str(source.relative_to(root)),
-                 "MODULUS_LSP_HEADER": header}
+            "MODULUS_LSP_HEADER": header}
           result = subprocess.run(["nvim", "--headless", "-i", "NONE", "-u", str(script)], cwd=root,
-                                  env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, timeout=180)
+            env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, timeout=180)
           self.assertEqual(result.returncode, 0, result.stdout)
           self.assertIn("MODULUS_NVIM_OK", result.stdout)
-
   def test_native_and_pico_diagnostics_and_local_header_definitions(self):
     for root in self.roots():
       with self.subTest(repo=root.name):
@@ -122,7 +113,7 @@ class container_clangd_test(unittest.TestCase):
           self.assertIn("19.", initialized["serverInfo"]["version"])
           database = json.loads((root / "build/build_x86_debug/compile_commands.json").read_text())
           source = next(pathlib.Path(entry["file"]) for entry in database
-                        if pathlib.Path(entry["file"]).is_relative_to(root / "src"))
+            if pathlib.Path(entry["file"]).is_relative_to(root / "src"))
           sources = [(source, "cstdint")]
           if (root / "src/vamp_pico").is_dir():
             sources.extend((path, "pico/stdlib.h") for path in sorted((root / "src/vamp_pico").glob("*.cpp")))
@@ -145,7 +136,6 @@ class container_clangd_test(unittest.TestCase):
           self.assertEqual(session.process.wait(timeout=25), 0)
         finally:
           session.close()
-
   def test_eof_and_termination_remove_container(self):
     def containers():
       return set(subprocess.check_output(["docker", "ps", "-q", "--filter", "name=modulus-clangd-"], text=True).split())