bugfixes

Jolanrensen · Feb 1, 2023 · ceb3f75 · ceb3f75
1 parent 100dcb8
commit ceb3f75
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/...n/src/main/kotlin/nl/jolanrensen/docProcessor/defaultProcessors/IncludeArgDocProcessor.kt b/...n/src/main/kotlin/nl/jolanrensen/docProcessor/defaultProcessors/IncludeArgDocProcessor.kt
@@ -184,7 +184,8 @@ class IncludeArgDocProcessor : TagDocProcessor() {
 
                     tagWithContent
                 } else {
-                    "$content $extraContent"
+                    if (extraContent.isEmpty()) content
+                    else "$content $extraContent"
                 }
             }
         }

diff --git a/...ugin/src/main/kotlin/nl/jolanrensen/docProcessor/defaultProcessors/IncludeDocProcessor.kt b/...ugin/src/main/kotlin/nl/jolanrensen/docProcessor/defaultProcessors/IncludeDocProcessor.kt
@@ -70,7 +70,7 @@ class IncludeDocProcessor : TagDocProcessor() {
     private val tag = "include"
 
     // Regex to match [Aliased][ReferenceLinks].
-    private val aliasedLinkRegex = Regex("""(\[[^\[]*]\[)([^\[]*)(])""")
+    private val aliasedLinkRegex = Regex("""(\[[^\[\]]*]\[)([^\[\]]*)(])""")
 
     // Regex to match [ReferenceLinks].
     private val singleLinkRegex = Regex("""([^]]\[)([^\[\]]*)(]$|][^\[])""")
@@ -150,7 +150,11 @@ class IncludeDocProcessor : TagDocProcessor() {
         }
 
         var content: DocContent = queried.docContent
-            .removeSurrounding("\n") + " $extraContent"
+            .removeSurrounding("\n")
+
+        if (extraContent.isNotEmpty()) {
+            content = "$content $extraContent"
+        }
 
         // if the content contains links to other elements, we need to expand the path
         // providing the original name or alias as new alias.

diff --git a/.../src/main/kotlin/nl/jolanrensen/docProcessor/defaultProcessors/IncludeFileDocProcessor.kt b/.../src/main/kotlin/nl/jolanrensen/docProcessor/defaultProcessors/IncludeFileDocProcessor.kt
@@ -59,7 +59,10 @@ class IncludeFileDocProcessor : TagDocProcessor() {
                 .replace("*/", "&#42;&#47;")
         } else {
             content
-        } + " " + extraContent
+        }.let {
+            if (extraContent.isNotBlank()) "$it $extraContent"
+            else it
+        }
     }
 
     override fun processInnerTagWithContent(

diff --git a/...lugin/src/main/kotlin/nl/jolanrensen/docProcessor/defaultProcessors/SampleDocProcessor.kt b/...lugin/src/main/kotlin/nl/jolanrensen/docProcessor/defaultProcessors/SampleDocProcessor.kt
@@ -99,7 +99,8 @@ class SampleDocProcessor : TagDocProcessor() {
                     appendLine("```")
                 }
 
-                append(" $extraContent")
+                if (extraContent.isNotEmpty())
+                    append(" $extraContent")
             }
         } ?: error(
             "SampleDocProcessor ERROR: Sample not found: $samplePath. Called from $path. Attempted queries: [\n${