From d286f4d6ab2d846d4b08674a260b783c701fe074 Mon Sep 17 00:00:00 2001 From: sawka Date: Wed, 23 Nov 2022 14:34:49 -0800 Subject: [PATCH] checkpoint, add winsize to uicontext --- pkg/comp/comp.go | 2 +- pkg/scpacket/scpacket.go | 1 + pkg/shparse/shparse_test.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/comp/comp.go b/pkg/comp/comp.go index 9531479bf..e1fdf720d 100644 --- a/pkg/comp/comp.go +++ b/pkg/comp/comp.go @@ -525,7 +525,7 @@ func fixupVarPrefix(varPrefix string) string { func DoCompGen(ctx context.Context, cmdStr utilfn.StrWithPos, compCtx CompContext) (*CompReturn, *utilfn.StrWithPos, error) { words := shparse.Tokenize(cmdStr.Str) cmds := shparse.ParseCommands(words) - compPos := shparse.FindCompletionPos(cmds, cmdStr.Pos, 0) + compPos := shparse.FindCompletionPos(cmds, cmdStr.Pos) fmt.Printf("comppos: %v\n", compPos) if compPos.CompType == shparse.CompTypeInvalid { return nil, nil, nil diff --git a/pkg/scpacket/scpacket.go b/pkg/scpacket/scpacket.go index c27d367c5..292cc85ea 100644 --- a/pkg/scpacket/scpacket.go +++ b/pkg/scpacket/scpacket.go @@ -55,6 +55,7 @@ type UIContextType struct { WindowId string `json:"windowid"` Remote *sstore.RemotePtrType `json:"remote,omitempty"` TermOpts *packet.TermOpts `json:"termopts,omitempty"` + WinSize *WinSize `json:"winsize,omitempty"` } type FeInputPacketType struct { diff --git a/pkg/shparse/shparse_test.go b/pkg/shparse/shparse_test.go index e98064c10..8ca32cc21 100644 --- a/pkg/shparse/shparse_test.go +++ b/pkg/shparse/shparse_test.go @@ -135,7 +135,7 @@ func testCompPos(t *testing.T, cmdStr string, compType string, hasCommand bool, cmdSP := utilfn.ParseToSP(cmdStr) words := Tokenize(cmdSP.Str) cmds := ParseCommands(words) - cpos := FindCompletionPos(cmds, cmdSP.Pos, 0) + cpos := FindCompletionPos(cmds, cmdSP.Pos) fmt.Printf("testCompPos [%d] %q => [%s] %v\n", cmdSP.Pos, cmdStr, cpos.CompType, cpos) if cpos.CompType != compType { t.Errorf("testCompPos %q => invalid comp-type %q, expected %q", cmdStr, cpos.CompType, compType)