update markdown ref solution and add initial solution

config.json

@@ -945,9 +945,10 @@
       "topics": [
         "strings",
         "conditionals",
-        "pattern_matching"
+        "pattern_matching",
+        "refactoring"
       ],
-      "unlocked_by": "word-search",
+      "unlocked_by": "scrabble-score",
       "uuid": "cc18f2e5-4e36-47d6-aa60-8ca5ff54019a"
     },
     {

exercises/markdown/.meta/src/reference/java/Markdown.java

@@ -1,116 +1,96 @@
 class Markdown {
-
-    String parse(String markdown)
-    {
+    
+    String parse(String markdown) {
         String[] lines = markdown.split("\n");
         StringBuilder result = new StringBuilder();
         boolean activeList = false;
 
-        for (int i = 0; i < lines.length; i++)
-        {
+        for (int i = 0; i < lines.length; i++) {
             String lineResult = parseLine(lines[i]);
 
-            if(lineResult.matches(".*(<li>).*") && !activeList){
+            if (lineResult.matches("(<li>).*") && !activeList) {
                 activeList = true;
                 result.append("<ul>");
                 result.append(lineResult);
-            }
-            else if(!lineResult.matches(".*(<li>).*") && activeList){
+            } else if (!lineResult.matches("(<li>).*") && activeList) {
                 activeList = false;
                 result.append("</ul>");
                 result.append(lineResult);
-            }
-            else {
+            } else {
                 result.append(lineResult);
             }
         }
 
-        if(activeList){
+        if (activeList) {
             result.append("</ul>");
         }
 
         return result.toString();
     }
 
-    private String parseLine(String markdown)
-    {
+    private String parseLine(String markdown) {
         String result = parseHeader(markdown);
 
-        if (result == null)
-        {
+        if (result == null) {
             result = parseListItem(markdown);
         }
 
-        if (result == null)
-        {
+        if (result == null) {
             result = parseParagraph(markdown);
         }
 
         return result;
     }
 
-    private String parseHeader(String markdown)
-    {
+    private String parseHeader(String markdown) {
         int count = 0;
 
-        for (int i = 0; i < markdown.length(); i++)
-        {
-            if (markdown.charAt(i) == '#')
-            {
+        for (int i = 0; i < markdown.length(); i++) {
+            if (markdown.charAt(i) == '#') {
                 count++;
-            }
-            else
-            {
+            } else {
                 break;
             }
         }
 
-        if (count == 0)
-        {
+        if (count == 0) {
             return null;
         }
 
         return wrap(markdown.substring(count + 1), "h" + Integer.toString(count));
     }
 
-    private String parseListItem(String markdown)
-    {
-        if (markdown.startsWith("*"))
-        {
+    private String parseListItem(String markdown) {
+        if (markdown.startsWith("*")) {
             return wrap(parseText(markdown.substring(2)), "li");
         }
 
         return null;
     }
 
-    private String parseParagraph(String markdown)
-    {
+    private String parseParagraph(String markdown) {
         return wrap(parseText(markdown), "p");
     }
 
-    private String parseText(String markdown)
-    {
-        return parse_(parse__(markdown));
+    private String parseText(String markdown) {
+        return parseUnderscore(parseDoubleUnderscore(markdown));
     }
 
-    private String parse_(String markdown)
-    {
+    private String parseUnderscore(String markdown) {
         return parseViaRegex(markdown, "_", "em");
     }
 
-    private String parse__(String markdown)
-    {
+    private String parseDoubleUnderscore(String markdown) {
         return parseViaRegex(markdown, "__", "strong");
     }
 
-    private String parseViaRegex(String markdown, String delimiter, String tag)
-    {
+    private String parseViaRegex(String markdown, String delimiter, String tag) {
         String pattern = delimiter + "(.+)" + delimiter;
-        String replacement = "<" + tag + ">$1</" + tag + ">";
+        String replacement = wrap("$1", tag);
         return markdown.replaceAll(pattern, replacement);
     }
 
-    private String wrap(String text, String tag){
+    private String wrap(String text, String tag) {
         return "<" + tag + ">" + text + "</" + tag + ">";
     }
 }

exercises/markdown/src/main/java/Markdown.java

@@ -0,0 +1,83 @@
+class Markdown {
+  
+    String parse(String markdown) {
+
+        String[] lines = markdown.split("\n");
+
+        String result = "";
+
+        boolean activeList = false;
+
+        for (int i = 0; i < lines.length; i++) {
+
+            String theLine = parseHeader(lines[i]);
+          
+            if (theLine == null) {
+              theLine = parseListItem(lines[i]);
+            }
+    
+            if (theLine == null) 
+            {
+                theLine = parseParagraph(lines[i]);
+            }
+
+            if (theLine.matches("(<li>).*") && !theLine.matches("(<h).*") && !theLine.matches("(<p>).*") && !activeList) {
+                activeList = true;
+              result = result + "<ul>";
+                result = result + theLine;
+            } 
+            
+            else if (!theLine.matches("(<li>).*") && activeList) {
+                activeList = false;
+                result = result + "</ul>";
+                result = result + theLine;
+            } else {
+              result = result + theLine;
+            }
+        }
+
+        if (activeList) {
+            result = result + "</ul>";
+        }
+
+        return result;
+    }
+
+    private String parseHeader(String markdown) {
+        int count = 0;
+
+        for (int i = 0; i < markdown.length() && markdown.charAt(i) == '#'; i++) 
+        {
+            count++;
+        }
+
+        if (count == 0) { return null; }
+
+        return "<h" + Integer.toString(count) + ">" + markdown.substring(count + 1) + "</h" + Integer.toString(count)+ ">";
+    }
+
+    private String parseListItem(String markdown) {
+        if (markdown.startsWith("*")) {
+            String skipAsterisk = markdown.substring(2);
+            String listItemString = parseSomeSymbols(skipAsterisk);
+            return "<li>" + listItemString + "</li>";
+        }
+
+        return null;
+    }
+
+    private String parseParagraph(String markdown) {
+        return "<p>" + parseSomeSymbols(markdown) + "</p>";
+    }
+
+    private String parseSomeSymbols(String markdown) {
+
+        String lookingFor = "__(.+)__";
+        String update = "<strong>$1</strong>";
+        String workingOn = markdown.replaceAll(lookingFor, update);
+
+        lookingFor = "_(.+)_";
+        update = "<em>$1</em>";
+        return workingOn.replaceAll(lookingFor, update);
+    }
+}

exercises/markdown/src/test/java/MarkdownTest.java

@@ -45,7 +45,7 @@ public class MarkdownTest {
         String input = "This will _be_ __mixed__";
         String expected = "<p>This will <em>be</em> <strong>mixed</strong></p>";
 
-        assertEquals(expected, markdown.parse(input) );
+        assertEquals(expected, markdown.parse(input));
     }
 
     @Ignore("Remove to run test")
@@ -54,7 +54,7 @@ public class MarkdownTest {
         String input = "# This will be an h1";
         String expected = "<h1>This will be an h1</h1>";
 
-        assertEquals(expected, markdown.parse(input) );
+        assertEquals(expected, markdown.parse(input));
     }
 
     @Ignore("Remove to run test")
@@ -63,7 +63,7 @@ public class MarkdownTest {
         String input = "## This will be an h2";
         String expected = "<h2>This will be an h2</h2>";
 
-        assertEquals(expected, markdown.parse(input) );
+        assertEquals(expected, markdown.parse(input));
     }
 
     @Ignore("Remove to run test")
@@ -72,7 +72,7 @@ public class MarkdownTest {
         String input = "###### This will be an h6";
         String expected = "<h6>This will be an h6</h6>";
 
-        assertEquals(expected, markdown.parse(input) );
+        assertEquals(expected, markdown.parse(input));
     }
 
     @Ignore("Remove to run test")
@@ -81,7 +81,7 @@ public class MarkdownTest {
         String input = "* Item 1\n* Item 2";
         String expected = "<ul><li>Item 1</li><li>Item 2</li></ul>";
 
-        assertEquals(expected, markdown.parse(input) );
+        assertEquals(expected, markdown.parse(input));
     }
 
     @Ignore("Remove to run test")
@@ -90,6 +90,6 @@ public class MarkdownTest {
         String input = "# Header!\n* __Bold Item__\n* _Italic Item_";
         String expected = "<h1>Header!</h1><ul><li><strong>Bold Item</strong></li><li><em>Italic Item</em></li></ul>";
 
-        assertEquals(expected, markdown.parse(input) );
+        assertEquals(expected, markdown.parse(input));
     }
 }