style: fix lint issues

MrMarble · Mar 26, 2024 · 7d44beb · 7d44beb
1 parent d0805ea
commit 7d44beb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git 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
@@ -64,24 +64,26 @@ 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
 		}
 		images = map[string]image.Image{
 			keyboardName + ".png": outputImage,
 		}
-	} else if unified {
+	case unified:
 		outputImage, err := img.GenerateUnified()
 		if err != nil {
 			return err
 		}
 		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
@@ -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]
 	}