Fix makePathRelative using wrong base path when projectDirectory differs#1608
Merged
Fix makePathRelative using wrong base path when projectDirectory differs#1608
Conversation
…ers (#1606) `makePathRelative` used `project.basePath` to compute parent paths, while `resolveGroupPath` used `projectDirectory ?? project.basePath`. When these differ (e.g. via --project flag), intermediate group paths become inconsistent, causing Xcode to resolve files to the wrong location. Regression from #1596 which added the `makePathRelative` call in the `createIntermediateGroups` code path. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Consolidates `projectDirectory ?? project.basePath` into a single `basePath` property to prevent future mismatches between path resolution call sites. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
makePathRelativeusedproject.basePathto compute the aggregated parent path, whileresolveGroupPathusedprojectDirectory ?? project.basePath. When these differ (e.g. via--projectflag), intermediate group paths become inconsistent, causing Xcode to resolve source files to the wrong location (parent directory dropped).makePathRelativecall in thecreateIntermediateGroupscode path.basePathcomputed property to consolidateprojectDirectory ?? project.basePathand prevent future mismatches.Test plan
projectDirectorydiffers frombasePathxcodegen generate --spec ProjectRoot/XcodeGen/project.yml --project ProjectRoot/now produces correct paths🤖 Generated with Claude Code