fix: use ansi.Cmd to get the command from the parser

aymanbagabas · aymanbagabas · commit fa6ae5d50a7f · 2025-01-27T13:10:09.000-05:00
diff --git a/color.go b/color.go
@@ -22,7 +22,7 @@ func handleTerminalColor(p *ansi.Parser) (string, error) {
 	} else {
 		buf += "Set"
 	}
-	switch p.Cmd() {
+	switch p.Command() {
 	case 10:
 		buf += " foreground color"
 	case 11:
@@ -44,7 +44,7 @@ func handleResetTerminalColor(p *ansi.Parser) (string, error) {
 		return "", errInvalid
 	}
 	var buf string
-	switch p.Cmd() {
+	switch p.Command() {
 	case 110:
 		buf += "Reset foreground color"
 	case 111:
diff --git a/cursor.go b/cursor.go
@@ -13,9 +13,9 @@ func handleCursor(p *ansi.Parser) (string, error) {
 		count = n
 	}
 
-	cmd := p.Cmd()
-	isPrivate := cmd.Marker() == '?'
-	switch cmd.Command() {
+	cmd := ansi.Cmd(p.Command())
+	isPrivate := cmd.Prefix() == '?'
+	switch cmd.Final() {
 	case 'A':
 		// CUU - Cursor Up
 		return fmt.Sprintf("Cursor up %d", default1(count)), nil
diff --git a/kitty.go b/kitty.go
@@ -46,8 +46,8 @@ func handleKitty(p *ansi.Parser) (string, error) {
 		first = n
 	}
 
-	cmd := p.Cmd()
-	switch cmd.Marker() {
+	cmd := ansi.Cmd(p.Command())
+	switch cmd.Prefix() {
 	case '?':
 		return "Request Kitty keyboard", nil
 	case '>':
diff --git a/line.go b/line.go
@@ -13,7 +13,7 @@ func handleLine(p *ansi.Parser) (string, error) {
 		count = n
 	}
 
-	switch p.Cmd() {
+	switch p.Command() {
 	case 'K':
 		switch count {
 		case 0:
diff --git a/main.go b/main.go
@@ -16,7 +16,7 @@ import (
 )
 
 const (
-	markerShift   = parser.MarkerShift
+	markerShift   = parser.PrefixShift
 	intermedShift = parser.IntermedShift
 )
 
@@ -188,7 +188,7 @@ func process(w *colorprofile.Writer, in []byte) error {
 			return
 		}
 
-		handler, ok := reg[int(p.Cmd())]
+		handler, ok := reg[p.Command()]
 		if !ok {
 			_, _ = fmt.Fprintln(w, t.error.Render(errUnhandled.Error()))
 			return
diff --git a/mode.go b/mode.go
@@ -12,12 +12,12 @@ func handleMode(p *ansi.Parser) (string, error) {
 		m = n
 	}
 	mode := modeDesc(m)
-	cmd := p.Cmd()
+	cmd := ansi.Cmd(p.Command())
 	private := ""
-	if cmd.Marker() == '?' {
+	if cmd.Prefix() == '?' {
 		private = "private "
 	}
-	switch cmd.Command() {
+	switch cmd.Final() {
 	case 'p':
 		// DECRQM - Request Mode
 		return fmt.Sprintf("Request %smode %q", private, mode), nil
diff --git a/screen.go b/screen.go
@@ -13,8 +13,8 @@ func handleScreen(p *ansi.Parser) (string, error) {
 		count = n
 	}
 
-	cmd := p.Cmd()
-	switch cmd.Command() {
+	cmd := ansi.Cmd(p.Command())
+	switch cmd.Final() {
 	case 'J':
 		switch count {
 		case 0:
diff --git a/title.go b/title.go
@@ -14,7 +14,7 @@ func handleTitle(p *ansi.Parser) (string, error) {
 		// Invalid, ignore
 		return "", errInvalid
 	}
-	switch p.Cmd() {
+	switch p.Command() {
 	case 0:
 		return fmt.Sprintf("Set icon name and window title to %q", parts[1]), nil
 	case 1:

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ func handleLine(p *ansi.Parser) (string, error) {`
`13`	`13`	`count = n`
`14`	`14`	`}`
`15`	`15`
`16`		`- switch p.Cmd() {`
	`16`	`+ switch p.Command() {`
`17`	`17`	`case 'K':`
`18`	`18`	`switch count {`
`19`	`19`	`case 0:`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`const (`
`19`		`- markerShift = parser.MarkerShift`
	`19`	`+ markerShift = parser.PrefixShift`
`20`	`20`	`intermedShift = parser.IntermedShift`
`21`	`21`	`)`
`22`	`22`
`@@ -188,7 +188,7 @@ func process(w *colorprofile.Writer, in []byte) error {`
`188`	`188`	`return`
`189`	`189`	`}`
`190`	`190`
`191`		`- handler, ok := reg[int(p.Cmd())]`
	`191`	`+ handler, ok := reg[p.Command()]`
`192`	`192`	`if !ok {`
`193`	`193`	`_, _ = fmt.Fprintln(w, t.error.Render(errUnhandled.Error()))`
`194`	`194`	`return`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ func handleTitle(p *ansi.Parser) (string, error) {`
`14`	`14`	`// Invalid, ignore`
`15`	`15`	`return "", errInvalid`
`16`	`16`	`}`
`17`		`- switch p.Cmd() {`
	`17`	`+ switch p.Command() {`
`18`	`18`	`case 0:`
`19`	`19`	`return fmt.Sprintf("Set icon name and window title to %q", parts[1]), nil`
`20`	`20`	`case 1:`