From a740c3f1f940bab1e68cd7df284f6172fd8d5abb Mon Sep 17 00:00:00 2001
From: Manuel Hentschel <53863351+ManuelHentschel@users.noreply.github.com>
Date: Thu, 28 Oct 2021 15:33:31 +0200
Subject: [PATCH 1/3] Add support for indented Roxygen

---
 src/extension.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/extension.ts b/src/extension.ts
index 414ffa2a1..6bb44f2fc 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -157,7 +157,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
             {
                 // Automatically continue roxygen comments: #'
                 action: { indentAction: vscode.IndentAction.None, appendText: '#\' ' },
-                beforeText: /^#'.*/,
+                beforeText: /^\s*#'.*/,
             },
         ],
         wordPattern,

From 9dbd6b9b3f9e4d74f599dc126176982fc51b678d Mon Sep 17 00:00:00 2001
From: Manuel Hentschel <53863351+ManuelHentschel@users.noreply.github.com>
Date: Thu, 28 Oct 2021 16:15:01 +0200
Subject: [PATCH 2/3] Exit roxygen after 2 empty lines

---
 src/extension.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/extension.ts b/src/extension.ts
index 6bb44f2fc..e146d95ba 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -157,7 +157,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
             {
                 // Automatically continue roxygen comments: #'
                 action: { indentAction: vscode.IndentAction.None, appendText: '#\' ' },
-                beforeText: /^\s*#'.*/,
+                beforeText: /^\s*#'\s*[^\s]/, // matches a non-empty roxygen line
+            },
+            {
+                // Automatically continue roxygen comments: #'
+                action: { indentAction: vscode.IndentAction.None, appendText: '#\' ' },
+                beforeText: /^\s*#'/, // matches any roxygen comment line, even an empty one
+                previousLineText: /^\s*([^#].*|#[^'].*|#'\s*[^\s].*|)$/, // matches everything but an empty roxygen line
             },
         ],
         wordPattern,

From 3f86f063950d31cbc228e71f16c6f0caa464b133 Mon Sep 17 00:00:00 2001
From: Manuel Hentschel <53863351+ManuelHentschel@users.noreply.github.com>
Date: Thu, 28 Oct 2021 16:19:21 +0200
Subject: [PATCH 3/3] Fix regex

---
 src/extension.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/extension.ts b/src/extension.ts
index e146d95ba..fe941b584 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -163,7 +163,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
                 // Automatically continue roxygen comments: #'
                 action: { indentAction: vscode.IndentAction.None, appendText: '#\' ' },
                 beforeText: /^\s*#'/, // matches any roxygen comment line, even an empty one
-                previousLineText: /^\s*([^#].*|#[^'].*|#'\s*[^\s].*|)$/, // matches everything but an empty roxygen line
+                previousLineText: /^\s*([^#\s].*|#[^'\s].*|#'\s*[^\s].*|)$/, // matches everything but an empty roxygen line
             },
         ],
         wordPattern,