Fix: Code Blocks with no immediate text (#23)

See test `CodeRulesTest.noLanguageBlocked`
discord · Nov 11, 2020 · f3c5142 · f3c5142
1 parent f6a1758
commit f3c5142
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/simpleast-core/build.gradle b/simpleast-core/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 28
-        versionName "2.1.2"
+        versionName "2.1.3"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/simpleast-core/src/main/java/com/discord/simpleast/code/CodeRules.kt b/simpleast-core/src/main/java/com/discord/simpleast/code/CodeRules.kt
@@ -25,7 +25,7 @@ object CodeRules {
    * Examples:
    * inlined ```test```
    * inlined ```kt language code blocks need newline```
-   * inlined block start ```kt
+   * inlined block start ```
    * fun test()
    * ```
    *
@@ -38,7 +38,7 @@ object CodeRules {
    * ```
    */
   val PATTERN_CODE_BLOCK: Pattern =
-      Pattern.compile("""^```(?:([\w+\-.]+?)(\s*\n))?([^\n].*?)\n*```""", Pattern.DOTALL)
+      Pattern.compile("""^```(?:([\w+\-.]+?)?(\s*\n))?([^\n].*?)\n*```""", Pattern.DOTALL)
 
   val PATTERN_CODE_INLINE: Pattern =
       Pattern.compile("""^`(?:\s*)([^\n].*?)\n*`""", Pattern.DOTALL)

diff --git a/simpleast-core/src/test/java/com/discord/simpleast/code/CodeRulesTest.kt b/simpleast-core/src/test/java/com/discord/simpleast/code/CodeRulesTest.kt
@@ -43,6 +43,17 @@ class CodeRulesTest {
     ast.assertNodeContents<CodeNode<*>>("code", "spaces  ", "some text")
   }
 
+  @Test
+  fun noLanguageBlocked() {
+    val ast = parser.parse("""
+      Sample: ```
+      **block text**
+      ```
+    """.trimIndent(), TestState())
+
+    ast.assertNodeContents<CodeNode<*>>("**block text**")
+  }
+
   @Test
   fun commentsRust() {
     val ast = parser.parse("""