[YAML] fix output incorrect format for block scalar string #132897
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
|
original #131694 closed due to miss-operation |
|
@llvm/pr-subscribers-objectyaml @llvm/pr-subscribers-llvm-support Author: Congcong Cai (HerrCai0907) ChangesAfter outputting block scalar string, the indent will be wrong. The new added ut will fail in main. @@ -3,4 +3,4 @@
Just a block
scalar doc
-scalar: a
+ scalar: a
...\nFull diff: https://github.com/llvm/llvm-project/pull/132897.diff 2 Files Affected:
diff --git a/llvm/lib/Support/YAMLTraits.cpp b/llvm/lib/Support/YAMLTraits.cpp
index 28642e004c4f4..035828b594e84 100644
--- a/llvm/lib/Support/YAMLTraits.cpp
+++ b/llvm/lib/Support/YAMLTraits.cpp
@@ -725,18 +725,18 @@ void Output::blockScalarString(StringRef &S) {
if (!StateStack.empty())
newLineCheck();
output(" |");
- outputNewLine();
unsigned Indent = StateStack.empty() ? 1 : StateStack.size();
auto Buffer = MemoryBuffer::getMemBuffer(S, "", false);
for (line_iterator Lines(*Buffer, false); !Lines.is_at_end(); ++Lines) {
+ outputNewLine();
for (unsigned I = 0; I < Indent; ++I) {
output(" ");
}
output(*Lines);
- outputNewLine();
}
+ outputUpToEndOfLine("");
}
void Output::scalarTag(std::string &Tag) {
diff --git a/llvm/unittests/Support/YAMLIOTest.cpp b/llvm/unittests/Support/YAMLIOTest.cpp
index 3db1db57ad596..5a86555d08fb3 100644
--- a/llvm/unittests/Support/YAMLIOTest.cpp
+++ b/llvm/unittests/Support/YAMLIOTest.cpp
@@ -1298,7 +1298,7 @@ TEST(YAMLIO, TestScalarAfterBlockScalar) {
- block_scalac: |
AA
BB
-scalar: a
+ scalar: a
...
)");
}
|
You can reopen pull requests |
|
Test has merge conflict |
I try to reopen it but failed.
I will reland previous PR and re-run the test |
|
Test failures look real |
delcypher
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Mar 31, 2025
This change: ``` commit a80aad2 Author: Congcong Cai <[email protected]> Date: Thu Mar 27 02:16:27 2025 +0800 [YAML] fix output incorrect format for block scalar string (llvm#132897) ``` caused emission of empty lines to removed in some cases. Which broke the tests. This patch updates the test. rdar://148048779
delcypher
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Mar 31, 2025
This change: ``` commit a80aad2 Author: Congcong Cai <[email protected]> Date: Thu Mar 27 02:16:27 2025 +0800 [YAML] fix output incorrect format for block scalar string (llvm#132897) ``` caused emission of empty lines to removed in some cases. Which broke the tests. This patch updates the test. rdar://148048779
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.
After outputting block scalar string, the indent will be wrong.
This patch fixes Padding after block scalar string to ensure the correct format of yaml.
The new added ut will fail in main.