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

total failure because remove all empty lines #27

Closed
clembo590 opened this issue Nov 17, 2020 · 7 comments · Fixed by #28
Closed

total failure because remove all empty lines #27

clembo590 opened this issue Nov 17, 2020 · 7 comments · Fixed by #28
Labels
bug Something isn't working

Comments

@clembo590
Copy link

First Thank for your plugin. It could / should / will be a great additionnal feature but there are still "big bugs"

I have a file that I have modified just by adding a few empty lines.

when comparing it with your plugin
important: On the top of the picture is the default diff of vscode, on the bottom is the diff made by your plugin

  1. all empty lines are not shown. (which is not a big issue)

Screenshot 2020-11-17 at 13 02 00

  1. when I just click on the "little arrow" to copy from left to right and then save.
    here is what I get: all empty lines of the files have been removed and so my file has been completly changed...

Screenshot 2020-11-17 at 13 05 41

@moshfeu
Copy link
Owner

moshfeu commented Nov 18, 2020

Thanks for reporting this!
I'll try to reproduce and let you know.

@moshfeu
Copy link
Owner

moshfeu commented Nov 18, 2020

I can't reproduce the issue :
video1

Can you share the minimum content of the files that can reproduce the issue?
Also, about the 2nd section, as far as I know, saving shouldn't change the content but only saving the file to the file system. Are you still sure that the content changed after saving? If not, what the steps to reproduce?
Thanks

@clembo590
Copy link
Author

sure:
here is a basic file content:
https://drive.google.com/drive/folders/1Pz3zxWBeXt_a3sayOa5AFbLTU_EWAltM?usp=sharing

Once you have the file, add it a repo. (commit)

then make a change "around end of file" (and do not commit).
then compare it with your plugin.
Screenshot 2020-11-19 at 12 55 04

--> as you can see on the picture (UP IS THE REAL ACTUAL FILE), on line 2 there should be an empy line.
and it s not shown in your plugin....
(I think once this issue is solved then the second issue will "disappear")

@moshfeu
Copy link
Owner

moshfeu commented Nov 21, 2020

@clembo590 can you install this version and tell me if it works as expected for you?
Thanks!

diff-merge-0.4.1.vsix.zip

@moshfeu moshfeu added the bug Something isn't working label Nov 25, 2020
@clembo590
Copy link
Author

Hello @moshfeu
I just checked and it seems to be working PERFECTLY now!
thanks a lot.

@moshfeu
Copy link
Owner

moshfeu commented Nov 25, 2020

So happy to hear :)
I'll publish this fix asap.
Thanks for your collaboration!

@moshfeu
Copy link
Owner

moshfeu commented Nov 25, 2020

Published (0.4.1)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants