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.

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 typos #531

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ linters-settings:
# - prealloc # following this rule isn't consistently a good idea, as it sometimes forces unnecessary allocations that result in less idiomatic code
# - scopelint # deprecated
# - testpackage
# - wsl # this doens't have an auto-fixer yet and is pretty noisy (https://github.com/bombsimon/wsl/issues/90)
# - wsl # this doesn't have an auto-fixer yet and is pretty noisy (https://github.com/bombsimon/wsl/issues/90)
# - varcheck # deprecated (since v1.49.0) due to: The owner seems to have abandoned the linter. Replaced by unused.
# - deadcode # deprecated (since v1.49.0) due to: The owner seems to have abandoned the linter. Replaced by unused.
# - structcheck # deprecated (since v1.49.0) due to: The owner seems to have abandoned the linter. Replaced by unused.
# - rowserrcheck # we're not using sql.Rows at all in the codebase
# - rowserrcheck # we're not using sql.Rows at all in the codebase
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,8 @@ clean-changelog:
rm -f $(CHANGELOG) VERSION


## Halp! #################################
## Help! #################################

.PHONY: help
help:
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "$(BOLD)$(CYAN)%-25s$(RESET)%s\n", $$1, $$2}'

4 changes: 2 additions & 2 deletions dive/filetree/efficiency_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ func checkError(t *testing.T, err error, message string) {
}
}

func TestEfficency(t *testing.T) {
func TestEfficiency(t *testing.T) {
trees := make([]*FileTree, 3)
for idx := range trees {
trees[idx] = NewFileTree()
Expand Down Expand Up @@ -56,7 +56,7 @@ func TestEfficency(t *testing.T) {
}
}

func TestEfficency_ScratchImage(t *testing.T) {
func TestEfficiency_ScratchImage(t *testing.T) {
trees := make([]*FileTree, 3)
for idx := range trees {
trees[idx] = NewFileTree()
Expand Down
4 changes: 2 additions & 2 deletions dive/filetree/node_data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ func TestMergeDiffTypes(t *testing.T) {
b := Unmodified
merged := a.merge(b)
if merged != Unmodified {
t.Errorf("Expected Unchaged (0) but got %v", merged)
t.Errorf("Expected Unchanged (0) but got %v", merged)
}
a = Modified
b = Unmodified
merged = a.merge(b)
if merged != Modified {
t.Errorf("Expected Unchaged (0) but got %v", merged)
t.Errorf("Expected Unchanged (0) but got %v", merged)
}
}

Expand Down
2 changes: 1 addition & 1 deletion runtime/ui/layout/compound/layer_details_column.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (cl *LayerDetailsCompoundLayout) layoutRow(g *gocui.Gui, minX, minY, maxX,
}

func (cl *LayerDetailsCompoundLayout) Layout(g *gocui.Gui, minX, minY, maxX, maxY int) error {
logrus.Tracef("LayerDetailsCompountLayout.Layout(minX: %d, minY: %d, maxX: %d, maxY: %d) %s", minX, minY, maxX, maxY, cl.Name())
logrus.Tracef("LayerDetailsCompoundLayout.Layout(minX: %d, minY: %d, maxX: %d, maxY: %d) %s", minX, minY, maxX, maxY, cl.Name())

layouts := []view.IView{
cl.layer,
Expand Down
4 changes: 2 additions & 2 deletions runtime/ui/view/filetree.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ func (v *FileTree) toggleAttributes() error {
return err
}

// we need to render the changes to the status pane as well (not just this contoller/view)
// we need to render the changes to the status pane as well (not just this controller/view)
return v.notifyOnViewOptionChangeListeners()
}

Expand All @@ -352,7 +352,7 @@ func (v *FileTree) toggleShowDiffType(diffType filetree.DiffType) error {
return err
}

// we need to render the changes to the status pane as well (not just this contoller/view)
// we need to render the changes to the status pane as well (not just this controller/view)
return v.notifyOnViewOptionChangeListeners()
}

Expand Down