Basic search
All checks were successful
timw4mail/gilo/pipeline/head This commit looks good

This commit is contained in:
Timothy Warren 2021-04-06 10:59:24 -04:00
parent 3672c5c3e9
commit 1d73869db0
4 changed files with 63 additions and 18 deletions

View File

@ -29,7 +29,7 @@ func main() {
e.Open(os.Args[1]) e.Open(os.Args[1])
} }
e.SetStatusMessage("HELP: Ctrl-S = save | Ctrl-Q = quit") e.SetStatusMessage("HELP: Ctrl-S = save | Ctrl-Q = quit | Ctrl-F = find")
// The input loop // The input loop
for { for {

View File

@ -34,6 +34,10 @@ func (r *Row) Render(at *gilo.Point) string {
return string(r.render[at.X:]) return string(r.render[at.X:])
} }
func (r *Row) Search(query string) int {
return strings.Index(string(r.render), query)
}
func (r *Row) insertRune(ch rune, at int) { func (r *Row) insertRune(ch rune, at int) {
// If insertion index is invalid, just // If insertion index is invalid, just
// append the rune to the end of the array // append the rune to the end of the array
@ -114,3 +118,22 @@ func (r *Row) CursorXToRenderX(cursorX int) (renderX int) {
return renderX return renderX
} }
func (r *Row) RenderXtoCursorX(renderX int) (cursorX int) {
currentRenderX := 0
cursorX = 0
for cursorX = 0; cursorX < r.Size(); cursorX++ {
if r.chars[cursorX] == '\t' {
currentRenderX += (gilo.TabSize - 1) - (currentRenderX % gilo.TabSize)
} else {
currentRenderX += 1
}
if currentRenderX > renderX {
return cursorX
}
}
return cursorX
}

View File

@ -58,9 +58,22 @@ func (e *editor) Open(filename string) {
e.document.Open(filename) e.document.Open(filename)
} }
func (e *editor) Save() { func (e *editor) SetStatusMessage(template string, a ...interface{}) {
e.status = &statusMsg{
fmt.Sprintf(template, a...),
time.Now(),
}
}
func (e *editor) ProcessKeypress() bool {
ch, _ := terminal.ReadKey()
return e.processKeypressChar(ch)
}
func (e *editor) save() {
if e.document.Filename == "" { if e.document.Filename == "" {
e.document.Filename = e.Prompt("Save as: %s (ESC to cancel)") e.document.Filename = e.prompt("Save as: %s (ESC to cancel)")
if e.document.Filename == "" { if e.document.Filename == "" {
e.SetStatusMessage("Save aborted") e.SetStatusMessage("Save aborted")
} }
@ -75,20 +88,7 @@ func (e *editor) Save() {
} }
} }
func (e *editor) SetStatusMessage(template string, a ...interface{}) { func (e *editor) prompt(prompt string) string {
e.status = &statusMsg{
fmt.Sprintf(template, a...),
time.Now(),
}
}
func (e *editor) ProcessKeypress() bool {
ch, _ := terminal.ReadKey()
return e.processKeypressChar(ch)
}
func (e *editor) Prompt(prompt string) string {
buf := gilo.NewBuffer() buf := gilo.NewBuffer()
// Show the prompt message // Show the prompt message
@ -124,6 +124,25 @@ func (e *editor) Prompt(prompt string) string {
} }
} }
func (e *editor) find() {
query := e.prompt("Search: %s (ESC to cancel)")
if query == "" {
return
}
for i := 0; i < e.document.RowCount(); i++ {
row := e.document.GetRow(i)
matchIndex := row.Search(query)
if matchIndex != -1 {
e.cursor.Y = i
e.cursor.X = row.RenderXtoCursorX(matchIndex)
e.offset.Y = e.document.RowCount()
break
}
}
}
func (e *editor) insertChar(ch rune) { func (e *editor) insertChar(ch rune) {
if e.cursor.Y == e.document.RowCount() { if e.cursor.Y == e.document.RowCount() {
e.document.AppendRow("") e.document.AppendRow("")

View File

@ -42,7 +42,10 @@ func (e *editor) processKeypressChar(ch rune) bool {
return false return false
case key.Ctrl('s'): case key.Ctrl('s'):
e.Save() e.save()
case key.Ctrl('f'):
e.find()
case key.Enter: case key.Enter:
e.document.InsertNewline(e.cursor) e.document.InsertNewline(e.cursor)