luke/qedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go fmt

Browse Source
This commit is contained in:
Luke I. Wilson 2021-03-16 14:08:22 -05:00
parent 0f743cf1b3
commit 7971ef16ab
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/textedit.go
View File

@ -259,7 +259,7 @@ func (t *TextEdit) SetLineCol(line, col int) {
line, col = t.clampLineCol(line, col) line, col = t.clampLineCol(line, col)
// Handle hard tabs // Handle hard tabs
tabOffset := t.getTabCountInLineAtCol(line, col) * (t.TabSize-1) // Offset for the current line from hard tabs (temporary; purely visual) tabOffset := t.getTabCountInLineAtCol(line, col) * (t.TabSize - 1) // Offset for the current line from hard tabs (temporary; purely visual)
// Scroll the screen when going to lines out of view // Scroll the screen when going to lines out of view
if line >= t.scrolly+t.height-1 { // If the new line is below view... if line >= t.scrolly+t.height-1 { // If the new line is below view...
@ -290,7 +290,7 @@ func (t *TextEdit) CursorUp() {
} else { } else {
line, col := t.clampLineCol(t.cury-1, t.prevCurCol) line, col := t.clampLineCol(t.cury-1, t.prevCurCol)
if t.UseHardTabs { // When using hard tabs, subtract offsets produced by tabs if t.UseHardTabs { // When using hard tabs, subtract offsets produced by tabs
tabOffset := t.getTabCountInLineAtCol(line, col) * (t.TabSize-1) tabOffset := t.getTabCountInLineAtCol(line, col) * (t.TabSize - 1)
col -= tabOffset // We still count each \t in the col col -= tabOffset // We still count each \t in the col
} }
t.SetLineCol(line, col) t.SetLineCol(line, col)
@ -304,7 +304,7 @@ func (t *TextEdit) CursorDown() {
} else { } else {
line, col := t.clampLineCol(t.cury+1, t.prevCurCol) line, col := t.clampLineCol(t.cury+1, t.prevCurCol)
if t.UseHardTabs { if t.UseHardTabs {
tabOffset := t.getTabCountInLineAtCol(line, col) * (t.TabSize-1) tabOffset := t.getTabCountInLineAtCol(line, col) * (t.TabSize - 1)
col -= tabOffset // We still count each \t in the col col -= tabOffset // We still count each \t in the col
} }
t.SetLineCol(line, col) // Go to line below t.SetLineCol(line, col) // Go to line below
@ -318,7 +318,7 @@ func (t *TextEdit) CursorLeft() {
} else { } else {
t.SetLineCol(t.cury, t.curx-1) t.SetLineCol(t.cury, t.curx-1)
} }
tabOffset := t.getTabCountInLineAtCol(t.cury, t.curx) * (t.TabSize-1) tabOffset := t.getTabCountInLineAtCol(t.cury, t.curx) * (t.TabSize - 1)
t.prevCurCol = t.curx + tabOffset t.prevCurCol = t.curx + tabOffset
} }
@ -331,7 +331,7 @@ func (t *TextEdit) CursorRight() {
} else { } else {
t.SetLineCol(t.cury, t.curx+1) t.SetLineCol(t.cury, t.curx+1)
} }
tabOffset := t.getTabCountInLineAtCol(t.cury, t.curx) * (t.TabSize-1) tabOffset := t.getTabCountInLineAtCol(t.cury, t.curx) * (t.TabSize - 1)
t.prevCurCol = t.curx + tabOffset t.prevCurCol = t.curx + tabOffset
} }
@ -389,12 +389,12 @@ func (t *TextEdit) Draw(s tcell.Screen) {
if t.selectMode && line >= t.selection.StartLine && line <= t.selection.EndLine { if t.selectMode && line >= t.selection.StartLine && line <= t.selection.EndLine {
selStartIdx := t.scrollx selStartIdx := t.scrollx
if line == t.selection.StartLine { // If the selection begins somewhere in the line... if line == t.selection.StartLine { // If the selection begins somewhere in the line...
// Account for hard tabs // Account for hard tabs
tabCount := t.getTabCountInLineAtCol(line, t.selection.StartCol) tabCount := t.getTabCountInLineAtCol(line, t.selection.StartCol)
selStartIdx = t.selection.StartCol + tabCount*(t.TabSize-1) - t.scrollx selStartIdx = t.selection.StartCol + tabCount*(t.TabSize-1) - t.scrollx
} }
selEndIdx := len(lineRunes)-t.scrollx // Not inclusive selEndIdx := len(lineRunes) - t.scrollx // Not inclusive
if line == t.selection.EndLine { // If the selection ends somewhere in the line... if line == t.selection.EndLine { // If the selection ends somewhere in the line...
tabCount := t.getTabCountInLineAtCol(line, t.selection.EndCol) tabCount := t.getTabCountInLineAtCol(line, t.selection.EndCol)
selEndIdx = t.selection.EndCol + 1 + tabCount*(t.TabSize-1) - t.scrollx selEndIdx = t.selection.EndCol + 1 + tabCount*(t.TabSize-1) - t.scrollx
} }