Fix bookmark build target resolution to use correct outline lookup method (#4784)

Copilot · Omotola · snehara99 · web-flow · commit 3c9a3b4e6af2 · 2026-03-05T20:32:18.000Z
* Initial plan * Fix bookmarked targets running full build instead of specific target (#4771) Co-authored-by: Omotola <8052624+Omotola@users.noreply.github.com> * Add error logging when bookmark target cannot be resolved Co-authored-by: Omotola <8052624+Omotola@users.noreply.github.com> * Fix project selection for bookmark builds using platformNormalizePath Co-authored-by: Omotola <8052624+Omotola@users.noreply.github.com> * Add fallback resolution for bookmark targets via project outline lookup Co-authored-by: Omotola <8052624+Omotola@users.noreply.github.com> * Revert resolveTargetNode to original working version without outline fallback Co-authored-by: Omotola <8052624+Omotola@users.noreply.github.com> * Remove accidentally committed .npmrc.bak Co-authored-by: Omotola <8052624+Omotola@users.noreply.github.com> * Fix resolveTargetNode fallback to use correct findTargetNodeById method The previous fallback (from automated reviewer suggestion) called getNodeById which doesn't exist on ProjectOutline, making it silently fail. The correct method is findTargetNodeById. This fallback provides defense-in-depth alongside the existing reattachTargets() mechanism for edge cases where the outline is populated but reattachTargets() hasn't run yet. Co-authored-by: snehara99 <113148726+snehara99@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Omotola <8052624+Omotola@users.noreply.github.com> Co-authored-by: Omotola <omotolaakeredolu@yahoo.com> Co-authored-by: snehara99 <113148726+snehara99@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@ Improvements:
 
 Bug Fixes:
 - Fix `cmake.buildTask` build failures not aborting debug launches. When `${command:cmake.launchTargetPath}` is used in `launch.json`, a failed build now correctly prevents the stale executable from being launched. [#3389](https://github.com/microsoft/vscode-cmake-tools/issues/3389)
+- Fix bookmarked targets running a full build instead of building only the specific target when triggered from the Bookmarks view. [#4771](https://github.com/microsoft/vscode-cmake-tools/issues/4771)
 - Fix `cmake.compileFile` command truncating long compile commands at ~1024 characters on macOS. The command is now sent to the terminal in chunks to avoid VS Code terminal buffer limitations. [#4470](https://github.com/microsoft/vscode-cmake-tools/issues/4470)
 - Fix configure/build sometimes using stale preset values when unsaved changes to included preset files are auto-saved before configure. The extension now explicitly refreshes presets from disk after saving, instead of relying solely on the asynchronous file watcher. [#4502](https://github.com/microsoft/vscode-cmake-tools/issues/4502)
 - Reduce overly verbose logging when CMake configure or build fails. The Output panel no longer floods with duplicated output, and the channel is only revealed on error rather than unconditionally. [#4749](https://github.com/microsoft/vscode-cmake-tools/issues/4749)
diff --git a/src/extension.ts b/src/extension.ts
@@ -31,7 +31,7 @@ import { StateManager } from './state';
 import { cmakeTaskProvider, CMakeTaskProvider } from '@cmt/cmakeTaskProvider';
 import * as telemetry from '@cmt/telemetry';
 import { ProjectOutline, ProjectNode, TargetNode, SourceFileNode, WorkspaceFolderNode, BaseNode, DirectoryNode, CTestTestNode } from '@cmt/ui/projectOutline/projectOutline';
-import { BookmarksProvider } from '@cmt/ui/bookmarks';
+import { BookmarksProvider, BookmarkNode } from '@cmt/ui/bookmarks';
 import * as util from '@cmt/util';
 import { ProgressHandle, DummyDisposable, reportProgress, runCommand } from '@cmt/util';
 import { DEFAULT_VARIANTS } from '@cmt/kits/variant';
@@ -1346,10 +1346,10 @@ export class ExtensionManager implements vscode.Disposable {
             if (!projects || projects.length === 0) {
                 return activeProject;
             } else {
-                // Choose project by corresponding source directory
-                return projects.find(project => sourceDir && (path.normalize(sourceDir) === path.normalize(project.folderPath)))
+                // Choose project by corresponding source directory (use platformNormalizePath for case-insensitive matching on Windows)
+                return projects.find(project => sourceDir && (util.platformNormalizePath(sourceDir) === util.platformNormalizePath(project.folderPath)))
                     // Choose project by folder of active project
-                    ?? projects.find(project => activeProject?.folderPath === project.folderPath)
+                    ?? projects.find(project => activeProject && (util.platformNormalizePath(activeProject.folderPath) === util.platformNormalizePath(project.folderPath)))
                     // Fallback to first project
                     ?? projects[0];
             }
@@ -2504,6 +2504,27 @@ async function setup(context: vscode.ExtensionContext, progress?: ProgressHandle
         context.subscriptions.push(vscode.commands.registerCommand('cmake.getSettingsChangePromise', () => getSettingsChangePromise()));
     }
 
+    // Helper to resolve a BookmarkNode to its underlying TargetNode
+    const resolveTargetNode = (what: TargetNode | BookmarkNode): TargetNode | undefined => {
+        if (what instanceof TargetNode) {
+            return what;
+        }
+        if (what instanceof BookmarkNode) {
+            // Fast path: the bookmark is already attached to a live TargetNode.
+            if (what.bookmark.sourceNode instanceof TargetNode) {
+                return what.bookmark.sourceNode;
+            }
+            // Fallback: try to resolve by stable id via the current project outline.
+            const node = ext.getProjectOutline().findTargetNodeById(what.bookmark.id);
+            if (node instanceof TargetNode) {
+                what.bookmark.sourceNode = node;
+                return node;
+            }
+            log.error(localize('bookmark.target.not.resolved', 'Bookmark "{0}" could not be resolved to a target. The project may need to be reconfigured.', what.bookmark.name));
+        }
+        return undefined;
+    };
+
     context.subscriptions.push(...[
         // Special commands that don't require logging or separate error handling
         vscode.commands.registerCommand('cmake.outline.configureAll', () => runCommand('configureAll')),
@@ -2609,10 +2630,30 @@ async function setup(context: vscode.ExtensionContext, progress?: ProgressHandle
         }),
         vscode.commands.registerCommand('cmake.outline.build', (what: ProjectNode) => runCommand('build', what.folder, "all", what.sourceDirectory)),
         vscode.commands.registerCommand('cmake.outline.clean', (what: ProjectNode) => runCommand('build', what.folder, "clean", what.sourceDirectory)),
-        vscode.commands.registerCommand('cmake.outline.buildTarget', (what: TargetNode) => runCommand('build', what.folder, what.name, what.sourceDir)),
-        vscode.commands.registerCommand('cmake.outline.runUtilityTarget', (what: TargetNode) => runCommand('build', what.folder, what.name, what.sourceDir)),
-        vscode.commands.registerCommand('cmake.outline.debugTarget', (what: TargetNode) => runCommand('debugTarget', what.folder, what.name, what.sourceDir)),
-        vscode.commands.registerCommand('cmake.outline.launchTarget', (what: TargetNode) => runCommand('launchTarget', what.folder, what.name, what.sourceDir)),
+        vscode.commands.registerCommand('cmake.outline.buildTarget', (what: TargetNode | BookmarkNode) => {
+            const target = resolveTargetNode(what);
+            if (target) {
+                return runCommand('build', target.folder, target.name, target.sourceDir);
+            }
+        }),
+        vscode.commands.registerCommand('cmake.outline.runUtilityTarget', (what: TargetNode | BookmarkNode) => {
+            const target = resolveTargetNode(what);
+            if (target) {
+                return runCommand('build', target.folder, target.name, target.sourceDir);
+            }
+        }),
+        vscode.commands.registerCommand('cmake.outline.debugTarget', (what: TargetNode | BookmarkNode) => {
+            const target = resolveTargetNode(what);
+            if (target) {
+                return runCommand('debugTarget', target.folder, target.name, target.sourceDir);
+            }
+        }),
+        vscode.commands.registerCommand('cmake.outline.launchTarget', (what: TargetNode | BookmarkNode) => {
+            const target = resolveTargetNode(what);
+            if (target) {
+                return runCommand('launchTarget', target.folder, target.name, target.sourceDir);
+            }
+        }),
         vscode.commands.registerCommand('cmake.outline.setDefaultTarget', (what: TargetNode) => runCommand('setDefaultTarget', what.folder, what.name, what.sourceDir)),
         vscode.commands.registerCommand('cmake.outline.setLaunchTarget', (what: TargetNode) => runCommand('selectLaunchTarget', what.folder, what.name, what.sourceDir)),
         vscode.commands.registerCommand('cmake.outline.revealInCMakeLists', (what: TargetNode) => what.openInCMakeLists()),
