From 74c311d68ff2596f2b07e51465741cf6d076a860 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 11 May 2023 14:16:57 +0200
Subject: [PATCH] ClangFormat: column of Position is 0-based

Amends 5b0c3258bb56fb4de71c28340857761641fe9aa7
Amends e9cd4dd4392a7f82f41d9ca1af7e030b532d756d
Amends a631a0441e011d0c28f7a5dbf7810c826252f5cf

Change-Id: I9dd542dfdf7936bdaf1fb05152228aff3895bccf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/clangformat/clangformatbaseindenter.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp
index d65053a9669..64d7d4a4905 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -378,14 +378,13 @@ Utils::Text::Replacements utf16Replacements(const QTextDocument *doc,
         const QString bufferLineText
             = Utils::Text::utf16LineTextInUtf8Buffer(utf8Buffer,
                                                      static_cast<int>(replacement.getOffset()));
-        if (isInsideDummyTextInLine(lineText, bufferLineText, lineColUtf16.column))
+        if (isInsideDummyTextInLine(lineText, bufferLineText, lineColUtf16.column + 1))
             continue;
 
-        lineColUtf16.column = std::min(lineColUtf16.column, int(lineText.length()) + 1);
-
+        lineColUtf16.column = std::min(lineColUtf16.column, int(lineText.length()));
         const int utf16Offset = Utils::Text::positionInText(doc,
                                                             lineColUtf16.line,
-                                                            lineColUtf16.column);
+                                                            lineColUtf16.column + 1);
         const int utf16Length = QString::fromUtf8(
                                     utf8Buffer.mid(static_cast<int>(replacement.getOffset()),
                                                    static_cast<int>(replacement.getLength())))