fix #906. New unformatted_tag_content option. #1081

mykytak · 2016-12-25T23:37:54Z

Fix for #906

New option for unformatted content: unformatted_tag_content. Usage same as for unformatted, console short version: -utc.

Parser now has new tag_type: UNFORMATTED. It parses content inside tag but process tag itself as separate tag_type instead of getting them as raw text.

bitwiseman · 2016-12-26T19:59:00Z

@mykytak - #1080 was submitted first, so I'm going to evaluate their PR first. You have better tests but also a more complex implementation.

mykytak · 2016-12-26T22:24:15Z

@bitwiseman His solution is not working with js/lib/cli.js calls. I got same 4 days ago and did'n push because of this. Tests run ok, beautify-html run ok but cli fails (didn't set \n before closing body tag). That's why my solution is more complex.

bitwiseman · 2016-12-26T22:39:34Z

@mykytak - please provide an example? How can I see the failure?

mykytak · 2016-12-26T23:53:41Z

@bitwiseman You can use code from #1080, I got same code and same result.
test.html:

<body><h1>Heading</h1><script>var formatMe = function() { return false; };</script><style>.format-disabled { display: none; } </style></body>

run $ node js/lib/cli.js -T script -T style test.html -o res.html
after this res.html will be

<body>
    <h1>Heading</h1>
    <script>var formatMe = function() { return false; };</script>
    <style>.format-disabled { display: none; } </style></body>

bitwiseman · 2016-12-27T00:20:24Z

When I run the test you outlined on ( b3798f1) it comes out:

<body>
    <h1>Heading</h1>
    <script>var formatMe = function() { return false; };</script>
    <style>.format-disabled { display: none; } </style>
</body>

What platform are you running on?

bitwiseman · 2016-12-27T00:22:47Z

(Note: I did find an unrelated bug while testing this, so thank you there. 😄 )

mykytak · 2016-12-27T00:28:15Z

@bitwiseman Ubuntu14, 64bit

mykytak · 2016-12-27T01:04:23Z

@bitwiseman I'll send you virtualbox files.

bitwiseman · 2016-12-27T01:19:59Z

@mykytak - Could you export JSBEAUTIFY_DEBUG=yes and then send me the debug output? That should take less time.

mykytak · 2016-12-27T01:29:56Z

@bitwiseman

executable type: cli.js
parsed type: undefined
type defaulted: cli.js
files.length 1
{ content_unformatted: [ 'script', 'style' ],
  outfile: '/vagrant/res.html',
  argv: 
   { remain: [ 'test.html' ],
     cooked: 
      [ '--content_unformatted',
        'script',
        '--content_unformatted',
        'style',
        'test.html',
        '--outfile',
        'res.html' ],
     original: [ '-T', 'script', '-T', 'style', 'test.html', '-o', 'res.html' ] },
  indent_size: 4,
  indent_char: ' ',
  indent_level: 0,
  indent_with_tabs: false,
  preserve_newlines: true,
  max_preserve_newlines: 10,
  jslint_happy: false,
  space_after_anon_function: false,
  brace_style: 'collapse',
  keep_array_indentation: false,
  keep_function_indentation: false,
  space_before_conditional: true,
  break_chained_methods: false,
  eval_code: false,
  unescape_strings: false,
  wrap_line_length: 0,
  type: 'cli.js',
  files: [ '/vagrant/test.html' ] }
beautified res.html

bitwiseman · 2016-12-27T01:58:04Z

Hmm, I was wrong, no help there.

mykytak · 2016-12-27T02:27:09Z

@bitwiseman check your inbox, I create ssh tunnel into my machine and sent you instructions.

bitwiseman · 2016-12-27T06:10:08Z

@mykytak - looked. I can see the repro, but I'm not spotting the source of the issue. I'm not sure why it would only show up in the CLI.

Tried node 0.10.48 on OSX - no repro.

It is late here, I'll take a look at this in the next couple days.

arai-a · 2016-12-27T06:16:08Z

what happens if you use -U instead of -T ?
newline after tag should be handled samely between unformatted and content_unformatted.
do you get newline after </style> ?

arai-a · 2016-12-27T06:20:29Z

sorry, I meant, run without -T, not with -U
(I was thinking in reverse way

adding -T shouldn't change the handling of newline after tag

bitwiseman · 2016-12-28T18:00:53Z

@mykytak - I can't repro this except on the vm you provided. It certainly shows a shortcoming of the debug output that I can't figure out why the outputs differ, but that is a separate issue. I'm going to accept #1080.

bitwiseman · 2016-12-29T05:44:15Z

I'm sorry you feel that your PR was not given the appropriate consideration. I hope you will continue to contribute beyond this one PR.

mykytak added 3 commits December 26, 2016 01:11

fix #906. New unformatted_tag_content option.

86b6d13

cleanup

d34fdfe

fix formatting

8f9ffaf

This was referenced Dec 26, 2016

Beautify script/style tags but ignore their inner JS/CSS content #906

Closed

Add content_unformatted config to avoid formatting content of an element (fix #906) #1080

Merged

bitwiseman closed this Dec 28, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix #906. New unformatted_tag_content option. #1081

fix #906. New unformatted_tag_content option. #1081

mykytak commented Dec 25, 2016 •

edited

Loading

bitwiseman commented Dec 26, 2016

mykytak commented Dec 26, 2016 •

edited

Loading

bitwiseman commented Dec 26, 2016

mykytak commented Dec 26, 2016 •

edited

Loading

bitwiseman commented Dec 27, 2016

bitwiseman commented Dec 27, 2016

mykytak commented Dec 27, 2016

mykytak commented Dec 27, 2016

bitwiseman commented Dec 27, 2016

mykytak commented Dec 27, 2016 •

edited

Loading

bitwiseman commented Dec 27, 2016

mykytak commented Dec 27, 2016

bitwiseman commented Dec 27, 2016 •

edited

Loading

arai-a commented Dec 27, 2016

arai-a commented Dec 27, 2016

bitwiseman commented Dec 28, 2016

bitwiseman commented Dec 29, 2016

fix #906. New unformatted_tag_content option. #1081

fix #906. New unformatted_tag_content option. #1081

Conversation

mykytak commented Dec 25, 2016 • edited Loading

bitwiseman commented Dec 26, 2016

mykytak commented Dec 26, 2016 • edited Loading

bitwiseman commented Dec 26, 2016

mykytak commented Dec 26, 2016 • edited Loading

bitwiseman commented Dec 27, 2016

bitwiseman commented Dec 27, 2016

mykytak commented Dec 27, 2016

mykytak commented Dec 27, 2016

bitwiseman commented Dec 27, 2016

mykytak commented Dec 27, 2016 • edited Loading

bitwiseman commented Dec 27, 2016

mykytak commented Dec 27, 2016

bitwiseman commented Dec 27, 2016 • edited Loading

arai-a commented Dec 27, 2016

arai-a commented Dec 27, 2016

bitwiseman commented Dec 28, 2016

bitwiseman commented Dec 29, 2016

mykytak commented Dec 25, 2016 •

edited

Loading

mykytak commented Dec 26, 2016 •

edited

Loading

mykytak commented Dec 26, 2016 •

edited

Loading

mykytak commented Dec 27, 2016 •

edited

Loading

bitwiseman commented Dec 27, 2016 •

edited

Loading