feat: --preserve-new-lines (#623)

closes #502
This commit is contained in:
Carlos Alexandro Becker 2024-07-09 09:50:10 -03:00 committed by GitHub
parent fe066f2140
commit d89d79a00c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 17 deletions

View file

@ -35,6 +35,7 @@ var (
style string
width uint
showAllFiles bool
preserveNewLines bool
mouse bool
rootCmd = &cobra.Command{
@ -151,6 +152,7 @@ func validateOptions(cmd *cobra.Command) error {
width = viper.GetUint("width")
mouse = viper.GetBool("mouse")
pager = viper.GetBool("pager")
preserveNewLines = viper.GetBool("preserveNewLines")
// validate the glamour style
style = viper.GetString("style")
@ -332,6 +334,7 @@ func runTUI(workingDirectory string) error {
cfg.GlamourMaxWidth = width
cfg.GlamourStyle = style
cfg.EnableMouse = mouse
cfg.PreserveNewLines = preserveNewLines
// Run Bubble Tea program
if _, err := ui.NewProgram(cfg).Run(); err != nil {
@ -372,7 +375,7 @@ func init() {
rootCmd.Flags().StringVarP(&style, "style", "s", glamour.AutoStyle, "style name or JSON path")
rootCmd.Flags().UintVarP(&width, "width", "w", 0, "word-wrap at width")
rootCmd.Flags().BoolVarP(&showAllFiles, "all", "a", false, "show system files and directories (TUI-mode only)")
rootCmd.Flags().BoolVarP(&preserveNewLines, "preserve-new-lines", "n", false, "preserve newlines in the output")
rootCmd.Flags().BoolVarP(&mouse, "mouse", "m", false, "enable mouse wheel (TUI-mode only)")
_ = rootCmd.Flags().MarkHidden("mouse")
@ -381,6 +384,8 @@ func init() {
_ = viper.BindPFlag("width", rootCmd.Flags().Lookup("width"))
_ = viper.BindPFlag("debug", rootCmd.Flags().Lookup("debug"))
_ = viper.BindPFlag("mouse", rootCmd.Flags().Lookup("mouse"))
_ = viper.BindPFlag("preserveNewLines", rootCmd.Flags().Lookup("preserve-new-lines"))
viper.SetDefault("style", glamour.AutoStyle)
viper.SetDefault("width", 0)

View file

@ -8,6 +8,7 @@ type Config struct {
GlamourMaxWidth uint
GlamourStyle string
EnableMouse bool
PreserveNewLines bool
// Which directory should we start from?
WorkingDirectory string

View file

@ -399,10 +399,15 @@ func glamourRender(m pagerModel, markdown string) (string, error) {
width = 0
}
r, err := glamour.NewTermRenderer(
options := []glamour.TermRendererOption{
utils.GlamourStyle(m.common.cfg.GlamourStyle, isCode),
glamour.WithWordWrap(width),
)
}
if m.common.cfg.PreserveNewLines {
options = append(options, glamour.WithPreservedNewLines())
}
r, err := glamour.NewTermRenderer(options...)
if err != nil {
return "", err
}