Address Cursor and golangci-lint comments

Also restored accidentally moved nb_NO.kle.json file

Author: IDisposable

internal/keyboard/keyboard.go

@@ -572,8 +572,9 @@ func sanitizeName(name string) string {
 		return r
 	}, name)
 	cleaned = strings.TrimSpace(cleaned)
-	if len(cleaned) > maxNameLength {
-		cleaned = cleaned[:maxNameLength]
+	if utf8.RuneCountInString(cleaned) > maxNameLength {
+		runes := []rune(cleaned)
+		cleaned = string(runes[:maxNameLength])
 	}
 	if cleaned == "" {
 		return "Unnamed Layout"
@@ -619,13 +620,18 @@ func isDeadKey(legends KeyLegends, declaredDeadKeys map[rune]bool) bool {
 func buildCharMap(keys []TransportKey) map[string]HIDCombo {
 	m := make(map[string]HIDCombo)
 
-	// Sort keys by position for deterministic first-occurrence behaviour
-	slices.SortStableFunc(keys, func(a, b TransportKey) int {
+	// Sort a copy by position for deterministic first-occurrence behaviour.
+	// We must not mutate the original slice — it preserves KLE parse order,
+	// which the scancodes metadata override uses (0-based index).
+	sorted := make([]TransportKey, len(keys))
+	copy(sorted, keys)
+	slices.SortStableFunc(sorted, func(a, b TransportKey) int {
 		if comp := cmp.Compare(a.Y, b.Y); comp != 0 {
 			return comp
 		}
 		return cmp.Compare(a.X, b.X)
 	})
+	keys = sorted
 
 	for _, key := range keys {
 		if key.Scancode == 0 {
@@ -680,8 +686,9 @@ func addDeadKeyCompositions(keys []TransportKey, charMap map[string]HIDCombo, de
 	}
 
 	type deadKeyInfo struct {
-		combo     HIDCombo // scancode + modifiers to press the dead key
-		combining rune     // Unicode combining character
+		combo      HIDCombo // scancode + modifiers to press the dead key
+		combining  rune     // Unicode combining character
+		displayKey rune     // the legend character as it appears on the keycap
 	}
 
 	// Collect dead key legends that are both declared AND have a known
@@ -713,8 +720,9 @@ func addDeadKeyCompositions(keys []TransportKey, charMap map[string]HIDCombo, de
 				continue
 			}
 			deadKeys = append(deadKeys, deadKeyInfo{
-				combo:     HIDCombo{Scancode: key.Scancode, Modifiers: layer.mods},
-				combining: combining,
+				combo:      HIDCombo{Scancode: key.Scancode, Modifiers: layer.mods},
+				combining:  combining,
+				displayKey: r,
 			})
 		}
 	}
@@ -764,15 +772,11 @@ func addDeadKeyCompositions(keys []TransportKey, charMap map[string]HIDCombo, de
 			}
 		}
 
-		// Standalone dead key: dead key + Space → the dead key character itself
-		deadChar := string([]rune{dk.combining})
-		// Find the display character (not the combining form)
-		for displayRune, combiningRune := range deadKeyToCombining {
-			if combiningRune == dk.combining {
-				deadChar = string(displayRune)
-				break
-			}
-		}
+		// Standalone dead key: dead key + Space → the dead key character itself.
+		// Use the display rune captured from the actual key legend, not a
+		// reverse lookup from deadKeyToCombining (which has duplicate values
+		// and non-deterministic map iteration order).
+		deadChar := string(dk.displayKey)
 		if _, exists := charMap[deadChar]; exists {
 			// Replace the simple entry with a prefixed one (dead key + space)
 			charMap[deadChar] = HIDCombo{

internal/keyboard/keyboard_test.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"strings"
 	"testing"
+	"unicode/utf8"
 )
 
 // ---------------------------------------------------------------------------
@@ -400,8 +401,18 @@ func TestSanitizeNameTrimsWhitespace(t *testing.T) {
 func TestSanitizeNameTruncates(t *testing.T) {
 	long := strings.Repeat("x", 200)
 	got := sanitizeName(long)
-	if len(got) != maxNameLength {
-		t.Errorf("expected length %d, got %d", maxNameLength, len(got))
+	if utf8.RuneCountInString(got) != maxNameLength {
+		t.Errorf("expected %d runes, got %d", maxNameLength, utf8.RuneCountInString(got))
+	}
+
+	// Multi-byte: 200 CJK characters → truncate to maxNameLength runes, not bytes
+	cjk := strings.Repeat("漢", 200)
+	gotCJK := sanitizeName(cjk)
+	if utf8.RuneCountInString(gotCJK) != maxNameLength {
+		t.Errorf("CJK: expected %d runes, got %d", maxNameLength, utf8.RuneCountInString(gotCJK))
+	}
+	if !utf8.ValidString(gotCJK) {
+		t.Error("CJK truncation produced invalid UTF-8")
 	}
 }
 

internal/keyboard/layouts/nb_NO.kle.json

@@ -44,25 +44,25 @@
             "d": true,
             "w": 4
         },
-        "Norsk bokmål\nnb-NO\n\n(ISO 105)"
+        "nb-NO\nNorsk bokmål\n(ISO 105)\n"
     ],
     [
         {
             "y": 0.5
         },
-        "§\n|",
-        "!\n1",
-        "\"\n2\n\n@",
-        "#\n3\n\n£",
-        "¤\n4\n\n$",
-        "%\n5\n\n€",
-        "&\n6",
-        "/\n7\n\n{",
-        "(\n8\n\n[",
-        ")\n9\n\n]",
-        "=\n0\n\n}",
-        "?\n+",
-        "`\n\\\n\n´",
+        "|\n§",
+        "1\n!",
+        "2\n\"\n@\n",
+        "3\n#\n£\n",
+        "4\n¤\n$\n",
+        "5\n%\n€\n",
+        "6\n&",
+        "7\n/\n{\n",
+        "8\n(\n[\n",
+        "9\n)\n]\n",
+        "0\n=\n}\n",
+        "+\n?",
+        "\\\n`\n´\n",
         {
             "w": 2
         },
@@ -96,8 +96,8 @@
         "i",
         "o",
         "p",
-        "Å\nå",
-        "^\n¨\n\n~",
+        "å\nÅ",
+        "¨\n^\n~\n",
         {
             "x": 0.25,
             "w": 1.25,
@@ -144,9 +144,9 @@
         "j",
         "k",
         "l",
-        "Ø\nø",
-        "Æ\næ",
-        "*\n'",
+        "ø\nØ",
+        "æ\nÆ",
+        "'\n*",
         {
             "x": 4.75
         },
@@ -162,17 +162,17 @@
             "w": 1.25
         },
         "⇧ Shift",
-        ">\n<",
+        "<\n>",
         "z",
         "x",
         "c",
         "v",
         "b",
         "n",
         "m",
-        ";\n,",
-        ":\n.",
-        "_\n-",
+        ",\n;",
+        ".\n:",
+        "-\n_",
         {
             "w": 2.75
         },