racket / drracket

DrRacket, IDE for Racket
http://www.racket-lang.org/
Other
444 stars 93 forks source link

Run Resyntax on drracket/private #612

Closed jackfirth closed 1 year ago

jackfirth commented 1 year ago

This pull request runs Resyntax on all the reasonably-sized files in the drracket/private collection. It doesn't touch any of the huge files in this collection in order to make the pull request easier to review.

This is a repeat attempt of #611. I've made some improvements to Resyntax to address some of the feedback from that pull request. Additionally, this time I committed each run of Resyntax separately with a summary of changes in each commit. This isn't quite the commit-per-rule strategy outlined in https://github.com/jackfirth/resyntax/issues/188, but it's closer.

rfindler commented 1 year ago

Just for my own sanity: are these the uncontroversial changes from the previous pull request or is it better if I read through them all, to be safe?

jackfirth commented 1 year ago

It should be the uncontroversial changes, but you should read through them anyway. The fixes I made to Resyntax to stop it from generating the controversial changes should have worked but double checking is appreciated.

rfindler commented 1 year ago

Is it okay if I merge the changes to the files that don't have comments (ie everything except stick-figures.rkt)?

jackfirth commented 1 year ago

@rfindler I went ahead and fixed the issue in that file so it should all be good to merge now.

rfindler commented 1 year ago

Oh -- it was other parts of the file that weren't indented normally? So the resyntax changes were indented properly but the original lines weren't?

sorawee commented 1 year ago

The whole file is indented by two spaces (more than it should). I believe it's because it was converted from (module ...) to #lang, and whoever converted it didn't want to make a large diff, so they let the indentation stay the same.

sorawee commented 1 year ago

And that person appears to be @rfindler :)

https://github.com/racket/drracket/commit/527675d34314e4141b74874010e5dc2acce672a8

rfindler commented 1 year ago

Yes, that's exactly right, @sorawee . I find large whitespace diffs annoying when looking backwards through the history. This is, however, a tooling problem (or perhaps just a "learn how to use the existing tools, Robby" problem...).

rfindler commented 1 year ago

@jackfirth It looks like this no longer applies cleaning, so I'll tweak it and push it.

rfindler commented 1 year ago

I resolved the conflicts on my machine and pushed it as these commits:

rfindler commented 1 year ago

And thanks!