d4b438b · bat · git.iko.soy

git.iko.soy/bat

Fix padding, add --wrap argument, disable wrap for non-tty. (Fixed)

I'm not quite sure what was up with git on that last commit, but it's all properly committed now.

commitd4b438b9d3211b6382f130309bdd54589908e7bd authoreth-p <32112321+eth-p@users.noreply.github.com> dateSat 12 May 2018, 13:44 (8 years ago) parentcd26d40

3 files changed+43−4

compare with master

unifiedsplit

src/app.rs+18−1 src/printer.rs+24−3 src/style.rs+1

src/app.rs+18−1

@@ -80,6 +80,14 @@ impl App {

8080 .default_value("auto")

8181 .help("When to use the pager"),

8282 )

83+ .arg(

84+ Arg::with_name("wrap")

85+ .long("wrap")

86+ .takes_value(true)

87+ .possible_values(&["character", "never"])

88+ .default_value("character")

89+ .help("When to wrap text"),

90+ )

8391 .arg(

8492 Arg::with_name("list-languages")

8593 .long("list-languages")

@@ -135,7 +143,16 @@ impl App {

135143 true_color: is_truecolor_terminal(),

136144 output_components: self.output_components()?,

137145 language: self.matches.value_of("language"),

138− output_wrap: OutputWrap::Character,

146+ output_wrap: if ! self.interactive_output {

147+ // We don't have the tty width when piping to another program.

148+ // There's no point in wrapping when this is the case.

149+ OutputWrap::None

150+ } else {

151+ match self.matches.value_of("wrap") {

152+ Some("character") => OutputWrap::Character,

153+ Some("never") | _ => OutputWrap::None,

154+ }

155+ },

139156 colored_output: match self.matches.value_of("color") {

140157 Some("always") => true,

141158 Some("never") => false,

src/printer.rs+24−3

@@ -94,7 +94,7 @@ impl<'a> Printer<'a> {

9494 regions: &[(highlighting::Style, &str)],

9595 ) -> Result<()> {

9696 let mut cursor: usize = 0;

97− let mut cursor_max: usize = self.config.term_width - 2;

97+ let mut cursor_max: usize = self.config.term_width;

9898

9999 // Line decoration.

100100 let decorations = self.gen_decorations(line_number);

@@ -116,6 +116,27 @@ impl<'a> Printer<'a> {

116116 // Grid border.

117117 let border = if gutter_width > 0 && self.config.output_components.grid() {

118118 self.gen_border()

119+ } else {

120+ PrintSegment {

121+ size: 0,

122+ text: "".to_owned(),

123+ }

124+ };

125+

126+ cursor_max -= border.size;

127+ write!(self.handle, "{}", border.text)?;

128+

129+ // Line contents.

130+ if self.config.output_wrap == OutputWrap::None {

131+ let true_color = self.config.true_color;

132+ let colored_output = self.config.colored_output;

133+

134+ write!(self.handle, "{}",

135+ regions.iter()

136+ .map(|&(style, text)| as_terminal_escaped(style, text, true_color, colored_output))

137+ .collect::<Vec<_>>()

138+ .join(" ")

139+ )?;

119140 } else {

120141 for &(style, text) in regions.iter() {

121142 let mut chars = text.chars().filter(|c| *c != '\n');

@@ -136,7 +157,7 @@ impl<'a> Printer<'a> {

136157 style,

137158 &*text,

138159 self.config.true_color,

139− self.config.colored_output

160+ self.config.colored_output,

140161 )

141162 )?;

142163 break;

@@ -155,7 +176,7 @@ impl<'a> Printer<'a> {

155176 style,

156177 &*text,

157178 self.config.true_color,

158− self.config.colored_output

179+ self.config.colored_output,

159180 ),

160181 " ".repeat(gutter_width),

161182 border.text.to_owned()

src/style.rs+1

@@ -16,6 +16,7 @@ pub enum OutputComponent {

1616#[derive(Debug, Eq, PartialEq, Copy, Clone, Hash)]

1717pub enum OutputWrap {

1818 Character,

19+ None

1920}

2021

2122impl OutputComponent {