Merge pull request #461 from andreasfertig/fixIssue456

Fixed #456: Correct replacement of a `VarDecl` with attributes.
andreasfertig · May 1, 2022 · 745269a · 745269a
2 parents da5727c + 374b703
commit 745269a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/GlobalVariableHandler.cpp b/GlobalVariableHandler.cpp
@@ -65,7 +65,18 @@ void GlobalVariableHandler::run(const MatchFinder::MatchResult& result)
     if(const auto* matchedDecl = result.Nodes.getNodeAs<VarDecl>("varDecl")) {
         OutputFormatHelper outputFormatHelper{};
 
-        const auto sr = GetSourceRangeAfterSemi(matchedDecl->getSourceRange(), result, RequireSemi::Yes);
+        // Take a preceding attribute into account
+        const auto sr = [&] {
+            auto tmpSr = GetSourceRangeAfterSemi(matchedDecl->getSourceRange(), result, RequireSemi::Yes);
+
+            const auto&    attrs = matchedDecl->attrs();
+            SourceLocation start = tmpSr.getBegin();
+
+            std::for_each(
+                attrs.begin(), attrs.end(), [&](const auto* attr) { start = std::min(attr->getLocation(), start); });
+
+            return SourceRange{start, tmpSr.getEnd()};
+        }();
 
         // Check whether we already have rewritten this location. If so, insert the text after the location. This is the
         // case for:

diff --git a/tests/AlignAsTest.expect b/tests/AlignAsTest.expect
@@ -5,7 +5,7 @@ struct alignas(16) AlignedStruct
 
 
 
-alignas(128) alignas(128) char alignedArray[128];
+alignas(128) char alignedArray[128];
 
 
 template <typename... Ts>