ensure @ input completion maintains expected behaviour

Author: joshbarrington

pkg/tui/components/editor/completion_autosubmit_test.go

@@ -84,4 +84,102 @@ func TestEditorHandlesAutoSubmit(t *testing.T) {
 		// It should also clear the trigger and completion word from textarea
 		assert.Empty(t, e.textarea.Value(), "should clear the trigger and completion word")
 	})
+
+	t.Run("@ completion inserts value even if AutoSubmit is true", func(t *testing.T) {
+		t.Parallel()
+
+		e := newTestEditor("@he", "he")
+		e.currentCompletion = &mockCompletion{trigger: "@"}
+
+		msg := completion.SelectedMsg{
+			Value:      "@hello",
+			AutoSubmit: true,
+		}
+
+		_, cmd := e.Update(msg)
+
+		// Command should be nil because atCompletion is true, preventing AutoSubmit behavior
+		assert.Nil(t, cmd)
+
+		// Value should have trigger replaced with selected value and a space appended
+		assert.Equal(t, "@hello ", e.textarea.Value())
+	})
+
+	t.Run("@ completion adds file attachment", func(t *testing.T) {
+		t.Parallel()
+
+		e := newTestEditor("@main.go", "main.go")
+		e.currentCompletion = &mockCompletion{trigger: "@"}
+
+		// Use a real file that exists
+		msg := completion.SelectedMsg{
+			Value:      "@editor.go",
+			AutoSubmit: false,
+		}
+
+		_, cmd := e.Update(msg)
+		assert.Nil(t, cmd)
+
+		// Value should have trigger replaced with selected value and a space appended
+		assert.Equal(t, "@editor.go ", e.textarea.Value())
+
+		// File should be tracked as attachment
+		require.Len(t, e.attachments, 1)
+		assert.Equal(t, "@editor.go", e.attachments[0].placeholder)
+		assert.False(t, e.attachments[0].isTemp)
+	})
+
+	t.Run("@ completion with Execute runs execute command even if AutoSubmit is false", func(t *testing.T) {
+		t.Parallel()
+
+		e := newTestEditor("@he", "he")
+		e.currentCompletion = &mockCompletion{trigger: "@"}
+
+		type testMsg struct{}
+		msg := completion.SelectedMsg{
+			Value:      "@hello",
+			AutoSubmit: false,
+			Execute: func() tea.Cmd {
+				return func() tea.Msg { return testMsg{} }
+			},
+		}
+
+		_, cmd := e.Update(msg)
+		require.NotNil(t, cmd)
+
+		// Execute should return the provided command
+		msgs := collectMsgs(cmd)
+		require.Len(t, msgs, 1)
+		_, ok := msgs[0].(testMsg)
+		assert.True(t, ok, "should return the command from Execute")
+
+		// It should also clear the trigger and completion word from textarea
+		assert.Empty(t, e.textarea.Value(), "should clear the trigger and completion word")
+	})
+
+	t.Run("@paste- completion sends message if AutoSubmit is true", func(t *testing.T) {
+		t.Parallel()
+
+		e := newTestEditor("@paste", "paste")
+		e.currentCompletion = &mockCompletion{trigger: "@"}
+
+		msg := completion.SelectedMsg{
+			Value:      "@paste-1",
+			AutoSubmit: true,
+		}
+
+		_, cmd := e.Update(msg)
+		require.NotNil(t, cmd)
+
+		// Find SendMsg
+		found := false
+		for _, m := range collectMsgs(cmd) {
+			if sm, ok := m.(messages.SendMsg); ok {
+				assert.Equal(t, "@paste-1", sm.Content)
+				found = true
+				break
+			}
+		}
+		assert.True(t, found, "should return SendMsg")
+	})
 }

pkg/tui/components/editor/editor.go

@@ -638,48 +638,50 @@ func (e *editor) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
 		return e, cmd
 
 	case completion.SelectedMsg:
-		// If the item has an Execute function, run it instead of inserting text
-		if msg.Execute != nil && msg.AutoSubmit {
-			// Remove the trigger character and any typed completion word from the textarea
-			// before executing. For example, typing "@" then selecting "Browse files..."
-			// should remove the "@" so AttachFile doesn't produce a double "@@".
-			if e.currentCompletion != nil {
-				triggerWord := e.currentCompletion.Trigger() + e.completionWord
-				currentValue := e.textarea.Value()
-				if idx := strings.LastIndex(currentValue, triggerWord); idx >= 0 {
-					e.textarea.SetValue(currentValue[:idx] + currentValue[idx+len(triggerWord):])
-					e.textarea.MoveToEnd()
-				}
+		if e.currentCompletion == nil {
+			return e, nil
+		}
+
+		atCompletion := e.currentCompletion.Trigger() == "@" && !strings.HasPrefix(msg.Value, "@paste-")
+		triggerWord := e.currentCompletion.Trigger() + e.completionWord
+		currentValue := e.textarea.Value()
+		idx := strings.LastIndex(currentValue, triggerWord)
+
+		// Handle Execute functions (e.g., "Browse files...")
+		// There is an execute function AND you hit enter, or there is an @ directive
+		if msg.Execute != nil && (msg.AutoSubmit || atCompletion) {
+			if idx >= 0 {
+				e.textarea.SetValue(currentValue[:idx] + currentValue[idx+len(triggerWord):])
+				e.textarea.MoveToEnd()
 			}
 			e.clearSuggestion()
 			return e, msg.Execute()
 		}
-		if msg.AutoSubmit {
-			// For auto-submit completions (like commands), use the selected
-			// command value (e.g., "/exit") instead of what the user typed
-			// (e.g., "/e"). Append any extra text after the trigger word
-			// to preserve arguments (e.g., "/export /tmp/file").
-			triggerWord := e.currentCompletion.Trigger() + e.completionWord
+
+		// Handle Auto-Submit items (e.g., commands like "/exit")
+		if msg.AutoSubmit && !atCompletion {
 			extraText := ""
-			if _, after, found := strings.Cut(e.textarea.Value(), triggerWord); found {
-				extraText = after
+			if idx >= 0 {
+				extraText = currentValue[idx+len(triggerWord):]
 			}
 			cmd := e.resetAndSend(msg.Value + extraText)
 			return e, cmd
 		}
-		// For non-auto-submit completions (like file paths), replace the completion word
-		currentValue := e.textarea.Value()
-		if lastIdx := strings.LastIndex(currentValue, e.completionWord); lastIdx >= 0 {
-			newValue := currentValue[:lastIdx-1] + msg.Value + " " + currentValue[lastIdx+len(e.completionWord):]
+
+		// Insert standard completions (e.g., file paths or text pastes)
+		if idx >= 0 {
+			newValue := currentValue[:idx] + msg.Value + " " + currentValue[idx+len(triggerWord):]
 			e.textarea.SetValue(newValue)
 			e.textarea.MoveToEnd()
 		}
-		// Track file references when using @ completion (but not paste placeholders)
-		if e.currentCompletion != nil && e.currentCompletion.Trigger() == "@" && !strings.HasPrefix(msg.Value, "@paste-") {
+
+		// Track valid file references
+		if atCompletion {
 			if err := e.addFileAttachment(msg.Value); err != nil {
 				slog.Warn("failed to add file attachment from completion", "value", msg.Value, "error", err)
 			}
 		}
+
 		e.clearSuggestion()
 		return e, nil
 	case completion.ClosedMsg: