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

Whitespace cleanup #192

Merged
merged 2 commits into from
Nov 7, 2021
Merged

Whitespace cleanup #192

merged 2 commits into from
Nov 7, 2021

Conversation

turboencabulator
Copy link
Contributor

No description provided.

@EspoTek
Copy link
Owner

EspoTek commented Nov 6, 2021

Always get scared by big whitespace commits.
Here, it looks like you've replaced all the tabs with 4 spaces, including in some files with a CSV-esque format that relies on tabs to delineate (the .tlw files).

Are you sure this won't cause any issues?

@turboencabulator
Copy link
Contributor Author

The only change to the .tlw files was adding a newline at the end-of-file. 2 of the 5 were missing it, so if the other 3 were loading OK then I don't expect any problems from it.

I also added a similar newline to the end of _list.wfl. It's loading OK for me on Linux, I think at worst you'd get an extra empty item at the end of the combo box if the parser gets confused by it (and selecting that empty item would crash it). BTW, I'm brewing up some changes to simplify the parsers, but wanted to get the whitespace fixes in first so there aren't any merge conflicts.

Then there are the two .bat files where I also added the newline but I can't verify if they work. It may need a line in a .gitattributes file to convert their line endings to CRLF on checkout in case Windows gets confused (since previously there was only one line and no newline characters at all). https://serverfault.com/questions/429594/is-it-safe-to-write-batch-files-with-unix-line-endings seems to suggest any line ending problems in batch files are limited to gotos and labels, so I don't expect any problems here.

@EspoTek
Copy link
Owner

EspoTek commented Nov 7, 2021

OK. As long as it's tested, and it serves a useful purpose (avoiding merge conflicts is always nice!) I'm happy to merge.

@EspoTek EspoTek merged commit 1b45b0d into EspoTek:master Nov 7, 2021
@turboencabulator turboencabulator deleted the whitespace branch November 8, 2021 02:55
EspoTek added a commit that referenced this pull request Nov 16, 2021
This reverts commit 591940b.

Revert "Whitespace cleanup (#192)"

This reverts commit 1b45b0d.
turboencabulator added a commit to turboencabulator/Labrador that referenced this pull request Sep 21, 2022
* Fix whitespace at EOL and EOF; replace tabs

* Normalize line endings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants