[clang] [clang-format] Set Change.TokenLength to ColumnWidth (PR #90378)

2024-04-28 Thread Owen Pan via cfe-commits 

https://github.com/owenca closed https://github.com/llvm/llvm-project/pull/90378
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [clang-format] Set Change.TokenLength to ColumnWidth (PR #90378)

2024-04-28 Thread Owen Pan via cfe-commits 

https://github.com/owenca edited https://github.com/llvm/llvm-project/pull/90378
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [clang-format] Set Change.TokenLength to ColumnWidth (PR #90378)

2024-04-28 Thread Björn Schäpers via cfe-commits 

https://github.com/HazardyKnusperkeks approved this pull request.


https://github.com/llvm/llvm-project/pull/90378
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [clang-format] Set Change.TokenLength to ColumnWidth (PR #90378)

2024-04-28 Thread via cfe-commits 

llvmbot wrote:




@llvm/pr-subscribers-clang-format

Author: Owen Pan (owenca)


Changes

Fixes #47333.
Fixes #47624.
Fixes #75929.
Fixes #87885.
Fixes #89916.

---
Full diff: https://github.com/llvm/llvm-project/pull/90378.diff


2 Files Affected:

- (modified) clang/lib/Format/WhitespaceManager.cpp (+7-4) 
- (modified) clang/unittests/Format/FormatTest.cpp (+39) 


``diff
diff --git a/clang/lib/Format/WhitespaceManager.cpp 
b/clang/lib/Format/WhitespaceManager.cpp
index cc9bcce6c414e0..44fd807ec27ea7 100644
--- a/clang/lib/Format/WhitespaceManager.cpp
+++ b/clang/lib/Format/WhitespaceManager.cpp
@@ -131,6 +131,7 @@ void WhitespaceManager::calculateLineBreakInformation() {
   for (unsigned I = 1, e = Changes.size(); I != e; ++I) {
 auto  = Changes[I];
 auto  = Changes[I - 1];
+auto  = P.TokenLength;
 SourceLocation OriginalWhitespaceStart =
 C.OriginalWhitespaceRange.getBegin();
 SourceLocation PreviousOriginalWhitespaceEnd =
@@ -169,21 +170,23 @@ void WhitespaceManager::calculateLineBreakInformation() {
 // line of the token.
 auto NewlinePos = Text.find_first_of('\n');
 if (NewlinePos == StringRef::npos) {
-  P.TokenLength = OriginalWhitespaceStartOffset -
+  PrevTokLength = OriginalWhitespaceStartOffset -
   PreviousOriginalWhitespaceEndOffset +
   C.PreviousLinePostfix.size() + 
P.CurrentLinePrefix.size();
+  if (!P.IsInsideToken)
+PrevTokLength = std::min(PrevTokLength, P.Tok->ColumnWidth);
 } else {
-  P.TokenLength = NewlinePos + P.CurrentLinePrefix.size();
+  PrevTokLength = NewlinePos + P.CurrentLinePrefix.size();
 }
 
 // If there are multiple changes in this token, sum up all the changes 
until
 // the end of the line.
 if (P.IsInsideToken && P.NewlinesBefore == 0)
-  LastOutsideTokenChange->TokenLength += P.TokenLength + P.Spaces;
+  LastOutsideTokenChange->TokenLength += PrevTokLength + P.Spaces;
 else
   LastOutsideTokenChange = 
 
-C.PreviousEndOfTokenColumn = P.StartOfTokenColumn + P.TokenLength;
+C.PreviousEndOfTokenColumn = P.StartOfTokenColumn + PrevTokLength;
 
 P.IsTrailingComment =
 (C.NewlinesBefore > 0 || C.Tok->is(tok::eof) ||
diff --git a/clang/unittests/Format/FormatTest.cpp 
b/clang/unittests/Format/FormatTest.cpp
index 8ecc1188a127a5..32ba6b6853c799 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -27363,6 +27363,45 @@ TEST_F(FormatTest, BreakAdjacentStringLiterals) {
   verifyFormat(Code, Style);
 }
 
+TEST_F(FormatTest, AlignUTFCommentsAndStringLiterals) {
+  verifyFormat(
+  "int rus;  // А теперь комментарии, например, на русском, 2-байта\n"
+  "int long_rus; // Верхний коммент еще не превысил границу в 80, однако\n"
+  "  // уже отодвинут. Перенос, при этом, отрабатывает верно");
+
+  auto Style = getLLVMStyle();
+  Style.ColumnLimit = 15;
+  verifyNoChange("#define test  \\\n"
+ "  /* 测试 */  \\\n"
+ "  \"aa\"\\\n"
+ "  \"bb\"",
+ Style);
+
+  Style.ColumnLimit = 25;
+  verifyFormat("struct foo {\n"
+   "  int ii; ///< ii\n"
+   "  int b;  ///< ыыы\n"
+   "  int c;  ///< \n"
+   "};",
+   Style);
+
+  Style.ColumnLimit = 35;
+  verifyFormat("#define SENSOR_DESC_1 \\\n"
+   "  \"{\" \\\n"
+   "  \"unit_of_measurement: \\\"°C\\\",\"  \\\n"
+   "  \"}\"",
+   Style);
+
+  Style.ColumnLimit = 80;
+  Style.AlignArrayOfStructures = FormatStyle::AIAS_Left;
+  verifyFormat("Languages languages = {\n"
+   "Language{{'e', 'n'}, U\"Test English\" },\n"
+   "Language{{'l', 'v'}, U\"Test Latviešu\"},\n"
+   "Language{{'r', 'u'}, U\"Test Русский\" },\n"
+   "};",
+   Style);
+}
+
 } // namespace
 } // namespace test
 } // namespace format

``




https://github.com/llvm/llvm-project/pull/90378
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [clang-format] Set Change.TokenLength to ColumnWidth (PR #90378)

2024-04-28 Thread Owen Pan via cfe-commits 

https://github.com/owenca created 
https://github.com/llvm/llvm-project/pull/90378

Fixes #47333.
Fixes #47624.
Fixes #75929.
Fixes #87885.
Fixes #89916.

>From d671f32e9bcc6e42e53ddd1799eb0fdef774c142 Mon Sep 17 00:00:00 2001
From: Owen Pan 
Date: Sat, 27 Apr 2024 23:34:45 -0700
Subject: [PATCH] [clang-format] Set Change.TokenLength to ColumnWidth

Fixes #47333.
Fixes #47624.
Fixes #75929.
Fixes #87885.
Fixes #89916.
---
 clang/lib/Format/WhitespaceManager.cpp | 11 +---
 clang/unittests/Format/FormatTest.cpp  | 39 ++
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/clang/lib/Format/WhitespaceManager.cpp 
b/clang/lib/Format/WhitespaceManager.cpp
index cc9bcce6c414e0..44fd807ec27ea7 100644
--- a/clang/lib/Format/WhitespaceManager.cpp
+++ b/clang/lib/Format/WhitespaceManager.cpp
@@ -131,6 +131,7 @@ void WhitespaceManager::calculateLineBreakInformation() {
   for (unsigned I = 1, e = Changes.size(); I != e; ++I) {
 auto  = Changes[I];
 auto  = Changes[I - 1];
+auto  = P.TokenLength;
 SourceLocation OriginalWhitespaceStart =
 C.OriginalWhitespaceRange.getBegin();
 SourceLocation PreviousOriginalWhitespaceEnd =
@@ -169,21 +170,23 @@ void WhitespaceManager::calculateLineBreakInformation() {
 // line of the token.
 auto NewlinePos = Text.find_first_of('\n');
 if (NewlinePos == StringRef::npos) {
-  P.TokenLength = OriginalWhitespaceStartOffset -
+  PrevTokLength = OriginalWhitespaceStartOffset -
   PreviousOriginalWhitespaceEndOffset +
   C.PreviousLinePostfix.size() + 
P.CurrentLinePrefix.size();
+  if (!P.IsInsideToken)
+PrevTokLength = std::min(PrevTokLength, P.Tok->ColumnWidth);
 } else {
-  P.TokenLength = NewlinePos + P.CurrentLinePrefix.size();
+  PrevTokLength = NewlinePos + P.CurrentLinePrefix.size();
 }
 
 // If there are multiple changes in this token, sum up all the changes 
until
 // the end of the line.
 if (P.IsInsideToken && P.NewlinesBefore == 0)
-  LastOutsideTokenChange->TokenLength += P.TokenLength + P.Spaces;
+  LastOutsideTokenChange->TokenLength += PrevTokLength + P.Spaces;
 else
   LastOutsideTokenChange = 
 
-C.PreviousEndOfTokenColumn = P.StartOfTokenColumn + P.TokenLength;
+C.PreviousEndOfTokenColumn = P.StartOfTokenColumn + PrevTokLength;
 
 P.IsTrailingComment =
 (C.NewlinesBefore > 0 || C.Tok->is(tok::eof) ||
diff --git a/clang/unittests/Format/FormatTest.cpp 
b/clang/unittests/Format/FormatTest.cpp
index 8ecc1188a127a5..32ba6b6853c799 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -27363,6 +27363,45 @@ TEST_F(FormatTest, BreakAdjacentStringLiterals) {
   verifyFormat(Code, Style);
 }
 
+TEST_F(FormatTest, AlignUTFCommentsAndStringLiterals) {
+  verifyFormat(
+  "int rus;  // А теперь комментарии, например, на русском, 2-байта\n"
+  "int long_rus; // Верхний коммент еще не превысил границу в 80, однако\n"
+  "  // уже отодвинут. Перенос, при этом, отрабатывает верно");
+
+  auto Style = getLLVMStyle();
+  Style.ColumnLimit = 15;
+  verifyNoChange("#define test  \\\n"
+ "  /* 测试 */  \\\n"
+ "  \"aa\"\\\n"
+ "  \"bb\"",
+ Style);
+
+  Style.ColumnLimit = 25;
+  verifyFormat("struct foo {\n"
+   "  int ii; ///< ii\n"
+   "  int b;  ///< ыыы\n"
+   "  int c;  ///< \n"
+   "};",
+   Style);
+
+  Style.ColumnLimit = 35;
+  verifyFormat("#define SENSOR_DESC_1 \\\n"
+   "  \"{\" \\\n"
+   "  \"unit_of_measurement: \\\"°C\\\",\"  \\\n"
+   "  \"}\"",
+   Style);
+
+  Style.ColumnLimit = 80;
+  Style.AlignArrayOfStructures = FormatStyle::AIAS_Left;
+  verifyFormat("Languages languages = {\n"
+   "Language{{'e', 'n'}, U\"Test English\" },\n"
+   "Language{{'l', 'v'}, U\"Test Latviešu\"},\n"
+   "Language{{'r', 'u'}, U\"Test Русский\" },\n"
+   "};",
+   Style);
+}
+
 } // namespace
 } // namespace test
 } // namespace format

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits