Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: lint issues #730

Merged
merged 4 commits into from
Feb 10, 2025
+45 −45
Merged

fix: lint issues #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1e29c8
fix: lint issues
caarlos0 Feb 10, 2025
cc48930
fix: lint
caarlos0 Feb 10, 2025
79dbae3
fix: lint
caarlos0 Feb 10, 2025
708cf13
fix: lint
caarlos0 Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions filepicker/filepicker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ func New() Model {
FileAllowed: true,
AutoHeight: true,
height: 0,
max: 0,
min: 0,
maxIdx: 0,
minIdx: 0,
selectedStack: newStack(),
minStack: newStack(),
maxStack: newStack(),
Expand Down Expand Up @@ -147,8 +147,8 @@ type Model struct {
selected int
selectedStack stack

min int
max int
minIdx int
maxIdx int
maxStack stack
minStack stack

Expand Down Expand Up @@ -182,10 +182,10 @@ func newStack() stack {
}
}

func (m *Model) pushView(selected, min, max int) {
func (m *Model) pushView(selected, minIdx, maxIdx int) {
m.selectedStack.Push(selected)
m.minStack.Push(min)
m.maxStack.Push(max)
m.minStack.Push(minIdx)
m.maxStack.Push(maxIdx)
}

func (m *Model) popView() (int, int, int) {
Expand Down Expand Up @@ -245,72 +245,72 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
break
}
m.files = msg.entries
m.max = max(m.max, m.Height()-1)
m.maxIdx = max(m.maxIdx, m.Height()-1)
case tea.WindowSizeMsg:
if m.AutoHeight {
m.SetHeight(msg.Height - marginBottom)
}
m.max = m.Height() - 1
m.maxIdx = m.Height() - 1
case tea.KeyPressMsg:
switch {
case key.Matches(msg, m.KeyMap.GoToTop):
m.selected = 0
m.min = 0
m.max = m.Height() - 1
m.minIdx = 0
m.maxIdx = m.Height() - 1
case key.Matches(msg, m.KeyMap.GoToLast):
m.selected = len(m.files) - 1
m.min = len(m.files) - m.Height()
m.max = len(m.files) - 1
m.minIdx = len(m.files) - m.Height()
m.maxIdx = len(m.files) - 1
case key.Matches(msg, m.KeyMap.Down):
m.selected++
if m.selected >= len(m.files) {
m.selected = len(m.files) - 1
}
if m.selected > m.max {
m.min++
m.max++
if m.selected > m.maxIdx {
m.minIdx++
m.maxIdx++
}
case key.Matches(msg, m.KeyMap.Up):
m.selected--
if m.selected < 0 {
m.selected = 0
}
if m.selected < m.min {
m.min--
m.max--
if m.selected < m.minIdx {
m.minIdx--
m.maxIdx--
}
case key.Matches(msg, m.KeyMap.PageDown):
m.selected += m.Height()
if m.selected >= len(m.files) {
m.selected = len(m.files) - 1
}
m.min += m.Height()
m.max += m.Height()
m.minIdx += m.Height()
m.maxIdx += m.Height()

if m.max >= len(m.files) {
m.max = len(m.files) - 1
m.min = m.max - m.Height()
if m.maxIdx >= len(m.files) {
m.maxIdx = len(m.files) - 1
m.minIdx = m.maxIdx - m.Height()
}
case key.Matches(msg, m.KeyMap.PageUp):
m.selected -= m.Height()
if m.selected < 0 {
m.selected = 0
}
m.min -= m.Height()
m.max -= m.Height()
m.minIdx -= m.Height()
m.maxIdx -= m.Height()

if m.min < 0 {
m.min = 0
m.max = m.min + m.Height()
if m.minIdx < 0 {
m.minIdx = 0
m.maxIdx = m.minIdx + m.Height()
}
case key.Matches(msg, m.KeyMap.Back):
m.CurrentDirectory = filepath.Dir(m.CurrentDirectory)
if m.selectedStack.Length() > 0 {
m.selected, m.min, m.max = m.popView()
m.selected, m.minIdx, m.maxIdx = m.popView()
} else {
m.selected = 0
m.min = 0
m.max = m.Height() - 1
m.minIdx = 0
m.maxIdx = m.Height() - 1
}
return m, m.readDir(m.CurrentDirectory, m.ShowHidden)
case key.Matches(msg, m.KeyMap.Open):
Expand Down Expand Up @@ -349,10 +349,10 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
}

m.CurrentDirectory = filepath.Join(m.CurrentDirectory, f.Name())
m.pushView(m.selected, m.min, m.max)
m.pushView(m.selected, m.minIdx, m.maxIdx)
m.selected = 0
m.min = 0
m.max = m.Height() - 1
m.minIdx = 0
m.maxIdx = m.Height() - 1
return m, m.readDir(m.CurrentDirectory, m.ShowHidden)
}
}
Expand All @@ -367,7 +367,7 @@ func (m Model) View() string {
var s strings.Builder

for i, f := range m.files {
if i < m.min || i > m.max {
if i < m.minIdx || i > m.maxIdx {
continue
}

Expand Down
4 changes: 2 additions & 2 deletions filepicker/hidden_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
func IsHidden(file string) (bool, error) {
pointer, err := syscall.UTF16PtrFromString(file)
if err != nil {
return false, err
return false, err //nolint:wrapcheck
}
attributes, err := syscall.GetFileAttributes(pointer)
if err != nil {
return false, err
return false, err //nolint:wrapcheck
}
return attributes&syscall.FILE_ATTRIBUTE_HIDDEN != 0, nil
}
14 changes: 7 additions & 7 deletions textarea/textarea.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,13 +943,13 @@ func (m Model) LineInfo() LineInfo {
// repositionView repositions the view of the viewport based on the defined
// scrolling behavior.
func (m *Model) repositionView() {
min := m.viewport.YOffset
max := min + m.viewport.Height() - 1
minOffset := m.viewport.YOffset
maxOffset := minOffset + m.viewport.Height() - 1

if row := m.cursorLineNumber(); row < min {
m.viewport.LineUp(min - row)
} else if row > max {
m.viewport.LineDown(row - max)
if row := m.cursorLineNumber(); row < minOffset {
m.viewport.LineUp(minOffset - row)
} else if row > maxOffset {
m.viewport.LineDown(row - maxOffset)
}
}

Expand Down Expand Up @@ -1219,7 +1219,7 @@ func (m Model) View() string {
displayLine++

var ln string
if m.ShowLineNumbers { //nolint:nestif
if m.ShowLineNumbers {
if wl == 0 { // normal line
isCursorLine := m.row == l
s.WriteString(m.lineNumberView(l+1, isCursorLine))
Expand Down
Loading