Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-22 16:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

add codeview command

Browse Source
This commit is contained in:
sawka 2023-09-05 22:09:24 -07:00
parent d84dd75d94
commit 1d77b2d5d6
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/cmdrunner/cmdrunner.go
View File

@ -218,7 +218,9 @@ func init() {
registerCmdFn("edit:test", EditTestCommand)
// CodeEditCommand is overloaded to do codeedit and codeview
registerCmdFn("codeedit", CodeEditCommand)
registerCmdFn("codeview", CodeEditCommand)
}
func getValidCommands() []string {
@ -3184,17 +3186,17 @@ func ViewTestCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (sst
func CodeEditCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (sstore.UpdatePacket, error) {
if len(pk.Args) == 0 {
return nil, fmt.Errorf("/codeedit requires an argument (file name)")
return nil, fmt.Errorf("%s requires an argument (file name)", GetCmdStr(pk))
}
// TODO more error checking on filename format?
if pk.Args[0] == "" {
return nil, fmt.Errorf("/codeedit argument cannot be empty")
return nil, fmt.Errorf("%s argument cannot be empty", GetCmdStr(pk))
}
ids, err := resolveUiIds(ctx, pk, R_Session|R_Screen|R_RemoteConnected)
if err != nil {
return nil, err
}
outputStr := fmt.Sprintf("codeedit %q", pk.Args[0])
outputStr := fmt.Sprintf("%s %q", GetCmdStr(pk), pk.Args[0])
cmd, err := makeStaticCmd(ctx, GetCmdStr(pk), ids, pk.GetRawStr(), []byte(outputStr))
if err != nil {
// TODO tricky error since the command was a success, but we can't show the output
@ -3210,9 +3212,18 @@ func CodeEditCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (sst
lineState := make(map[string]any)
lineState["prompt:source"] = "file"
lineState["prompt:file"] = pk.Args[0]
if GetCmdStr(pk) == "codeview" {
lineState["mode"] = "view"
} else {
lineState["mode"] = "edit"
}
// TODO better error checking for lang
if pk.Kwargs["lang"] != "" && len(pk.Kwargs["lang"]) <= 50 {
lineState["lang"] = pk.Kwargs["lang"]
}
err = sstore.UpdateLineState(ctx, ids.ScreenId, update.Line.LineId, lineState)
if err != nil {
return nil, fmt.Errorf("/codeedit error updating line state: %v", err)
return nil, fmt.Errorf("%s error updating line state: %v", GetCmdStr(pk), err)
}
update.Line.LineState = lineState
update.Interactive = pk.Interactive

2
pkg/cmdrunner/shparse.go
View File

@ -26,6 +26,8 @@ var BareMetaCmds = []BareMetaCmdDecl{
BareMetaCmdDecl{"connect", "cr"},
BareMetaCmdDecl{"clear", "clear"},
BareMetaCmdDecl{"reset", "reset"},
BareMetaCmdDecl{"codeedit", "codeedit"},
BareMetaCmdDecl{"codeview", "codeview"},
}
const (