parser: catch out of order modifiers

Author: alexwforsythe

parser.go

@@ -147,17 +147,27 @@ func (p *Parser) parseTime() string {
 func (p *Parser) parseCtrl() Command {
 	var args []string
 
+	inModifierChain := true
 	for p.peek.Type == PLUS {
 		p.nextToken()
 		peek := p.peek
 
 		// Get key from keywords and check if it's a valid modifier
 		if k := keywords[peek.Literal]; IsModifier(k) {
+			if !inModifierChain {
+				p.errors = append(p.errors, NewError(p.cur, "Modifiers must come before other characters"))
+				// Clear args so the error is returned
+				args = nil
+				continue
+			}
+
 			args = append(args, peek.Literal)
 			p.nextToken()
 			continue
 		}
 
+		inModifierChain = false
+
 		// Add key argument.
 		switch {
 		case peek.Type == ENTER,

parser_test.go

@@ -220,10 +220,14 @@ func TestParseCtrl(t *testing.T) {
 			wantErr:  false,
 		},
 		{
-			name:     "should parse with out of order modifiers",
-			tape:     "Ctrl+Shift+C+Alt",
-			wantArgs: []string{"Shift", "C", "Alt"},
-			wantErr:  false,
+			name:    "should not parse with out of order modifiers",
+			tape:    "Ctrl+Shift+C+Alt",
+			wantErr: true,
+		},
+		{
+			name:    "should not parse with out of order modifiers",
+			tape:    "Ctrl+Shift+C+Alt+C",
+			wantErr: true,
 		},
 		{
 			tape:    "Ctrl+Alt+Right",