Fix non-existent files resolving as working directory#594
Open
ervin7mk wants to merge 2 commits intoEricsson:masterfrom
Open
Fix non-existent files resolving as working directory#594ervin7mk wants to merge 2 commits intoEricsson:masterfrom
ervin7mk wants to merge 2 commits intoEricsson:masterfrom
Conversation
This commit should fix non-existent files and directories being shown in the infotree
This commit should fix non-existent files and directories being shown in the infotree
mcserep
added
Kind: Bug ⚠️
Plugin: C++
bruntib
requested changes
May 3, 2023
| } | ||
| } | ||
| return fileLoc; | ||
| return fileLoc; |
| } | ||
|
|
||
| return fileLoc; | ||
| return fileLoc; |
| @@ -77,39 +77,48 @@ void PPIncludeCallback::InclusionDirective( | |||
|
|
|||
| std::string includedPath = searchPath_.str() + '/' + fileName_.str(); | |||
| model::FilePtr included = _ctx.srcMgr.getFile(includedPath); | |||
Collaborator
There was a problem hiding this comment.
Instead of adding extra indentation everywhere, maybe it was simpler to bring the getFile() calls from line 79 and 94 to the beginning before line 76 and make an early return if either of them is null. It would indicate better that no action is needed in that case.
| odb::query<model::CppHeaderInclusion>::included == file->id); | ||
|
|
||
| for (const auto& inclusion : inclusions) | ||
| if (file) |
Collaborator
There was a problem hiding this comment.
Consider using the early return technique if the nesting is too deep.
mcserep
added
the
Status: At risk 🚨
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
3 participants
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.
Closes #573.