From f9a3bd8526889ba62d58f8c5f72b630d3f1e2b35 Mon Sep 17 00:00:00 2001
From: ykiko <ykikoykikoykiko@gmail.com>
Date: Thu, 23 Apr 2026 18:55:15 +0800
Subject: [PATCH] fix: update cmake libs and test expectations for LLVM 22.1

Add clangOptions to Debug library list (split from clangDriver in 22.1).
Update test expectations for ElaboratedType removal and NNS changes.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 cmake/llvm.cmake                        | 1 +
 tests/unit/feature/inlay_hint_tests.cpp | 2 +-
 tests/unit/semantic/selection_tests.cpp | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmake/llvm.cmake b/cmake/llvm.cmake
index 694857ef..f9a27014 100644
--- a/cmake/llvm.cmake
+++ b/cmake/llvm.cmake
@@ -81,6 +81,7 @@ function(setup_llvm LLVM_VERSION)
             clangBasic
             clangDriver
             clangFormat
+            clangOptions
             clangFrontend
             clangLex
             clangSema
diff --git a/tests/unit/feature/inlay_hint_tests.cpp b/tests/unit/feature/inlay_hint_tests.cpp
index 00cbd0f2..7216b487 100644
--- a/tests/unit/feature/inlay_hint_tests.cpp
+++ b/tests/unit/feature/inlay_hint_tests.cpp
@@ -621,7 +621,7 @@ TEST_CASE(Types) {
         )c");
     EXPECT_SIZE(2);
     EXPECT_HINT("0", ": S1");
-    EXPECT_HINT("1", ": S2::Inner<int>");
+    EXPECT_HINT("1", ": Inner<int>");
 
     // Lambda
     run(R"c(
diff --git a/tests/unit/semantic/selection_tests.cpp b/tests/unit/semantic/selection_tests.cpp
index 7ab4f2ea..552c03b1 100644
--- a/tests/unit/semantic/selection_tests.cpp
+++ b/tests/unit/semantic/selection_tests.cpp
@@ -444,7 +444,7 @@ TEST_CASE(CXXFeatures) {
           template <typename T>
           int x = @[T::$U::]ccc();
           )",
-                  "NestedNameSpecifierLoc");
+                  "DependentNameTypeLoc");
     EXPECT_SELECT(R"(
           struct Foo {};
           struct Bar : @[v$ir$tual private Foo] {};
@@ -488,7 +488,7 @@ TEST_CASE(UsingEnum) {
         namespace ns { enum class A {}; };
         using enum @[$ns::]A;
         )",
-                  "NestedNameSpecifierLoc");
+                  "UsingEnumDecl");
     EXPECT_SELECT(R"(
         namespace ns { enum class A {}; };
         @[using $enum ns::A];