fix: complete clangd release validation

Author: wellwei

CHANGELOG.md

@@ -3,8 +3,8 @@
 ## 0.2.4
 
 - 修复 hermetic mcpp 编译数据库被插件追加 `--query-driver` 后导致的 clangd 标准库和
-  模块误诊断；仅在编译命令未自带完整 sysroot、标准库和 no-default-config 配置时补充
-  query driver。
+  模块误诊断；仅在编译命令未自带 no-default-config 和显式标准库配置时补充 query
+  driver。
 - 模块检查优先选择项目源码，避免误选 `.mcpp` 依赖缓存或 `target` 生成源码，改善补全、
   跳转和诊断稳定性。
 - 将 `build.mcpp` 作为独立的语法高亮语言处理，不再让 clangd 把 mcpp 构建脚本当作普通

README.md

@@ -105,8 +105,8 @@ TextMate 语法规则提供。
 2. 从显式设置、编译器目录、匹配的 xlings `llvm-tools` 目录和 `PATH` 中查找 clangd。
 3. 执行编译器和 clangd 的版本命令，比较 LLVM 版本与 revision。
 4. 保留用户已有的 `clangd.arguments`，展开 `${workspaceFolder}` 和
-   `${workspaceRoot}`；只有在 CDB 未提供完整 sysroot、标准库和 no-default-config
-   参数时，才添加精确的 `--query-driver`。
+   `${workspaceRoot}`；只有在 CDB 未提供 no-default-config 和显式标准库配置时，才添加
+   精确的 `--query-driver`。
 5. 根据 CDB 中是否已有显式 PCM 映射以及 `mcpp.modulesSupport` 设置，决定是否增加
    clangd 实验模块参数。
 6. 必要时重启官方 clangd 扩展，并执行一次最长 60 秒的 `clangd --check`。
@@ -381,8 +381,8 @@ API、状态栏、任务和 clangd 集成。
 版本完全一致的 tag：
 
 ```sh
-git tag -a v0.2.3 -m "mcpp-vscode 0.2.3"
-git push origin v0.2.3
+git tag -a v0.2.4 -m "mcpp-vscode 0.2.4"
+git push origin v0.2.4
 ```
 
 `.github/workflows/release.yml` 会校验 tag，执行测试和打包，生成 VSIX 与 SHA-256 文件，

docs/superpowers/plans/2026-08-05-clangd-hermetic-cdb-build-script.md

@@ -138,3 +138,10 @@ Create annotated tag `v0.2.4` on the verified repair commit. Do not push it or c
 Run: `code --install-extension /Users/cltx/projects/mcpp/mcpp-vscode/mcpp-vscode-0.2.4.vsix --force`
 
 Then run `code --list-extensions --show-versions` and verify `mcpp-community.mcpp-vscode@0.2.4`. A VS Code window reload is required before the new language registration and clangd arguments take effect.
+
+### Review follow-up
+
+- [x] Extend module grammar injection to `source.mcpp-build` and cover the import capture scope.
+- [x] Resolve relative compilation-database source paths from each command directory.
+- [x] Treat explicit libc++ and no-default-config commands as hermetic without requiring a sysroot.
+- [x] Keep the release instructions synchronized with the extension version.

package.json

@@ -178,7 +178,8 @@
       {
         "scopeName": "source.cpp.mcpp-modules",
         "injectTo": [
-          "source.cpp"
+          "source.cpp",
+          "source.mcpp-build"
         ],
         "path": "./syntaxes/mcpp-modules.tmLanguage.json"
       }

src/analysis.ts

@@ -179,12 +179,16 @@ export function analyzeCompilationDatabase(contents: string): CompilationDatabas
       argument.startsWith("-fmodule-file=")
       || argument.startsWith("-fprebuilt-module-path=")
     ));
+    const directory = typeof command.directory === "string" ? command.directory : undefined;
+    const sourceFile = typeof command.file === "string"
+      ? resolveCompilationSourceFile(directory, command.file)
+      : undefined;
     candidates.push({
       kind,
       capability: kind === "llvm" ? "full" : "syntax-only",
       compilerPath: args[0],
-      sourceFile: typeof command.file === "string" ? command.file : undefined,
-      directory: typeof command.directory === "string" ? command.directory : undefined,
+      sourceFile,
+      directory,
       arguments: args,
       hasPrebuiltModules,
       reason: kind === "llvm"
@@ -219,6 +223,16 @@ function isWithinDirectory(directory: string, file: string): boolean {
     || (relative !== ".." && !relative.startsWith(`..${pathApi.sep}`) && !pathApi.isAbsolute(relative));
 }
 
+function resolveCompilationSourceFile(directory: string | undefined, file: string): string {
+  if (directory === undefined) {
+    return file;
+  }
+  const windows = /^[A-Za-z]:[\\/]/.test(directory) || directory.includes("\\")
+    || /^[A-Za-z]:[\\/]/.test(file) || file.includes("\\");
+  const pathApi = windows ? path.win32 : path.posix;
+  return pathApi.isAbsolute(file) ? file : pathApi.resolve(directory, file);
+}
+
 function isProjectSource(directory: string, file: string): boolean {
   if (!isWithinDirectory(directory, file)) {
     return false;
@@ -252,13 +266,6 @@ function removeManagedArguments(arguments_: readonly string[]): string[] {
   return result;
 }
 
-function hasValueFlag(arguments_: readonly string[], flag: string): boolean {
-  return arguments_.some((argument, index) => (
-    (argument === flag && index + 1 < arguments_.length)
-    || argument.startsWith(`${flag}=`)
-  ));
-}
-
 function hasExplicitLibcxxPath(arguments_: readonly string[]): boolean {
   return arguments_.some((argument, index) => {
     const value = argument === "-isystem"
@@ -276,8 +283,7 @@ function isHermeticClangCommand(arguments_: readonly string[] | undefined): bool
   }
   return arguments_.includes("--no-default-config")
     && arguments_.includes("-nostdinc++")
-    && hasExplicitLibcxxPath(arguments_)
-    && hasValueFlag(arguments_, "--sysroot");
+    && hasExplicitLibcxxPath(arguments_);
 }
 
 function expandWorkspaceVariables(argument: string, workspaceFolder?: string): string {

syntaxes/mcpp-modules.tmLanguage.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
   "name": "mcpp C++ Modules",
   "scopeName": "source.cpp.mcpp-modules",
-  "injectionSelector": "L:source.cpp",
+  "injectionSelector": "L:source.cpp, L:source.mcpp-build",
   "patterns": [
     {
       "include": "#module-declaration"

test/analysis.test.ts

@@ -115,6 +115,35 @@ test("prefers a project source over an mcpp dependency cache source", () => {
   assert.equal(result.sourceFile, "/work/app/src/main.cpp");
 });
 
+test("resolves relative CDB source files from their command directory", () => {
+  const result = analyzeCompilationDatabase(JSON.stringify([
+    {
+      directory: "/work/app",
+      file: "/work/app/.mcpp/packages/redis/src/transaction.cpp",
+      arguments: [
+        "/tools/clang++",
+        "-std=c++23",
+        "-fprebuilt-module-path=/work/app/target/pcm.cache",
+        "-c",
+        "/work/app/.mcpp/packages/redis/src/transaction.cpp",
+      ],
+    },
+    {
+      directory: "/work/app",
+      file: "src/main.cpp",
+      arguments: [
+        "/tools/clang++",
+        "-std=c++23",
+        "-fprebuilt-module-path=/work/app/target/pcm.cache",
+        "-c",
+        "src/main.cpp",
+      ],
+    },
+  ]));
+
+  assert.equal(result.sourceFile, "/work/app/src/main.cpp");
+});
+
 test("keeps Windows separators when reading a command-form CDB entry", () => {
   const result = analyzeCompilationDatabase(JSON.stringify([
     {
@@ -203,8 +232,10 @@ test("hermetic mcpp commands do not use query-driver discovery", () => {
         "/tools/clang++",
         "--no-default-config",
         "-nostdinc++",
-        "-isystem/tools/llvm/include/c++/v1",
-        "--sysroot=/platform/sdk",
+        "-isystem",
+        "/tools/llvm/include/c++/v1",
+        "-isystem/tools/llvm/include/x86_64-unknown-linux-gnu",
+        "-isystem/tools/llvm/include",
         "-c",
         "/work/app/src/main.cpp",
       ],

test/artifacts.test.ts

@@ -137,12 +137,16 @@ test("ships an injection grammar with module-specific scopes", () => {
   const grammar = manifest.contributes?.grammars?.find((item) => item.scopeName === "source.cpp.mcpp-modules");
   assert.deepEqual(grammar, {
     scopeName: "source.cpp.mcpp-modules",
-    injectTo: ["source.cpp"],
+    injectTo: ["source.cpp", "source.mcpp-build"],
     path: "./syntaxes/mcpp-modules.tmLanguage.json",
   });
 
   const grammarText = readFileSync(path.join(root, "syntaxes/mcpp-modules.tmLanguage.json"), "utf8");
-  const grammarDocument = JSON.parse(grammarText) as { repository?: Record<string, unknown> };
+  const grammarDocument = JSON.parse(grammarText) as {
+    injectionSelector?: string;
+    repository?: Record<string, unknown>;
+  };
+  assert.match(grammarDocument.injectionSelector ?? "", /source\.mcpp-build/);
   for (const key of ["module-declaration", "import-declaration", "module-name"]) {
     assert.ok(grammarDocument.repository?.[key], `missing grammar rule: ${key}`);
   }
@@ -155,6 +159,12 @@ test("ships an injection grammar with module-specific scopes", () => {
   const importPattern = new RegExp(javascriptPattern);
   assert.match("import xxx", importPattern);
   assert.match("export import foo.bar;", importPattern);
+
+  const importRuleWithCaptures = importRule as {
+    captures?: Record<string, { name?: string }>;
+  };
+  assert.equal(importRuleWithCaptures.captures?.["2"]?.name, "keyword.control.import.cpp");
+  assert.match("import mcpp;", importPattern);
 });
 
 test("设置全局默认后先释放工具链锁再提供立即构建", () => {