Updated prettydiff.coffee to support EOL Detection

[peeratant]

What does this implement/fix? Explain your changes.

As stated in Issue 1457, Pretty Diff required "crlf" parameter to set EOL type.

Does this close any currently open issues?

Issue 1457

Previously,this error had been reported by affanshahid in Issue 1009

Any other comments?

This error used the same logic in Issue 707 with some minor changes.

[Glavin001]

The commit should reference the issue, not the code.

• Remove comment

[Glavin001]

Although I see now another commit also incorrect did this:

atom-beautify/src/beautifiers/js-beautify.coffee

Line 32 in c3e554d

options.eol = getDefaultLineEnding() ? options.eol #fixes issue #707

[Glavin001]

• Can you move this into beautifier.coffee along with

  atom-beautify/src/beautifiers/js-beautify.coffee

  Lines 62 to 80 in c3e554d

  	# Retrieves the default line ending based upon the Atom configuration
  	# `line-ending-selector.defaultLineEnding`. If the Atom configuration
  	# indicates "OS Default", the `process.platform` is queried, returning
  	# CRLF for Windows systems and LF for all other systems.
  	# Code modified from atom/line-ending-selector
  	# returns: The correct line-ending character sequence based upon the Atom
  	# configuration, or `null` if the Atom line ending configuration was not
  	# recognized.
  	# see: https://github.com/atom/line-ending-selector/blob/master/lib/main.js
  	getDefaultLineEnding= ->
  	switch atom.config.get('line-ending-selector.defaultLineEnding')
  	when 'LF'
  	return '\n'
  	when 'CRLF'
  	return '\r\n'
  	when 'OS Default'
  	return if process.platform is 'win32' then '\r\n' else '\n'
  	else
  	return null

  ?
  Since they are used in multiple places it should be centralized within the beautifier class.

[Glavin001]

@prettydiff can you confirm the option is named crlf? That seems strange to me, instead of eol.

[prettydiff]

Yes, that is the correct option name and yes eol is a more intelligent name. http://prettydiff.com/documentation.xhtml#crlf

[Glavin001]

• Support custom eol from options. See

  atom-beautify/src/beautifiers/js-beautify.coffee

  Line 32 in c3e554d

  options.eol = getDefaultLineEnding() ? options.eol #fixes issue #707

  for example.

[Glavin001]

• Update options documentation to reflect the eol option support in Pretty Diff

[Glavin001]

• You will need to add eol option to the languages which should support this option, such as https://github.com/Glavin001/atom-beautify/blob/master/src/languages/javascript.coffee#L33

[peeratant]

Okay, I will try to finish this within tomorrow if possible. (Today, I have to clear out my work first)

Check list

• Remove comment
• Add eol option for js, jsx
• Centralize the code

I think I will have to create things like dictionary as well to support alias option name and value.

For example, Create config.json which contains alias data for specific option and make function to convert passing args base on this file.

Ex. Map
Alias name - eol to crlf
Alias val - CRLF ( true ) / LF ( false )

I will submit a pull request first once I finish and then we will discuss about this later.

[Glavin001]

I think I will have to create things like dictionary as well to support alias option name and value.

For example, Create config.json which contains alias data for specific option and make function to convert passing args base on this file.

Ex. Map
Alias name - eol to crlf
Alias val - CRLF ( true ) / LF ( false )

I do not follow what you mean. I do not want you to accidentally do unneeded work so I wanted to make sure you know Atom-Beautify supports different types of options:

• Renaming / alias: see https://github.com/Glavin001/atom-beautify/blob/master/src/beautifiers/prettydiff.coffee#L35-L38 for example
• function mapping: https://github.com/Glavin001/atom-beautify/blob/master/src/beautifiers/prettydiff.coffee#L18-L19
• function mapping with rename and/or dependencies: see https://github.com/Glavin001/atom-beautify/blob/master/src/beautifiers/prettydiff.coffee#L20-L23 and https://github.com/Glavin001/atom-beautify/blob/master/src/beautifiers/prettydiff.coffee#L10-L17

I expect you to have something like "crlf": "eol" option in Pretty Diff and add eol (boolean) option to the respective languages.

I hope that helps!