Merge pull request #42 from thaJeztah/fix_windows_conversion_again

windows: keyToString(): fix string conversion (for real)

windows/ansi_reader.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"strconv"
 	"strings"
 	"unsafe"
 
@@ -196,10 +195,10 @@ func keyToString(keyEvent *winterm.KEY_EVENT_RECORD, escapeSequence []byte) stri
 
 	// <Alt>+Key generates ESC N Key
 	if !control && alt {
-		return ansiterm.KEY_ESC_N + strings.ToLower(strconv.Itoa(int(keyEvent.UnicodeChar)))
+		return ansiterm.KEY_ESC_N + strings.ToLower(string(rune(keyEvent.UnicodeChar)))
 	}
 
-	return strconv.Itoa(int(keyEvent.UnicodeChar))
+	return string(rune(keyEvent.UnicodeChar))
 }
 
 // formatVirtualKey converts a virtual key (e.g., up arrow) into the appropriate ANSI string.

windows/ansi_reader_test.go

@@ -0,0 +1,24 @@
+//go:build windows
+// +build windows
+
+package windowsconsole
+
+import (
+	"testing"
+
+	"github.com/Azure/go-ansiterm"
+	"github.com/Azure/go-ansiterm/winterm"
+)
+
+func TestKeyToString(t *testing.T) {
+	ke := &winterm.KEY_EVENT_RECORD{
+		ControlKeyState: winterm.LEFT_ALT_PRESSED,
+		UnicodeChar:     65, // capital A
+	}
+
+	const expected = ansiterm.KEY_ESC_N + "a"
+	out := keyToString(ke, nil)
+	if out != expected {
+		t.Errorf("expected %s, got %s", expected, out)
+	}
+}