[clang-format] Detect nesting in template strings #119989
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
The helper to check if a token is in a template string scans too far backward. It should stop if a different scope is found. Fixes llvm#107571
|
@llvm/pr-subscribers-clang-format Author: Gedare Bloom (gedare) ChangesThe helper to check if a token is in a template string scans too far backward. It should stop if a different scope is found. Fixes #107571 Full diff: https://github.com/llvm/llvm-project/pull/119989.diff 2 Files Affected:
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp
index aed86c1fb99551..9ffdc044e6784d 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -826,8 +826,10 @@ void ContinuationIndenter::addTokenOnCurrentLine(LineState &State, bool DryRun,
for (const auto *Prev = &Tok; Prev; Prev = Prev->Previous) {
if (Prev->is(TT_TemplateString) && Prev->opensScope())
return true;
- if (Prev->is(TT_TemplateString) && Prev->closesScope())
+ if (Prev->opensScope() ||
+ (Prev->is(TT_TemplateString) && Prev->closesScope())) {
break;
+ }
}
return false;
};
diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp
index 4b15e7b7da3393..678fd1f3fc8d0e 100644
--- a/clang/unittests/Format/FormatTestJS.cpp
+++ b/clang/unittests/Format/FormatTestJS.cpp
@@ -2157,6 +2157,13 @@ TEST_F(FormatTestJS, TemplateStringMultiLineExpression) {
" aaaa: aaaaa,\n"
" bbbb: bbbbb,\n"
" })}`;");
+
+ verifyFormat("`${\n"
+ " (\n"
+ " FOOFOOFOOFOO____FOO_FOO_FO_FOO_FOOO -\n"
+ " (barbarbarbar____bar_bar_bar_bar_bar_bar +\n"
+ " bar_bar_bar_barbarbar___bar_bar_bar + 1),\n"
+ " )}`;\n");
}
TEST_F(FormatTestJS, TemplateStringASI) {
|
owenca
reviewed
Dec 15, 2024
owenca
approved these changes
Dec 15, 2024
Co-authored-by: Owen Pan <owenpiano@gmail.com>
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 helper to check if a token is in a template string scans too far backward. It should stop if a different scope is found.
Fixes #107571