From 9f4f9cd3b6c8f78493d3c1c7c475a7098aebe58c Mon Sep 17 00:00:00 2001
From: HO-COOH <42881734+HO-COOH@users.noreply.github.com>
Date: Fri, 30 Apr 2021 18:43:47 +0800
Subject: Fix unexpected return tag on non-functions (#214)

---
 src/Lang/Cpp/CppDocGen.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/Lang')

diff --git a/src/Lang/Cpp/CppDocGen.ts b/src/Lang/Cpp/CppDocGen.ts
index bc9f09a..ace05c2 100644
--- a/src/Lang/Cpp/CppDocGen.ts
+++ b/src/Lang/Cpp/CppDocGen.ts
@@ -264,9 +264,6 @@ export class CppDocGen implements IDocGen {
     }
 
     protected generateReturnParams(): string[] {
-        if (this.cfg.Generic.includeTypeAtReturn === false) {
-            return [""];
-        }
 
         const params: string[] = [];
 
@@ -289,6 +286,13 @@ export class CppDocGen implements IDocGen {
             params.push(this.cfg.Generic.includeTypeAtReturn === true ? this.func.type.Yield() : "");
         } else if (voidReturnIndex === -1 && this.func.type.nodes.length > 0) {
             params.push(this.cfg.Generic.includeTypeAtReturn === true ? this.func.type.Yield() : "");
+        } else {
+            if (this.cfg.Generic.includeTypeAtReturn === false) {
+                return [];
+            }
+        }
+        if (this.cfg.Generic.includeTypeAtReturn === false) {
+            return [""];
         }
 
         return params;
-- 
cgit v1.2.3