Merge pull request #366 from andreasfertig/fixIssue365

Fixed #365: `CXXDeductionGuideDecl` appeared in the middle of a template

TemplateHandler.cpp

@@ -112,9 +112,21 @@ void TemplateHandler::run(const MatchFinder::MatchResult& result)
             return;
         }
 
+        // Figure out whether we are looking at a CXXDeductionGuideDecl. If so, ensure that the deduction guide comes
+        // after the primary template declaration.
+        const Decl* endLocDecl = functionDecl;
+        if(const auto* deductionGuide = dyn_cast_or_null<CXXDeductionGuideDecl>(functionDecl)) {
+            const auto* deducedTemplate = deductionGuide->getDeducedTemplate();
+
+            // deduction guide must follow after the template declaration
+            if(deducedTemplate->getEndLoc() > deductionGuide->getEndLoc()) {
+                endLocDecl = deducedTemplate;
+            }
+        }
+
         OutputFormatHelper outputFormatHelper = InsertInstantiatedTemplate(functionDecl);
         const auto         endOfCond          = FindLocationAfterRBrace(
-            GetEndLoc(functionDecl),
+            GetEndLoc(endLocDecl),
             result,
             isa<CXXDeductionGuideDecl>(
                 functionDecl));  // if we lift the "not getBody()" restriction above we need to take this in account

tests/Issue365.cpp

@@ -0,0 +1,13 @@
+template<long Len = 128, long BlockSize = 128, class T = wchar_t>
+class String {
+public:
+  bool Format(const wchar_t FormatStr[], ...) { return true; }
+};
+
+void FTest() {
+  double d{};
+
+  String s;
+  s.Format(L"%i", d);
+}
+

tests/Issue365.expect

@@ -0,0 +1,39 @@
+template<long Len = 128, long BlockSize = 128, class T = wchar_t>
+class String {
+public:
+  bool Format(const wchar_t FormatStr[], ...) { return true; }
+};
+
+/* First instantiated from: Issue365.cpp:10 */
+#ifdef INSIGHTS_USE_TEMPLATE
+template<>
+class String<128, 128, wchar_t>
+{
+
+  public: 
+  inline bool Format(const wchar_t * FormatStr, ...)
+  {
+    return true;
+  }
+
+  // inline constexpr String() noexcept = default;
+};
+
+#endif
+
+
+
+/* First instantiated from: Issue365.cpp:10 */
+#ifdef INSIGHTS_USE_TEMPLATE
+template<>
+String -> String<128, 128, wchar_t>;
+#endif
+
+void FTest()
+{
+  double d = {};
+  String<128, 128, wchar_t> s = String<128, 128, wchar_t>();
+  s.Format(L"%i", d);
+}
+
+