fix(repl): replace extra boolean parameter for suggestions with repl …

…options (#4915)

cmd/flux/main.go

@@ -15,6 +15,7 @@ import (
 	"github.com/influxdata/flux/execute/executetest"
 	"github.com/influxdata/flux/fluxinit"
 	"github.com/influxdata/flux/internal/errors"
+	"github.com/influxdata/flux/repl"
 	"github.com/opentracing/opentracing-go"
 	"github.com/spf13/cobra"
 	jaegercfg "github.com/uber/jaeger-client-go/config"
@@ -63,8 +64,13 @@ func runE(cmd *cobra.Command, args []string) error {
 	}
 	ctx = feature.Dependency{Flagger: flagger}.Inject(ctx)
 
+	var opts []repl.Option
+	if flags.EnableSuggestions {
+		opts = append(opts, repl.EnableSuggestions())
+	}
+
 	if len(args) == 0 {
-		return replE(ctx, flags.EnableSuggestions)
+		return replE(ctx, opts...)
 	}
 	return executeE(ctx, script, flags.Format)
 }

cmd/flux/repl.go

@@ -6,8 +6,8 @@ import (
 	"github.com/influxdata/flux/repl"
 )
 
-func replE(ctx context.Context, enableSuggestions bool) error {
-	r := repl.New(ctx, enableSuggestions)
+func replE(ctx context.Context, opts ...repl.Option) error {
+	r := repl.New(ctx, opts...)
 	r.Run()
 	return nil
 }

interpreter/interpreter_test.go

@@ -658,7 +658,7 @@ func TestInterpreter_MultiPhaseInterpretation(t *testing.T) {
 			ctx, deps := dependency.Inject(context.Background(), dependenciestest.Default())
 			defer deps.Finish()
 
-			r := repl.New(ctx, false)
+			r := repl.New(ctx)
 			if _, err := r.Eval(prelude); err != nil {
 				t.Fatalf("unable to evaluate prelude: %s", err)
 			}
@@ -772,7 +772,7 @@ func TestInterpreter_MultipleEval(t *testing.T) {
 			ctx, deps := dependency.Inject(context.Background(), dependenciestest.Default())
 			defer deps.Finish()
 
-			r := repl.New(ctx, false)
+			r := repl.New(ctx)
 
 			if _, err := r.Eval(prelude); err != nil {
 				t.Fatalf("unable to evaluate prelude: %s", err)

repl/repl.go

@@ -41,7 +41,11 @@ type REPL struct {
 	enableSuggestions bool
 }
 
-func New(ctx context.Context, enableSuggestions bool) *REPL {
+type Option interface {
+	applyOption(r *REPL)
+}
+
+func New(ctx context.Context, opts ...Option) *REPL {
 	scope := values.NewScope()
 	importer := runtime.StdLib()
 	for _, p := range runtime.PreludeList {
@@ -57,14 +61,17 @@ func New(ctx context.Context, enableSuggestions bool) *REPL {
 		panic(err)
 	}
 
-	return &REPL{
-		ctx:               ctx,
-		scope:             scope,
-		itrp:              interpreter.NewInterpreter(nil, &lang.ExecOptsConfig{}),
-		analyzer:          analyzer,
-		importer:          importer,
-		enableSuggestions: enableSuggestions,
+	repl := &REPL{
+		ctx:      ctx,
+		scope:    scope,
+		itrp:     interpreter.NewInterpreter(nil, &lang.ExecOptsConfig{}),
+		analyzer: analyzer,
+		importer: importer,
 	}
+	for _, opt := range opts {
+		opt.applyOption(repl)
+	}
+	return repl
 }
 
 func (r *REPL) Run() {
@@ -312,3 +319,15 @@ func LoadQuery(q string) (string, error) {
 
 	return q, nil
 }
+
+type option func(r *REPL)
+
+func (o option) applyOption(r *REPL) {
+	o(r)
+}
+
+func EnableSuggestions() Option {
+	return option(func(r *REPL) {
+		r.enableSuggestions = true
+	})
+}