adding some tests of the editor

Author: grantnelson-wf

playground/internal/editor/codeBox_test.go

@@ -1,6 +1,9 @@
 package editor
 
-import "strings"
+import (
+	"strings"
+	"unicode"
+)
 
 type CodeBoxWrapper interface {
 	Code() string
@@ -11,15 +14,15 @@ type CodeBoxWrapper interface {
 	SetSelection(start, end int, code string)
 }
 
-type codeEditor struct {
-	wrapper CodeBoxWrapper
-}
-
 func ProcessKeyDown(wrapper CodeBoxWrapper, key string, shift, ctrl bool) bool {
-	ce := &codeEditor{wrapper: wrapper}
+	ce := &codeEditor{CodeBoxWrapper: wrapper}
 	return ce.handleKeyDown(key, shift, ctrl)
 }
 
+type codeEditor struct {
+	CodeBoxWrapper
+}
+
 func (ce *codeEditor) handleKeyDown(key string, shift, ctrl bool) bool {
 	switch key {
 	case `Tab`:
@@ -45,8 +48,8 @@ func (ce *codeEditor) handleKeyDown(key string, shift, ctrl bool) bool {
 	case `[`:
 		return ce.insertPair(ctrl, `[`, `]`)
 	case `Escape`:
-		ce.wrapper.EmitEscape()
-		return false
+		ce.EmitEscape()
+		return true
 	default:
 		return false
 	}
@@ -60,7 +63,7 @@ func (ce *codeEditor) handleTab(shift, ctrl bool) bool {
 		return false
 	}
 
-	start, end := ce.wrapper.GetSelection()
+	start, end := ce.GetSelection()
 	if !shift && start == end {
 		// Insert tab character at caret.
 		ce.insertAtSelection("\t", ``, false)
@@ -86,13 +89,13 @@ func (ce *codeEditor) handleMultilineComment(shift, ctrl bool) bool {
 		return false
 	}
 
-	start, end := ce.wrapper.GetSelection()
+	start, end := ce.GetSelection()
 	if start != end {
 		// If a selection, just prerform default behavior.
 		return false
 	}
 
-	if start <= 0 || ce.wrapper.Code()[start-1] != '/' {
+	if start <= 0 || ce.Code()[start-1] != '/' {
 		// Not preceded by '/', allow default behavior.
 		return false
 	}
@@ -109,8 +112,8 @@ func (ce *codeEditor) handleNewline(shift, ctrl bool) bool {
 		return false
 	}
 
-	code := ce.wrapper.Code()
-	start, end := ce.wrapper.GetSelection()
+	code := ce.Code()
+	start, end := ce.GetSelection()
 	before := "\n" + ce.indentAt(start)
 	after := ``
 
@@ -142,7 +145,7 @@ func (ce *codeEditor) handleSave(shift, ctrl bool) bool {
 		return false
 	}
 
-	ce.wrapper.EmitSave()
+	ce.EmitSave()
 	return true
 }
 
@@ -153,57 +156,117 @@ func (ce *codeEditor) handleCommentToggle(shift, ctrl bool) bool {
 		return false
 	}
 
+	const commentPrefix = `// `
+
 	startLine, endLine := ce.getSelectedLines()
 	leastIndent := -1
+	nonBlankLineCount := 0
 	ce.foreachLine(startLine, endLine, func(line string, start, end int) bool {
-		if trimmed := strings.TrimSpace(line); trimmed != `` {
+		if trimmed := trimLeftSpace(line); trimmed != `` {
 			indent := len(line) - len(trimmed)
 			if leastIndent < 0 || indent < leastIndent {
 				leastIndent = indent
 			}
+			nonBlankLineCount++
 		}
 		return true
 	})
 
+	if nonBlankLineCount <= 0 {
+		// No non-blank lines, nothing to comment/uncomment.
+		return true
+	}
+
 	containsUncommentedLine := false
 	ce.foreachLine(startLine, endLine, func(line string, start, end int) bool {
 		trimmed := strings.TrimSpace(line)
-		if trimmed != `` && !strings.HasPrefix(trimmed, `//`) {
+		if trimmed != `` && !strings.HasPrefix(trimmed, commentPrefix) {
 			containsUncommentedLine = true
 		}
 		return true
 	})
 
 	if containsUncommentedLine {
-		// Comment the selected lines.
-		// TODO(grantnelson-wf): Implement
-		println("TODO: Handle commenting selected lines")
+		// Comment the selected lines including any commented lines.
+		code := ce.Code()[:startLine]
+		ce.foreachLine(startLine, endLine, func(line string, start, end int) bool {
+			if line == "\n" || strings.TrimSpace(line) == `` {
+				code += line // Empty line, just add as-is.
+				return true
+			}
+			code += line[:leastIndent] + commentPrefix + line[leastIndent:]
+			return true
+		})
+		code += ce.Code()[endLine:]
+
+		start, end := ce.GetSelection()
+		// TODO(grantnelson-wf): Handle when the end or start ends up before the comment prefix.
+		newStart := start + len(commentPrefix)
+		newEnd := end + len(commentPrefix)*nonBlankLineCount
+
+		ce.SetCode(code)
+		ce.SetSelection(newStart, newEnd, code)
+		return true
 	}
 
-	// TODO(grantnelson-wf): Implement
-	println("TODO: Handle uncommenting selected lines")
+	// Uncomment any line that starts with the comment prefix (and preceding whitespace).
+	code := ce.Code()[:startLine]
+	ce.foreachLine(startLine, endLine, func(line string, start, end int) bool {
+		if trimmed := trimLeftSpace(line); trimmed != `` {
+			if index := strings.Index(line, commentPrefix); index >= 0 {
+				code += line[:index] + line[index+len(commentPrefix):]
+				return true
+			}
+		}
+		code += line // Leave line as is
+		return true
+	})
+	code += ce.Code()[endLine:]
+
+	start, end := ce.GetSelection()
+	// TODO(grantnelson-wf): Handle when the end or start ends up before the comment prefix.
+	newStart := start - len(commentPrefix)
+	newEnd := end - len(commentPrefix)*nonBlankLineCount
+
+	ce.SetCode(code)
+	ce.SetSelection(newStart, newEnd, code)
 	return true
 }
 
+// getSelectedLines returns the start and end character indices of that
+// include the start of the selection and the end of the selection.
+// The returned start should be at the beginning of the line after the "\n"
+// or at the front of all the code.
+// The returned end should be after the "\n" after the selection
+// or at the end of all the code.
 func (ce *codeEditor) getSelectedLines() (int, int) {
-	code := ce.wrapper.Code()
-	start, stop := ce.wrapper.GetSelection()
+	code := ce.Code()
+	codeLen := len(code)
+	start, end := ce.GetSelection()
 	startLine := 0
-	if start > 0 && start <= len(code) {
+	if start >= 0 && start <= codeLen {
 		startLine = strings.LastIndex(code[:start], "\n") + 1
+		if startLine < 0 {
+			startLine = 0
+		}
 	}
-	endLine := len(code)
-	if stop > 0 && stop <= len(code) {
-		endLine = strings.Index(code[stop:], "\n")
+	endLine := codeLen
+	if end >= 0 && end <= codeLen {
+		endLine = strings.Index(code[end:], "\n")
+		if endLine < 0 {
+			endLine = codeLen
+		} else {
+			endLine += end + 1
+		}
 	}
 	return startLine, endLine
 }
 
 func (ce *codeEditor) foreachLine(start, end int, yield func(line string, start, end int) bool) bool {
-	code := ce.wrapper.Code()
+	code := ce.Code()
 	for i := start; i < end; {
-		lineEnd := strings.Index(code[i:end], "\n")
-		if lineEnd < 0 {
+		lineEnd := strings.Index(code[i:end], "\n") + 1
+		if lineEnd <= 0 {
 			lineEnd = end
 		} else {
 			lineEnd += i
@@ -212,7 +275,7 @@ func (ce *codeEditor) foreachLine(start, end int, yield func(line string, start,
 		if !yield(line, i, lineEnd) {
 			return false
 		}
-		i = lineEnd + 1
+		i = lineEnd
 	}
 	return true
 }
@@ -228,8 +291,8 @@ func (ce *codeEditor) insertPair(ctrl bool, before, after string) bool {
 }
 
 func (ce *codeEditor) insertAtSelection(before, after string, keepSelection bool) {
-	code := ce.wrapper.Code()
-	start, end := ce.wrapper.GetSelection()
+	code := ce.Code()
+	start, end := ce.GetSelection()
 
 	var head, tail, selected string
 	if start > 0 {
@@ -246,12 +309,12 @@ func (ce *codeEditor) insertAtSelection(before, after string, keepSelection bool
 	newStart := start + len(before)
 	newEnd := newStart + len(selected)
 
-	ce.wrapper.SetCode(code)
-	ce.wrapper.SetSelection(newStart, newEnd, code)
+	ce.SetCode(code)
+	ce.SetSelection(newStart, newEnd, code)
 }
 
 func (ce *codeEditor) indentAt(start int) string {
-	code := ce.wrapper.Code()
+	code := ce.Code()
 	if start <= 0 || start > len(code) {
 		return ``
 	}
@@ -272,7 +335,7 @@ func (ce *codeEditor) indentAt(start int) string {
 // Currently this does not account for braces inside strings or comments.
 // It returns -1 if no matching opening brace is found.
 func (ce *codeEditor) findMatchingOpeningBrace(caret int) int {
-	code := ce.wrapper.Code()
+	code := ce.Code()
 	if caret <= 0 || caret > len(code) {
 		return -1
 	}
@@ -305,3 +368,7 @@ func (ce *codeEditor) findMatchingOpeningBrace(caret int) int {
 	}
 	return -1
 }
+
+func trimLeftSpace(s string) string {
+	return strings.TrimLeftFunc(s, unicode.IsSpace)
+}