Merge branch 'feature/support-phpactor' of ssh://github.com/takeokunn/serena into feature/support-phpactor

# Conflicts:
#	test/conftest.py

test/conftest.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import shutil as _sh
 from collections.abc import Iterator
 from contextlib import contextmanager
 from pathlib import Path
@@ -35,6 +36,7 @@ class LanguageParamRequest:
 
 
 _LANGUAGE_REPO_ALIASES: dict[Language, Language] = {
+    Language.CPP_CCLS: Language.CPP,
     Language.PHP_PHPACTOR: Language.PHP,
     Language.PYTHON_JEDI: Language.PYTHON,
     Language.RUBY_SOLARGRAPH: Language.RUBY,
@@ -60,7 +62,11 @@ def _create_ls(
     gitignore_parser = GitignoreParser(str(repo_path))
     for spec in gitignore_parser.get_ignore_specs():
         ignored_paths.extend(spec.patterns)
-    config = LanguageServerConfig(code_language=language, ignored_paths=ignored_paths, trace_lsp_communication=trace_lsp_communication)
+    config = LanguageServerConfig(
+        code_language=language,
+        ignored_paths=ignored_paths,
+        trace_lsp_communication=trace_lsp_communication,
+    )
     effective_solidlsp_dir = solidlsp_dir if solidlsp_dir is not None else SerenaPaths().serena_user_home_dir
     return SolidLanguageServer.create(
         config,
@@ -220,6 +226,16 @@ def _determine_disabled_languages() -> list[Language]:
     if not clojure_tests_enabled:
         result.append(Language.CLOJURE)
 
+    # Disable CPP_CCLS tests if ccls is not available
+    ccls_tests_enabled = _sh.which("ccls") is not None
+    if not ccls_tests_enabled:
+        result.append(Language.CPP_CCLS)
+
+    # Disable CPP (clangd) tests if clangd is not available
+    clangd_tests_enabled = _sh.which("clangd") is not None
+    if not clangd_tests_enabled:
+        result.append(Language.CPP)
+
     al_tests_enabled = True
     if not al_tests_enabled:
         result.append(Language.AL)