Browse Source

Fixes issue with whitespace collapsing in decorations

main
Eric Amodio 7 years ago
parent
commit
99d6da9c90
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      src/annotations/annotations.ts

+ 4
- 3
src/annotations/annotations.ts View File

@ -109,14 +109,14 @@ export class Annotations {
} }
static gutter(commit: GitCommit, format: string, dateFormatOrFormatOptions: string | null | ICommitFormatOptions, renderOptions: IRenderOptions): DecorationOptions { static gutter(commit: GitCommit, format: string, dateFormatOrFormatOptions: string | null | ICommitFormatOptions, renderOptions: IRenderOptions): DecorationOptions {
const content = Strings.pad(CommitFormatter.fromTemplate(format, commit, dateFormatOrFormatOptions), 1, 1);
const message = CommitFormatter.fromTemplate(format, commit, dateFormatOrFormatOptions);
return { return {
renderOptions: { renderOptions: {
before: { before: {
...renderOptions.before, ...renderOptions.before,
...{ ...{
contentText: content
contentText: Strings.pad(message.replace(/ /g, GlyphChars.Space), 1, 1)
} }
}, },
dark: { dark: {
@ -210,10 +210,11 @@ export class Annotations {
truncateMessageAtNewLine: true, truncateMessageAtNewLine: true,
dateFormat: dateFormat dateFormat: dateFormat
} as ICommitFormatOptions); } as ICommitFormatOptions);
return { return {
renderOptions: { renderOptions: {
after: { after: {
contentText: Strings.pad(message, 1, 1)
contentText: Strings.pad(message.replace(/ /g, GlyphChars.Space), 1, 1)
}, },
dark: { dark: {
after: { after: {

Loading…
Cancel
Save