Unable to "Stage Hunk" in JS files

[asafmjul]

Hi,

When clicking "Stage Hunk" in JS files - nothing happens. Also, no console errors.

"Stage Hunk" works for other file types (for example PHP).

Latest GitHub package (0.30.0) and Atom (1.40.1) versions.

Thanks,
Asaf

[rsese]

Thanks for the report!

Please use the issue template when opening issues, the information and format of the template is super helpful for us when triaging issues - some questions for you based on the template:

• Can you reproduce in safe mode?
• What operating system are you running?
• Do you have specific step-by-step instructions to reproduce?

Also, can you reproduce with any JavaScript files or just a particular one? Does it matter what repository you're working on?

Lastly, is this problem new for you as of Atom 1.40?

[asafmjul]

Sorry about that.

So:

• Yes, I can reproduce it in safe mode
• Windows 10 Pro
• Video: https://www.loom.com/share/a30aa3f636ca4d2baf7093750ef90270
• I tried with a new JS file and it worked, so I guess it is only with a specific file
• I have only one repository
• I don't know if the problem is new, only recently I started using this feature

Thanks,
Asaf

[asafmjul]

Hi

Is my description good enough?

Thanks,
Asaf

[rsese]

Thanks for the ping, we can get caught up in a number of other issues and discussions:

• I tried with a new JS file and it worked, so I guess it is only with a specific file

Are you able to share the file? Also, is it any changes to the file where you can't stage hunks or just the particular changes you were making at the time?

[asafmjul]

Hi there,

Thanks.

Any changes.

The file is attached.

script.zip

[rsese]

Thanks for sharing the file - I was unable to reproduce on Windows 10 with Atom 1.40.1, I just cut lines 9 - 11 and pasted them at line 142. Staging those 2 hunks worked ok.

I did notice however that I was unable to stage the hunks on macOS 10.14.6 but I did see an error in console in this case:

<embedded>:14 Uncaught (in promise) GitError: git apply --cached - in /Users/rsese/sandbox/test-github-2259 exited with code 1
stdout: 
stderr: error: patch failed: script.js:599
error: script.js: patch does not apply

    at new GitError (/Applications/Atom.app/Contents/Resources/app/static/<embedded>:14:2440993)
    at Promise (/Applications/Atom.app/Contents/Resources/app/static/<embedded>:14:2446123)

Then I searched previous issues and found this one: #1450.

Looking at the file you shared, I see it had CRLF line endings so once I converted them to LF with Line Ending Selector: Show and choosing LF, I was able to stage hunks for that file on macOS.

Do the other files that you don't have a problem with use LF line endings?

[asafmjul]

Thank you,

I see all my other files are "Mixed".

I tried to change to LF - it counts it as I changed the whole file. When I try to stage the whole file as "hunk" again nothing happens.

Maybe I need to first commit the file for the first time as LF and then try again?

I'm a bit afraid as I have no experience with playing with line endings types - can it do something to our site?

[rsese]

I would recommend testing on a copy of your repository just to be safe but it does seem like there's something else going on since I can't reproduce the problem you're seeing with that file on Windows 10.

Can you test by creating a brand new repository and adding that one file and see if you still have the same problem?

[wadethestealth]

@asafmjul line endings should have no visual affects to javascript files and php files, and should therefore remain the same to whatever you may be using them for. It is also likely that you would have to commit them first before stage hunk would work again. In general you/your team should only use one line-ending type to prevent os incompatibilities.