Skip to content
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.

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

[Bug] Strange highlight of diff #94

Closed
sm-g opened this issue Dec 29, 2018 · 9 comments
Closed

[Bug] Strange highlight of diff #94

sm-g opened this issue Dec 29, 2018 · 9 comments
Milestone

Comments

@sm-g
Copy link

@sm-g sm-g commented Dec 29, 2018

Fork:

VisualStudio / GitKraken:

@Otiel
Copy link

@Otiel Otiel commented Mar 13, 2019

This is always confusing and that makes me check twice if I didn't mess the first letter of the Import word.

Loading

@sm-g sm-g changed the title Strange highlight of diff [Bug] Strange highlight of diff Mar 13, 2019
@Otiel
Copy link

@Otiel Otiel commented Mar 20, 2019

Here's another one:

image

Only the following text has been added at the end of the file:

## New release

[This template](new-release.md) defines the basic steps that should be followed when creating a new release. It should be copied to each repository and adapted with specific rules if needed.

Loading

@DanPristupov
Copy link
Contributor

@DanPristupov DanPristupov commented Mar 20, 2019

The line [7] used to be ended without \n symbol.

In the update you added \n to the end of [7] and also added some other lines.

The \n symbol is hidden but it also belongs to lines.

Update:

So, in your case the source was like following:

## Git workflow\n
\n
Repositories must follow the git workflow defined [ere](git-forkflow.ms).

And here's the new version:

## Git workflow\n
\n
Repositories must follow the git workflow defined [ere](git-forkflow.ms).\n
## New release\n
\n
[This template](new-release.md) defines the basic steps that should be followed when creating a new release. It should be copied to each repository and adapted with specific rules if needed.

The 'No newline at end of file' hint is important :).

Loading

@Otiel
Copy link

@Otiel Otiel commented Mar 21, 2019

Fair enough for the \n character.

But why is the No newline at end of file displayed twice, and not only once at the end of the diff?

Loading

@DanPristupov
Copy link
Contributor

@DanPristupov DanPristupov commented Mar 21, 2019

Because No newline at end of file is related to the last line, not to the whole diff.

Loading

@jerone
Copy link

@jerone jerone commented Mar 21, 2019

@DanPristupov commented on Mar 21, 2019, 10:55 AM GMT+1:

Because No newline at end of file is related to the last line, not to the whole diff.

It would be nice if that message could be replaced by something visual. Every time I see that message, I wonder if I wrote that 😊

Loading

@Otiel
Copy link

@Otiel Otiel commented Mar 21, 2019

Because No newline at end of file is related to the last line, not to the whole diff.

That makes sense. 👌

Fair enough for the \n character.

Coming back on this, is there any way you could visually highlight the \n? See for instance this diff:

image

Loading

@DanPristupov
Copy link
Contributor

@DanPristupov DanPristupov commented Mar 21, 2019

The algorithmic part is not difficult, however I'm not sure if the AvalonEdit control supports such rendering of \n symbol.

Loading

@DanPristupov DanPristupov added this to the 1.31 milestone Mar 24, 2019
@DanPristupov
Copy link
Contributor

@DanPristupov DanPristupov commented Apr 5, 2019

The original issue fixed in 1.31

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
4 participants