From 7d44beb56152e78ce13d3a71178144ecd942d104 Mon Sep 17 00:00:00 2001 From: Alvaro Tinoco Marmol Date: Tue, 26 Mar 2024 12:35:28 +0100 Subject: [PATCH] style: fix lint issues --- .golangci.yml | 10 ---------- cmd/zmk-viewer/generate/generate.go | 8 +++++--- internal/img/generate.go | 8 +++++--- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 30c67d0..6068903 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -22,21 +22,11 @@ linters: linters-settings: gocritic: enabled-checks: - - appendAssign - appendCombine - - argOrder - - assignOp - - badCond - boolExprSimplify - - captLocal - - caseOrder - - commentFormatting - commentedOutCode - commentedOutImport - - defaultCaseOrder - deferUnlambda - - dupCase - - elseif - filepathJoin - hexLiteral - httpNoBody diff --git a/cmd/zmk-viewer/generate/generate.go b/cmd/zmk-viewer/generate/generate.go index c5fce26..a97b144 100644 --- a/cmd/zmk-viewer/generate/generate.go +++ b/cmd/zmk-viewer/generate/generate.go @@ -64,7 +64,8 @@ func generate(keyboardName, layoutFile, output, keymapFile string, isTransparent var images map[string]image.Image - if single { + switch { + case single: outputImage, err := img.GenerateSingle() if err != nil { return err @@ -72,7 +73,7 @@ func generate(keyboardName, layoutFile, output, keymapFile string, isTransparent images = map[string]image.Image{ keyboardName + ".png": outputImage, } - } else if unified { + case unified: outputImage, err := img.GenerateUnified() if err != nil { return err @@ -80,8 +81,9 @@ func generate(keyboardName, layoutFile, output, keymapFile string, isTransparent images = map[string]image.Image{ keyboardName + ".png": outputImage, } - } else { + default: images, err = img.GenerateLayouts() + } if err != nil { diff --git a/internal/img/generate.go b/internal/img/generate.go index 08521ee..6c84fea 100644 --- a/internal/img/generate.go +++ b/internal/img/generate.go @@ -280,13 +280,15 @@ func (k *keycap) fromKey(key *keymap.Binding, parseKeyCode bool) *keycap { func formatKeyCode(key *keymap.List, parseKeyCode bool) string { str := "" - if key.KeyCode == nil { + switch { + case key.KeyCode == nil: str += fmt.Sprintf("%v", *key.Number) - } else if parseKeyCode { + case parseKeyCode: str += keymap.GetSymbol(*key.KeyCode) - } else { + default: str += *key.KeyCode } + if strings.HasPrefix(str, "LC") { str = "⌃" + str[3:len(str)-1] }