refactor(tests): CMake-based CDB, workspace fixture, test cleanup

tests/conftest.py

@@ -1,4 +1,4 @@
-"""Fixtures for clice LSP integration tests using pygls LanguageClient."""
+"""Fixtures and shared helpers for clice LSP integration tests using pygls LanguageClient."""
 
 import json
 import asyncio
@@ -13,10 +13,12 @@
     WINDOW_WORK_DONE_PROGRESS_CREATE,
     ClientCapabilities,
     Diagnostic,
+    DidOpenTextDocumentParams,
     InitializeParams,
     InitializedParams,
     ProgressParams,
     PublishDiagnosticsParams,
+    TextDocumentItem,
     WorkDoneProgressCreateParams,
     WorkspaceFolder,
 )
@@ -85,6 +87,46 @@ def wait_for_diagnostics(self, uri: str) -> asyncio.Event:
             self.diagnostics_events[uri].clear()
         return self.diagnostics_events[uri]
 
+    async def initialize(self, workspace: Path):
+        """Initialize the LSP server with a workspace folder and return the result."""
+        result = await self.initialize_async(
+            InitializeParams(
+                capabilities=ClientCapabilities(),
+                root_uri=workspace.as_uri(),
+                workspace_folders=[
+                    WorkspaceFolder(uri=workspace.as_uri(), name="test")
+                ],
+            )
+        )
+        self.initialized(InitializedParams())
+        return result
+
+    def open(self, filepath: Path, version: int = 0):
+        """Open a text document and return (uri, content)."""
+        content = filepath.read_text(encoding="utf-8")
+        uri = filepath.as_uri()
+        self.text_document_did_open(
+            DidOpenTextDocumentParams(
+                text_document=TextDocumentItem(
+                    uri=uri, language_id="cpp", version=version, text=content
+                )
+            )
+        )
+        return uri, content
+
+    async def wait_diagnostics(self, uri: str, timeout: float = 30.0):
+        """Wait for diagnostics on the given URI."""
+        event = self.wait_for_diagnostics(uri)
+        await asyncio.wait_for(event.wait(), timeout=timeout)
+
+    async def open_and_wait(self, filepath: Path, timeout: float = 60.0):
+        """Open a file and wait for compilation diagnostics."""
+        uri = filepath.as_uri()
+        event = self.wait_for_diagnostics(uri)
+        _, content = self.open(filepath)
+        await asyncio.wait_for(event.wait(), timeout=timeout)
+        return uri, content
+
 
 @pytest.fixture(scope="session")
 def executable(request) -> Path:

tests/data/modules/chained_modules/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(chained_modules CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES mod_a.cppm mod_b.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/circular_module_dependency/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(circular_module_dependency CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES cycle_a.cppm cycle_b.cppm ok.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/class_export_and_inheritance/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(class_export_and_inheritance CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES shape.cppm circle.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/consumer_imports_module/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(consumer_imports_module CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES math.cppm main.cpp)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/deep_chain/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(deep_chain CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES m1.cppm m2.cppm m3.cppm m4.cppm m5.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/diamond_modules/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(diamond_modules CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES base.cppm left.cppm right.cppm top.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/dotted_module_name/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(dotted_module_name CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES io.cppm app.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/export_block/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(export_block CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES block.cppm consumer.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/export_namespace/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(export_namespace CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES ns.cppm calc.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/global_module_fragment/CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.20)
+project(global_module_fragment CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES gmf.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})
+target_include_directories(test PRIVATE ${CMAKE_SOURCE_DIR})

tests/data/modules/gmf_with_import/CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.20)
+project(gmf_with_import CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES base.cppm combined.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})
+target_include_directories(test PRIVATE ${CMAKE_SOURCE_DIR})

tests/data/modules/hover_on_imported_symbol/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(hover_on_imported_symbol CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES defs.cppm use.cpp)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/independent_modules/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(independent_modules CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES x.cppm y.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/module_compile_error/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(module_compile_error CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES good.cppm bad.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/module_implementation_unit/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(module_implementation_unit CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES greeter.cppm greeter_impl.cpp)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/module_partitions/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(module_partitions CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES part_a.cppm part_b.cppm lib.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/no_modules_plain_cpp/CMakeLists.txt

@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.20)
+project(no_modules_plain_cpp CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+add_library(test OBJECT plain.cpp)

tests/data/modules/partition_chain/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(partition_chain CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES types.cppm core.cppm sys.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/partition_interface/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(partition_interface CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES part.cppm primary.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/partition_with_external_import/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(partition_with_external_import CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES ext.cppm part.cppm app.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/partition_with_gmf/CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.20)
+project(partition_with_gmf CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES part_cfg.cppm cfg.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})
+target_include_directories(test PRIVATE ${CMAKE_SOURCE_DIR})

tests/data/modules/private_module_fragment/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(private_module_fragment CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES priv.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/re_export/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(re_export CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES core.cppm wrapper.cppm user.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/save_recompile/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(save_recompile CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES leaf.cppm mid.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/single_module_no_deps/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(single_module_no_deps CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES mod_a.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})

tests/data/modules/template_export/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+project(template_export CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(SOURCES tmpl.cppm use_tmpl.cppm)
+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX)
+add_library(test OBJECT ${SOURCES})