Skip to content

Commit

Permalink
fix PR comments 1
Browse files Browse the repository at this point in the history
  • Loading branch information
kutluhanmetin committed Aug 28, 2023
1 parent 26112da commit 14bd37b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion base/commands/script.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (cm ScriptCommand) Exec(ctx context.Context, ec plug.ExecContext) error {
verbose := ec.Props().GetBool(clc.PropertyVerbose)
ie := ec.Props().GetBool(flagIgnoreErrors)
echo := ec.Props().GetBool(flagEcho)
textFn := makeTextFunc(m, ec, verbose, func(shortcut string) bool {
textFn := makeTextFunc(m, ec, verbose, false, false, func(shortcut string) bool {
// shortcuts are not supported in the script mode
return false
})
Expand Down
2 changes: 1 addition & 1 deletion base/commands/shell.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (cm *ShellCommand) ExecInteractive(ctx context.Context, ec plug.ExecContext
}
verbose := ec.Props().GetBool(clc.PropertyVerbose)
endLineFn := makeEndLineFunc()
textFn := makeTextFunc(m, ec, verbose, func(shortcut string) bool {
textFn := makeTextFunc(m, ec, verbose, false, false, func(shortcut string) bool {
cm.mu.RLock()
_, ok := cm.shortcuts[shortcut]
cm.mu.RUnlock()
Expand Down
2 changes: 1 addition & 1 deletion base/commands/shell_script_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func makeEndLineFunc() shell.EndLineFn {
}
}

func makeTextFunc(m *cmd.Main, ec plug.ExecContext, verbose bool, sf shortcutFunc) shell.TextFn {
func makeTextFunc(m *cmd.Main, ec plug.ExecContext, verbose, ignoreErrors, echo bool, sf shortcutFunc) shell.TextFn {
return func(ctx context.Context, stdout io.Writer, text string) error {
if strings.HasPrefix(strings.TrimSpace(text), shell.CmdPrefix) {
parts := strings.Fields(text)
Expand Down
4 changes: 2 additions & 2 deletions clc/shell/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ func ConvertStatement(ctx context.Context, ec plug.ExecContext, stmt string, ver
func InteractiveHelp() string {
return `
Shortcut Commands:
\di List Indexes
\di MAPPING List Indexes for a specific mapping
\di List Indexes
\di MAPPING List Indexes for a specific mapping
\dm List mappings
\dm MAPPING Display information about a mapping
\dm+ MAPPING Describe a mapping
Expand Down
2 changes: 1 addition & 1 deletion internal/proto/codec/builtin.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ func DecodeListMultiFrameForData(frameIterator *proto.ForwardFrameIterator) []*i
}

func DecodeListMultiFrameForIndexConfig(frameIterator *proto.ForwardFrameIterator) []types.IndexConfig {
result := make([]types.IndexConfig, 0)
var result []types.IndexConfig
if frameIterator.HasNext() {
frameIterator.Next()

Expand Down

0 comments on commit 14bd37b

Please sign in to comment.