Fallback to highlightAuto if highlighting fails

Same as #96 but without the CSS changes.
Some change in 2.2.0 made this issue resurface.

Author: NachoSoto

Pod/Classes/Highlightr.swift

@@ -24,7 +24,7 @@ open class Highlightr
             themeChanged?(theme)
         }
     }
-    
+
     /// This block will be called every time the theme changes.
     open var themeChanged : ((Theme) -> Void)?
 
@@ -39,7 +39,7 @@ open class Highlightr
     private let spanStartClose = "\">"
     private let spanEnd = "/span>"
     private let htmlEscape = try! NSRegularExpression(pattern: "&#?[a-zA-Z0-9]+?;", options: .caseInsensitive)
-    
+
     /**
      Default init method.
 
@@ -62,25 +62,25 @@ open class Highlightr
         {
             return nil
         }
-        
+
         let hgJs = try! String.init(contentsOfFile: hgPath)
         let value = jsContext.evaluateScript(hgJs)
         guard let hljs = jsContext.objectForKeyedSubscript("hljs") else { return nil }
 
         self.hljs = hljs
-        
+
         guard setTheme(to: "pojoaque") else
         {
             return nil
         }
-        
+
     }
-    
+
     /**
      Set the theme to use for highlighting.
-     
+
      - parameter to: Theme name
-     
+
      - returns: true if it was possible to set the given theme, false otherwise
      */
     @discardableResult
@@ -93,27 +93,31 @@ open class Highlightr
         let themeString = try! String.init(contentsOfFile: defTheme)
         theme =  Theme(themeString: themeString)
 
-        
+
         return true
     }
-    
+
     /**
      Takes a String and returns a NSAttributedString with the given language highlighted.
-     
+
      - parameter code:           Code to highlight.
      - parameter languageName:   Language name or alias. Set to `nil` to use auto detection.
      - parameter fastRender:     Defaults to true - When *true* will use the custom made html parser rather than Apple's solution.
-     
+
      - returns: NSAttributedString with the detected code highlighted.
      */
     open func highlight(_ code: String, as languageName: String? = nil, fastRender: Bool = true) -> NSAttributedString?
     {
         let ret: JSValue?
         if let languageName = languageName
         {
-            ret = hljs.invokeMethod("highlight", withArguments: [code, ["language": languageName, "ignoreIllegals": ignoreIllegals]])
-
-
+            let result: JSValue = hljs.invokeMethod("highlight", withArguments: [languageName, code, ignoreIllegals])
+			if result.isUndefined {
+				// If highlighting failed, use highlightAuto
+				ret = hljs.invokeMethod("highlightAuto", withArguments: [code])
+			} else {
+				ret = result
+			}
         }else
         {
             // language auto detection
@@ -124,7 +128,7 @@ open class Highlightr
         {
             return nil
         }
-        
+
         var returnString : NSAttributedString?
         if(fastRender)
         {
@@ -136,20 +140,20 @@ open class Highlightr
              .documentType: NSAttributedString.DocumentType.html,
              .characterEncoding: String.Encoding.utf8.rawValue
              ]
-            
+
             let data = string.data(using: String.Encoding.utf8)!
             safeMainSync
             {
                 returnString = try? NSMutableAttributedString(data:data, options: opt, documentAttributes:nil)
             }
         }
-        
+
         return returnString
     }
-    
+
     /**
      Returns a list of all the available themes.
-     
+
      - returns: Array of Strings
      */
     open func availableThemes() -> [String]
@@ -159,21 +163,21 @@ open class Highlightr
         for path in paths {
             result.append(path.lastPathComponent.replacingOccurrences(of: ".min.css", with: ""))
         }
-        
+
         return result
     }
-    
+
     /**
      Returns a list of all supported languages.
-     
+
      - returns: Array of Strings
      */
     open func supportedLanguages() -> [String]
     {
         let res = hljs.invokeMethod("listLanguages", withArguments: [])
         return res!.toArray() as! [String]
     }
-    
+
     /**
      Execute the provided block in the main thread synchronously.
      */
@@ -187,15 +191,15 @@ open class Highlightr
             DispatchQueue.main.sync { block() }
         }
     }
-    
+
     private func processHTMLString(_ string: String) -> NSAttributedString?
     {
         let scanner = Scanner(string: string)
         scanner.charactersToBeSkipped = nil
         var scannedString: NSString?
         let resultString = NSMutableAttributedString(string: "")
         var propStack = ["hljs"]
-        
+
         while !scanner.isAtEnd
         {
             var ended = false
@@ -206,7 +210,7 @@ open class Highlightr
                     ended = true
                 }
             }
-            
+
             if scannedString != nil && scannedString!.length > 0 {
                 let attrScannedString = theme.applyStyleToString(scannedString! as String, styleList: propStack)
                 resultString.append(attrScannedString)
@@ -215,9 +219,9 @@ open class Highlightr
                     continue
                 }
             }
-            
+
             scanner.scanLocation += 1
-            
+
             let string = scanner.string as NSString
             let nextChar = string.substring(with: NSMakeRange(scanner.scanLocation, 1))
             if(nextChar == "s")
@@ -237,10 +241,10 @@ open class Highlightr
                 resultString.append(attrScannedString)
                 scanner.scanLocation += 1
             }
-            
+
             scannedString = nil
         }
-        
+
         let results = htmlEscape.matches(in: resultString.string,
                                                options: [.reportCompletion],
                                                range: NSMakeRange(0, resultString.length))
@@ -254,11 +258,11 @@ open class Highlightr
                 resultString.replaceCharacters(in: fixedRange, with: String(decodedEntity))
                 locOffset += result.range.length-1;
             }
-            
+
 
         }
 
         return resultString
     }
-    
+
 }