Refactor the computation of main files #847
Merged
Conversation
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
hamishknight
approved these changes
Oct 3, 2023
| if mainFiles.contains(uri) { | ||
| // If the main files contain the file itself, prefer to use that one | ||
| return uri | ||
| } else if let mainFile = mainFiles.sorted(by: { $0.pseudoPath < $1.pseudoPath }).first { |
There was a problem hiding this comment.
Nit: This could be better written as min(by: { $0.pseudoPath < $1.pseudoPath })
There was a problem hiding this comment.
Nice. I didn’t know about min(by:) 👍🏽
ahoppen
force-pushed
the
ahoppen/refactor-main-file-computation
branch
from
b32d2e2 to
67b9c58
Compare
…-op functions from it
The motivating change for this was to deterministically pick a main file for a header file instead of picking the first element in a set, which is not deterministic. While doing this, I also changed the main file computation to not carry any state about previous main files around. If a header file is associated with a main file b.cpp and a new a.cpp gets added that imports the header as well, we should be using a.cpp for the build settings. That way we will get the same build settings if we close and re-open the project. And this was a good opportunity to refactor some of the main file handling into smaller, more dedicated functions.
ahoppen
force-pushed
the
ahoppen/refactor-main-file-computation
branch
from
67b9c58 to
0cccd3b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The motivating change for this was to deterministically pick a main file for a header file instead of picking the first element in a set, which is not deterministic.
While doing this, I also changed the main file computation to not carry any state about previous main files around. If a header file is associated with a main file b.cpp and a new a.cpp gets added that imports the header as well, we should be using a.cpp for the build settings. That way we will get the same build settings if we close and re-open the project.
And this was a good opportunity to refactor some of the main file handling into smaller, more dedicated functions.
Also includes the changes I made to #841 (comment) because I forgot to push those changes before hitting merge.