add languages to code blocks

EvergreenRegex.playground/Contents.swift

@@ -0,0 +1,16 @@
+import Cocoa
+
+extension String {
+    var fullRange: NSRange {
+        return NSRange(location: 0, length: self.count)
+    }
+}
+let codeWithClass = try! NSRegularExpression(pattern: "^```:[a-zA-Z]+$", options: [])
+
+let line = "```:swift"
+if let match = codeWithClass.firstMatch(in: line, range: line.fullRange) {
+    print(match)
+} else {
+    print("Cannot find a match")
+}
+

EvergreenRegex.playground/contents.xcplayground

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='5.0' target-platform='macos' buildActiveScheme='true' importAppTypes='true'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>

Sources/Evergreen/Evergreen+String.swift

@@ -21,7 +21,7 @@ extension String {
     /// - Returns: The new string with replacements
 
     func replaceAll(matching: NSRegularExpression, with template: String, options: NSRegularExpression.MatchingOptions = []) -> String {
-        return matching.stringByReplacingMatches(in: self, options: options, range: self.fullRange(), withTemplate: template)
+        return matching.stringByReplacingMatches(in: self, options: options, range: self.fullRange, withTemplate: template)
     }
 
     /// Replace first instance of `matching` in the string with `with`
@@ -41,7 +41,7 @@ extension String {
         if let r = range {
             matchedRange = r
         } else {
-            guard let match = matching.firstMatch(in: self, options: [], range: fullRange()) else {
+            guard let match = matching.firstMatch(in: self, options: [], range: fullRange) else {
                 return self
             }
             matchedRange = match.range
@@ -94,7 +94,7 @@ extension String {
     /// - Returns: True or false depending if there was a match or not
 
     func isMatching(_ match: NSRegularExpression, in givenRange: NSRange? = nil, options: NSRegularExpression.MatchingOptions = []) -> Bool {
-        let range = givenRange ?? fullRange()
+        let range = givenRange ?? fullRange
         if let _ = match.firstMatch(in: self, options: options, range: range) {
             return true
         }
@@ -113,7 +113,7 @@ extension String {
     /// - Returns: A new string with the characters replaced
 
     func stringFromMatch(_ regex: NSRegularExpression, in range: NSRange? = nil, options: NSRegularExpression.MatchingOptions = []) -> String {
-        let matchRange = range ?? fullRange()
+        let matchRange = range ?? fullRange
 
         guard let match = regex.firstMatch(in: self, options: options, range: matchRange) else {
             return ""
@@ -137,13 +137,13 @@ extension String {
     ///
     /// - Returns: NSRange from 0 to count of characters
 
-    func fullRange() -> NSRange {
+    var fullRange: NSRange {
         return NSRange(location: 0, length: self.count)
     }
 
     /// Insert a substring into a string, based on a regular expression match
     mutating func replaceRange(matching: NSRegularExpression, with: String, options: NSRegularExpression.MatchingOptions = [], range _range: NSRange? = nil) {
-        let range = _range ?? self.fullRange()
+        let range = _range ?? self.fullRange
         let _match = matching.firstMatch(in: self, options: options, range: range)
 
         guard let match = _match?.range else { return }

Sources/Evergreen/EvergreenProcessor.swift

@@ -78,6 +78,7 @@ public class EvergreenProcessor {
     let boldItalicMatch = try! NSRegularExpression(pattern: "\\*{3}[^\\*]+\\*{3}", options: [])
 
     let codeMatch = try! NSRegularExpression(pattern: "^```", options: [])
+    let codeWithClass = try! NSRegularExpression(pattern: "^```:[a-zA-Z]+$", options: [])
     let htmlMatch = try! NSRegularExpression(pattern: "<[\\/]?[^>]+>", options: [])
 
     // MARK: Content
@@ -120,7 +121,7 @@ public class EvergreenProcessor {
     }
 
     func linkParser(line: String, in givenRange: NSRange? = nil) -> (String, String, String?) {
-        let range = givenRange ?? line.fullRange()
+        let range = givenRange ?? line.fullRange
         let anchorText = line.stringFromMatch(altMatch, in: range).replaceSubstrings(["![", "[", "]"])
 
         let descText = line.stringFromMatch(descMatch, in: range).replaceSubstrings(["(", ")"])
@@ -139,7 +140,7 @@ public class EvergreenProcessor {
     func parseLinks(element: EvergreenElement) {
         var lineCopy = element.text
 
-        while let match = linkMatch.firstMatch(in: lineCopy, options: [], range: lineCopy.fullRange()) {
+        while let match = linkMatch.firstMatch(in: lineCopy, options: [], range: lineCopy.fullRange) {
             let (anchorText, href, altText) = linkParser(line: lineCopy, in: match.range)
 
             let identifier = UUID()
@@ -155,7 +156,7 @@ public class EvergreenProcessor {
     }
 
     func splitItalicMatch(element: EvergreenElement, in range: NSRange? = nil) -> EvergreenElement {
-        let matchRange = range ?? element.text.fullRange()
+        let matchRange = range ?? element.text.fullRange
 
         let text = element.text.stringFromMatch(italicMatch, in: matchRange).replaceSubstrings(["*"]).trim()
         let italicElement = EvergreenElement(elementType: "i", text: text)
@@ -169,7 +170,7 @@ public class EvergreenProcessor {
     }
 
     func splitBoldMatch(element: EvergreenElement, in range: NSRange? = nil) -> EvergreenElement {
-        let matchRange = range ?? element.text.fullRange()
+        let matchRange = range ?? element.text.fullRange
 
         let match = element.text.stringFromMatch(boldMatch, in: matchRange)
         let text = match.replaceSubstrings(["**"]).trim()
@@ -183,7 +184,7 @@ public class EvergreenProcessor {
     }
 
     func splitDoubleMatch(element: EvergreenElement) -> EvergreenElement {
-        let text = element.text.stringFromMatch(boldItalicMatch, in: element.text.fullRange()).replaceSubstrings(["***"]).trim()
+        let text = element.text.stringFromMatch(boldItalicMatch, in: element.text.fullRange).replaceSubstrings(["***"]).trim()
         let identifier = UUID().uuidString
 
         let italicElement = EvergreenElement(elementType: "i", text: text)
@@ -214,7 +215,7 @@ public class EvergreenProcessor {
     func parseHeader(_ line: String) -> EvergreenElement {
         let headerMatch = try! NSRegularExpression(pattern: "^#+", options: [])
 
-        let matches = headerMatch.matches(in: line, options: [], range: line.fullRange())
+        let matches = headerMatch.matches(in: line, options: [], range: line.fullRange)
         let match = matches.first!
 
         let originalText = line.replaceAll(matching: headerMatch, with: "").trim()
@@ -249,7 +250,7 @@ public class EvergreenProcessor {
         return textElement
     }
 
-    // MARK: <img /> Element
+    // MARK: <img> Element
     func parseImageElement(_ line: String) -> EvergreenElement {
         let (alt, src, title) = linkParser(line: line)
         let element = EvergreenElement(elementType: "img")
@@ -307,7 +308,7 @@ public class EvergreenProcessor {
         let indentRegex = try! NSRegularExpression(pattern: " +", options: [])
 
         if line.starts(with: " ") && inList {
-            let indentLength = indentRegex.firstMatch(in: line, options: [], range: line.fullRange())!.range.length
+            let indentLength = indentRegex.firstMatch(in: line, options: [], range: line.fullRange)!.range.length
 
             if currentListIndentLength < indentLength {
                 // We are indenting more than before, create a sub list
@@ -358,7 +359,7 @@ public class EvergreenProcessor {
             currentListType = listType
             inList = true
             if line.starts(with: " ") {
-                let indentLength = indentRegex.firstMatch(in: line, options: [], range: line.fullRange())!.range.length
+                let indentLength = indentRegex.firstMatch(in: line, options: [], range: line.fullRange)!.range.length
                 currentListIndentLength = indentLength
             }
 
@@ -421,7 +422,7 @@ public class EvergreenProcessor {
     // MARK: <blockquote> Element
     func parseBlockquoteElement(_ line: String) {
         let quoteRegex = try! NSRegularExpression(pattern: "^>+", options: [])
-        let quoteIndent = quoteRegex.firstMatch(in: line, options: [], range: line.fullRange())!.range.length
+        let quoteIndent = quoteRegex.firstMatch(in: line, options: [], range: line.fullRange)!.range.length
 
         let trimmed = line.removeAll(matching: blockMatch).trim()
 
@@ -589,7 +590,7 @@ public class EvergreenProcessor {
         if line.isMatching(htmlMatch) {
             let open = try! NSRegularExpression(pattern: "<", options: [])
             let close = try! NSRegularExpression(pattern: ">", options: [])
-            while let match = htmlMatch.firstMatch(in: escaped, options: [], range: escaped.fullRange()) {
+            while let match = htmlMatch.firstMatch(in: escaped, options: [], range: escaped.fullRange) {
                 escaped = escaped.replaceFirst(matching: close, with: "&gt;", in: match.range, options: [])
                 escaped = escaped.replaceFirst(matching: open, with: "&lt;", in: match.range, options: [])
             }
@@ -648,7 +649,7 @@ public class EvergreenProcessor {
     }
 
     func parseElement(_ line: String)  {
-        let range = line.fullRange()
+        let range = line.fullRange
         let trimmed = line.trim()
 
         if line.isMatching(horizontalMatch, in: range) {
@@ -673,6 +674,15 @@ public class EvergreenProcessor {
 
                 let pre = EvergreenElement(elementType: "pre")
                 pre.children = [currentCode!]
+
+                if let match = codeWithClass.firstMatch(in: trimmed, range: trimmed.fullRange) {
+                    let classString = String(trimmed[Range(match.range, in: trimmed)!])
+                    if let language = classString.components(separatedBy: [":"]).last {
+                        // Prism.js uses language-xxxxx to determine which language to use
+                        pre.classes.append("language-\(language)")
+                    }
+                }
+
                 addToElements(pre)
             }
         } else if trimmed.count > 0 {

Tests/EvergreenTests/EvergreenProcessorTests.swift

@@ -599,7 +599,7 @@ final class EvergreenProcessorTests: XCTestCase {
 
     func testCodeProcessed() {
         let lines: Array<String> = [
-            "```",
+            "```:swift",
             "function hello() {",
             "  return \"Hello World!\"",
             "",
@@ -612,7 +612,8 @@ final class EvergreenProcessorTests: XCTestCase {
 
         let pre = elements.first!
         XCTAssertEqual(pre.elementType, "pre")
-
+        XCTAssert(pre.classes.contains("language-swift"))
+
         let code = pre.children.first!
         XCTAssertEqual(code.elementType, "code")
         XCTAssertEqual(code.text, "function hello() {\n  return \"Hello World!\"\n\n}")

Tests/EvergreenTests/StringExtensionTests.swift

@@ -34,7 +34,7 @@ final class StringExtensionTests: XCTestCase {
         let str = "replace replace none replace"
         let match = try! NSRegularExpression(pattern: "replace", options: [])
 
-        let range = match.firstMatch(in: str, options: [], range: str.fullRange())?.range
+        let range = match.firstMatch(in: str, options: [], range: str.fullRange)?.range
 
         let replaced = str.replaceFirst(matching: match, with: "_", in: range)
 
@@ -46,7 +46,7 @@ final class StringExtensionTests: XCTestCase {
 
         let match = try! NSRegularExpression(pattern: "replace", options: [])
 
-        let range = match.firstMatch(in: str, options: [], range: str.fullRange())?.range
+        let range = match.firstMatch(in: str, options: [], range: str.fullRange)?.range
 
         let badMatch = try! NSRegularExpression(pattern: "none", options: [])
 
@@ -60,7 +60,7 @@ final class StringExtensionTests: XCTestCase {
 
         let match = try! NSRegularExpression(pattern: "replace", options: [])
 
-        let range = match.firstMatch(in: str, options: [], range: str.fullRange())?.range
+        let range = match.firstMatch(in: str, options: [], range: str.fullRange)?.range
 
         let badMatch = try! NSRegularExpression(pattern: "none", options: [])