fix(completion): stop suggestions after -- (#77) (thanks @salmonumbrella)

Author: steipete

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Auth: account manager upgrade respects managed services and skips Keep OAuth scopes. (#73) — thanks @salmonumbrella.
 - Classroom: normalize assignee updates + fix grade update masks. (#74) — thanks @salmonumbrella.
 - Classroom: scan pages when filtering coursework/materials by topic. (#73) — thanks @salmonumbrella.
+- CLI: enable shell completions and stop flag suggestions after `--`. (#77) — thanks @salmonumbrella.
 
 ### Build
 

internal/cmd/completion_internal.go

@@ -42,9 +42,11 @@ func completeWords(cword int, words []string) ([]string, error) {
 	}
 
 	node := root
+	terminatorIndex := -1
 	for i := start; i < cword && i < len(words); {
 		word := words[i]
 		if word == "--" {
+			terminatorIndex = i
 			break
 		}
 		if strings.HasPrefix(word, "-") {
@@ -71,6 +73,14 @@ func completeWords(cword int, words []string) ([]string, error) {
 		i++
 	}
 
+	if terminatorIndex != -1 && cword >= terminatorIndex {
+		return nil, nil
+	}
+
+	if cword < len(words) && words[cword] == "--" {
+		return nil, nil
+	}
+
 	if cword > start && cword <= len(words) {
 		prev := words[cword-1]
 		if strings.HasPrefix(prev, "-") {

internal/cmd/completion_internal_test.go

@@ -0,0 +1,35 @@
+package cmd
+
+import "testing"
+
+func TestCompleteWordsStopsAfterTerminator(t *testing.T) {
+	cases := []struct {
+		name  string
+		cword int
+		words []string
+	}{
+		{
+			name:  "current-is-terminator",
+			cword: 1,
+			words: []string{"gog", "--"},
+		},
+		{
+			name:  "after-terminator",
+			cword: 3,
+			words: []string{"gog", "auth", "--", "-"},
+		},
+	}
+
+	for _, tc := range cases {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			got, err := completeWords(tc.cword, tc.words)
+			if err != nil {
+				t.Fatalf("completeWords: %v", err)
+			}
+			if len(got) != 0 {
+				t.Fatalf("expected no suggestions, got %v", got)
+			}
+		})
+	}
+}

internal/cmd/root.go

@@ -24,7 +24,7 @@ const (
 
 type RootFlags struct {
 	Color   string `help:"Color output: auto|always|never" default:"${color}"`
-	Account string `help:"Account email for API commands (gmail/calendar/drive/docs/slides/contacts/tasks/people/sheets)"`
+	Account string `help:"Account email for API commands (gmail/calendar/classroom/drive/docs/slides/contacts/tasks/people/sheets)"`
 	JSON    bool   `help:"Output JSON to stdout (best for scripting)" default:"${json}"`
 	Plain   bool   `help:"Output stable, parseable text to stdout (TSV; no colors)" default:"${plain}"`
 	Force   bool   `help:"Skip confirmations for destructive commands"`
@@ -43,6 +43,7 @@ type CLI struct {
 	Docs       DocsCmd               `cmd:"" help:"Google Docs (export via Drive)"`
 	Slides     SlidesCmd             `cmd:"" help:"Google Slides"`
 	Calendar   CalendarCmd           `cmd:"" help:"Google Calendar"`
+	Classroom  ClassroomCmd          `cmd:"" help:"Google Classroom"`
 	Gmail      GmailCmd              `cmd:"" aliases:"mail,email" help:"Gmail"`
 	Contacts   ContactsCmd           `cmd:"" help:"Google Contacts"`
 	Tasks      TasksCmd              `cmd:"" help:"Google Tasks"`
@@ -183,7 +184,7 @@ func newParser(description string) (*kong.Kong, *CLI, error) {
 }
 
 func baseDescription() string {
-	return "Google CLI for Gmail/Calendar/Drive/Contacts/Tasks/Sheets/Docs/Slides/People"
+	return "Google CLI for Gmail/Calendar/Classroom/Drive/Contacts/Tasks/Sheets/Docs/Slides/People"
 }
 
 func helpDescription() string {