Fix compile_commands.json #3538
Merged
Conversation
This file contains 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
lieser
force-pushed
the
pl/fix-compile_commands
branch
from
4d9323d to
2088a0b
Compare
|
Can you give a little context as to what is being fixed here? From the patch I don't really understand the issue. |
|
If I run
Both are I think invalid in JSON, and at least the VS Code C++ extension complains that it could not parse the With the fixes in this PR it looks like the following, and gets parsed by the VS Code C++ extension without a problem: |
randombit
reviewed
May 2, 2023
configure.py
Outdated
| @@ -1813,7 +1813,13 @@ def insert_join(match): | |||
| output += lines[idx] + "\n" | |||
| idx += 1 | |||
|
|
|||
| return self.join_pattern.sub(insert_join, self.value_pattern.sub(insert_value, output)) + '\n' | |||
| subsituded_template = self.join_pattern.sub(insert_join, self.value_pattern.sub(insert_value, output)) | |||
There was a problem hiding this comment.
substituted_
But I think just output is simpler and sufficient.
configure.py
Outdated
| if len(lines) == 1 and not template.endswith('\n'): | ||
| return subsituded_template.rstrip('\n') | ||
|
|
||
| return subsituded_template + '\n' |
There was a problem hiding this comment.
This seems to be adding another, additional newline, which doesn't seem necessary.
There was a problem hiding this comment.
Agree this is not needed. Removed it.
Removes newlines in JSON strings and normalize path to avoid backslash in JSON strings. Also remove the additional added newline at the end.
lieser
force-pushed
the
pl/fix-compile_commands
branch
from
2088a0b to
59958ae
Compare
reneme
approved these changes
May 5, 2023
randombit
approved these changes
May 5, 2023
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.
Removes newlines in JSON strings and normalize path to avoid backslash in JSON strings.
Also remove the additional added newline at the end.
Note if testing with
ccacheorsccachein VS Code:Make sure your use the most recent version 1.15.4 of the C++ extension as this fixed a compatibility issue with them microsoft/vscode-cpptools#7616.