Moved More Logic to Syntaxr

Schemer-MacOS/Schemer/Syntaxr.swift

@@ -12,7 +12,7 @@ import Cocoa
 class Syntaxr {
 
 	//for a given line (as a string), return a string formatter with proper highlighting
-	static func highlight(line:String) -> NSAttributedString {
+	static func highlightLine(_ line:String) -> NSAttributedString {
 		let result:NSMutableAttributedString = NSMutableAttributedString()
 		let semiColonLoc = line.range(of: ";")
 		if let scLoc = semiColonLoc {
@@ -30,4 +30,20 @@ class Syntaxr {
 		return result
 	}
 
+
+	//take all text from textview, seperate by line, and syntax highlight at the per line level
+	static func highlightAllText(_ text:String) -> NSAttributedString {
+		let lines = text.components(separatedBy: "\n")
+		let formattedText = NSMutableAttributedString()
+		for i in 0..<lines.count {
+			let line = lines[i]
+			let formattedLine = Syntaxr.highlightLine(line)
+			formattedText.append(formattedLine)
+			if (i != lines.count-1) { //append new line char, unless it's the last line
+				let aNewLine = NSAttributedString(string: "\n", attributes: CodeField.standardAtrributes())
+				formattedText.append(aNewLine)
+			}
+		}
+		return formattedText
+	}
 }

Schemer-MacOS/Schemer/ViewController.swift

@@ -130,19 +130,9 @@ class ViewController: NSViewController {
 
 	override func textStorageDidProcessEditing(_ notification: Notification) {
 		let textStorage = notification.object as! NSTextStorage
-		print(textStorage.string)
-		let lines = textStorage.string.components(separatedBy: "\n")
-		let allText = NSMutableAttributedString()
-		for i in 0..<lines.count {
-			let line = lines[i]
-			let formattedLine = Syntaxr.highlight(line:line)
-			allText.append(formattedLine)
-			if (i != lines.count-1) { //append new line char, unless it's the last line
-				let aNewLine = NSAttributedString(string: "\n", attributes: CodeField.standardAtrributes())
-				allText.append(aNewLine)
-			}
-		}
-		textStorage.setAttributedString(allText)
+		let allText = textStorage.string
+		let formattedText = Syntaxr.highlightAllText(allText)
+		textStorage.setAttributedString(formattedText)
 	}
 
 }