Merged
Conversation
|
This would be very useful to have. |
jcs090218
approved these changes
Jun 23, 2025
There was a problem hiding this comment.
Pull Request Overview
This PR allows users to specify a custom diff program, which is especially useful on systems where GNU diff options (e.g. --strip-trailing-cr) are unavailable. The changes include adding a new customizable variable (prettier-js-diff-command) and updating the call-process-region invocation to use this variable instead of a hardcoded "diff" command.
Comments suppressed due to low confidence (2)
prettier-js.el:57
- Consider clarifying the docstring to indicate that this variable can be set to alternative diff programs (e.g. 'gdiff') on systems where GNU diff is not available.
(defcustom prettier-js-diff-command "diff"
prettier-js.el:194
- Since non-GNU diff tools might not support the '--strip-trailing-cr' argument, consider adding a note in the documentation or making this argument configurable for different diff tools.
(call-process-region (point-min) (point-max) prettier-js-diff-command nil patchbuf nil "-n" "--strip-trailing-cr" "-"
Member
jacksonrayhamilton
approved these changes
Jun 23, 2025
Collaborator
jacksonrayhamilton
left a comment
There was a problem hiding this comment.
Good idea, this will improve cross-platform compat. It might also be nice if we had a note in the README directing BSD users to customize this. However, the code change is already fine, so I'm approving it.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On some systems such as OpenBSD, the
diffprogram does not support some of the features available under GNU diff, e.g.--strip-trailing-cr. AFAIK, there's no way to reproduce the behavior of--strip-trailing-crwithout piping totrorsed(which is probably not ideal).So I think it might make sense to allow specifying diff program, so I can install
gdiffand configure prettier-emacs to use it. This PR basically addprettier-js-diff-commandto defcustom, and use it in place of the existingdiffstring.Thanks!