walles/moar
1
1
Fork 0
mirror of https://github.com/walles/moar.git synced 2024-10-26 21:13:11 +03:00
Code Issues Projects Releases Wiki Activity

Save some milliseconds on startup

Browse Source 
By starting to read the input stream before we query the terminal for
its background color.
This commit is contained in:
Johan Walles 2024-03-17 00:33:54 +01:00
parent 3661bd24d7
commit caafc5ed12
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
moar.go
View File

@ -690,6 +690,21 @@ func pagerFromArgs(
formatter = formatters.TTY16m
}
var reader *m.Reader
if stdinIsRedirected {
// Display input pipe contents
reader = m.NewReaderFromStreamWithoutStyle("", os.Stdin, formatter, *lexer)
} else {
// Display the input file contents
if len(flagSet.Args()) != 1 {
panic("Invariant broken: Expected exactly one filename")
}
reader, err = m.NewReaderFromFilenameWithoutStyle(flagSet.Args()[0], formatter, *lexer)
if err != nil {
return nil, nil, chroma.Style{}, nil, err
}
}
var style chroma.Style
if *styleOption == nil {
t0 := time.Now()
@ -725,20 +740,7 @@ func pagerFromArgs(
style = **styleOption
}
var reader *m.Reader
if stdinIsRedirected {
// Display input pipe contents
reader = m.NewReaderFromStream("", os.Stdin, style, formatter, *lexer)
} else {
// Display the input file contents
if len(flagSet.Args()) != 1 {
panic("Invariant broken: Expected exactly one filename")
}
reader, err = m.NewReaderFromFilename(flagSet.Args()[0], style, formatter, *lexer)
if err != nil {
return nil, nil, chroma.Style{}, nil, err
}
}
reader.SetStyleForHighlighting(style)
pager := m.NewPager(reader)
pager.WrapLongLines = *wrap