[clang] [clang] Add Bytes/Column types to TextDiagnostic (PR #165541)

via cfe-commits cfe-commits at lists.llvm.org
Wed Oct 29 05:01:06 PDT 2025


================
@@ -319,28 +378,29 @@ struct SourceColumnMap {
 static void selectInterestingSourceRegion(std::string &SourceLine,
                                           std::string &CaretLine,
                                           std::string &FixItInsertionLine,
-                                          unsigned Columns,
+                                          unsigned NonGutterColumns,
                                           const SourceColumnMap &map) {
-  unsigned CaretColumns = CaretLine.size();
-  unsigned FixItColumns = llvm::sys::locale::columnWidth(FixItInsertionLine);
-  unsigned MaxColumns = std::max(static_cast<unsigned>(map.columns()),
-                                 std::max(CaretColumns, FixItColumns));
+  Columns CaretColumns = Columns(CaretLine.size());
+  Columns FixItColumns =
+      Columns(llvm::sys::locale::columnWidth(FixItInsertionLine));
+  unsigned MaxColumns =
+      std::max(map.columns().V, std::max(CaretColumns.V, FixItColumns.V));
----------------
Sirraide wrote:

```suggestion
  Columns MaxColumns = std::max({map.columns(), CaretColumns, FixItColumns});
```

https://github.com/llvm/llvm-project/pull/165541


More information about the cfe-commits mailing list