Skip to content

Only set buffer type to stdout when no file args are passed #3910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoeKar merged 4 commits into from
Dec 7, 2025
Merged

Only set buffer type to stdout when no file args are passed #3910

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c80e5cd
Only set buffer type to stdout when no file args are passed
AndydeCleyre Nov 13, 2025
4debd29
Make the buffer creation when (no file args, terminal stdin) explicit…
AndydeCleyre Dec 1, 2025
70d9b64
LoadInput: reduce variable scope (input, err)
AndydeCleyre Dec 2, 2025
331c43e
Replace never-assigned var filename with literal empty strings
AndydeCleyre Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions cmd/micro/micro.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,6 @@ func LoadInput(args []string) []*buffer.Buffer {
var err error
buffers := make([]*buffer.Buffer, 0, len(args))

btype := buffer.BTDefault
if !isatty.IsTerminal(os.Stdout.Fd()) {
btype = buffer.BTStdout
}

files := make([]string, 0, len(args))

flagStartPos := buffer.Loc{-1, -1}
Expand Down Expand Up @@ -222,27 +217,34 @@ func LoadInput(args []string) []*buffer.Buffer {
// Option 1
// We go through each file and load it
for i := 0; i < len(files); i++ {
buf, err := buffer.NewBufferFromFileWithCommand(files[i], btype, command)
buf, err := buffer.NewBufferFromFileWithCommand(files[i], buffer.BTDefault, command)
if err != nil {
screen.TermMessage(err)
continue
}
// If the file didn't exist, input will be empty, and we'll open an empty buffer
buffers = append(buffers, buf)
}
} else if !isatty.IsTerminal(os.Stdin.Fd()) {
// Option 2
// The input is not a terminal, so something is being piped in
// and we should read from stdin
input, err = io.ReadAll(os.Stdin)
if err != nil {
screen.TermMessage("Error reading from stdin: ", err)
input = []byte{}
}
buffers = append(buffers, buffer.NewBufferFromStringWithCommand(string(input), filename, btype, command))
} else {
// Option 3, just open an empty buffer
buffers = append(buffers, buffer.NewBufferFromStringWithCommand(string(input), filename, btype, command))
btype := buffer.BTDefault
if !isatty.IsTerminal(os.Stdout.Fd()) {
btype = buffer.BTStdout
}

if !isatty.IsTerminal(os.Stdin.Fd()) {
// Option 2
// The input is not a terminal, so something is being piped in
// and we should read from stdin
input, err = io.ReadAll(os.Stdin)
if err != nil {
screen.TermMessage("Error reading from stdin: ", err)
input = []byte{}
}
buffers = append(buffers, buffer.NewBufferFromStringWithCommand(string(input), filename, btype, command))
} else {
// Option 3, just open an empty buffer
buffers = append(buffers, buffer.NewBufferFromStringWithCommand("", filename, btype, command))
}
}

return buffers
Expand Down