Fix empty file error in json and graphql #4553

ad1992 · 2018-05-26T12:53:21Z

duailibe · 2018-05-26T19:42:00Z

Can't we just do a check here?

Line 249 in fda7bf5

const result = coreFormat(text, opts);

const result = text ? coreFormat(text, opts) : "";

ad1992 · 2018-05-27T06:38:38Z

The specs for graphql_empty_file and json_empty_file are passing in local but not in travis. I am not sure why. Can someone rerun the specs.

j-f1 · 2018-05-27T11:04:30Z

It looks like they’re still failing after a re-run @ad1992.

duailibe · 2018-05-27T11:07:31Z

are passing in local but not in travis

Are you running with AST_COMPARE=1 ?

ad1992 · 2018-06-02T11:33:52Z

@duailibe yes you were right it was due to AST_COMPARE=1. Its fixed now.

duailibe · 2018-06-02T14:44:27Z

tests_config/run_spec.js

@@ -63,14 +63,15 @@ function run_spec(dirname, parsers, options) {
      if (AST_COMPARE) {
        const compareOptions = Object.assign({}, mergedOptions);
        delete compareOptions.cursorOffset;
-        const astMassaged = parse(input, compareOptions);
+        const astMassaged =
+          input && input.trim().length ? parse(input, compareOptions) : {};


This might no be the correct fix for this either... maybe we should handle that in prettier.__debug.parse

I reverted this as it got fixed when I rebased with master.

duailibe · 2018-06-02T14:47:26Z

tests/graphql_empty_file/__snapshots__/jsfmt.spec.js.snap

+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`empty-file.graphql 1`] = `
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Let's keep these tests in tests/empty/.

Just edit tests/empty/jsfmt.spec.js to add graphql and json to the parsers

ad1992 · 2018-06-05T09:16:41Z

@suchipi @duailibe can this be merged ?

duailibe · 2018-06-05T10:48:07Z

Can you fix the lint failure?

ad1992 · 2018-06-05T10:54:38Z

@duailibe I had already run yarn lint --fix so there should not be any lint issue.
size = size + tabWidth - (size % tabWidth); got converted to this when I ran yarn lint --fix
size = size + tabWidth - size % tabWidth;
should I revert it back ?

lydell · 2018-06-05T11:31:10Z

Well, Travis says that the parens should be there: https://travis-ci.org/prettier/prettier/jobs/387448061#L489

Perhaps your local node_modules is out of date? Try running yarn to update. Then I would guess yarn lint --fix would do the right thing.

ad1992 · 2018-06-05T12:57:43Z

Yes node_modules was out of date. Its fixed now.

ad1992 · 2018-06-06T11:38:20Z

@duailibe please review.

duailibe · 2018-06-06T13:41:41Z

Thanks!

185: Update dependency prettier to v1.13.5 r=rehandalal a=renovate[bot] This Pull Request updates dependency [prettier](https://github.com/prettier/prettier) from `v1.13.4` to `v1.13.5` <details> <summary>Release Notes</summary> ### [`v1.13.5`](https://github.com/prettier/prettier/blob/master/CHANGELOG.md#1135) [Compare Source](prettier/prettier@1.13.4...1.13.5) [link](prettier/prettier@1.13.4...1.13.5) - Better handling of trailing spaces in Markdown ([#4593](`https://github.com/prettier/prettier/pull/4593`)) - Fix empty file error in JSON and GraphQL ([#4553](`https://github.com/prettier/prettier/pull/4553`)) - Preserve decorator on TypeScript interfaces ([#4632](`https://github.com/prettier/prettier/pull/4632`)) - Inline \_ or $ in the root of a method chain ([#4621](`https://github.com/prettier/prettier/pull/4621`)) --- </details> --- This PR has been generated by [Renovate Bot](https://renovatebot.com). Co-authored-by: Renovate Bot <[email protected]>

This Pull Request updates dependency [prettier](https://github.com/prettier/prettier) from `v1.13.4` to `v1.13.5` <details> <summary>Release Notes</summary> ### [`v1.13.5`](https://github.com/prettier/prettier/blob/master/CHANGELOG.md#1135) [Compare Source](prettier/prettier@1.13.4...1.13.5) [diff](prettier/prettier@1.13.4...1.13.5) - Better handling of trailing spaces in Markdown ([#4593](`https://github.com/prettier/prettier/pull/4593`)) - Fix empty file error in JSON and GraphQL ([#4553](`https://github.com/prettier/prettier/pull/4553`)) - Preserve decorator on TypeScript interfaces ([#4632](`https://github.com/prettier/prettier/pull/4632`)) - Inline \_ or $ in the root of a method chain ([#4621](`https://github.com/prettier/prettier/pull/4621`)) --- </details> --- This PR has been generated by [Renovate Bot](https://renovatebot.com).

ad1992 force-pushed the aakansha-prettier branch from e4cdd66 to f822770 Compare May 26, 2018 22:09

ad1992 changed the title ~~Fix empty file error in json~~ Fix empty file error in json and graphql May 26, 2018

suchipi approved these changes May 27, 2018

View reviewed changes

Fix empty file error in json and graphql

6966189

fix AST_COMPARE=1 issue

600b83f

ad1992 force-pushed the aakansha-prettier branch from 71fa982 to 600b83f Compare June 2, 2018 11:21

duailibe reviewed Jun 2, 2018

View reviewed changes

ad1992 added 3 commits June 3, 2018 13:51

Merge branch 'master' into aakansha-prettier

c99456c

use tests/empty

310b409

revert

2d262fb

fix lint

1734923

Merge branch 'master' into aakansha-prettier

880599c

duailibe approved these changes Jun 6, 2018

View reviewed changes

duailibe merged commit 8ec5432 into prettier:master Jun 6, 2018

ad1992 deleted the aakansha-prettier branch June 6, 2018 13:48

lock bot added the locked-due-to-inactivity Please open a new issue and fill out the template instead of commenting. label Sep 4, 2018

lock bot locked as resolved and limited conversation to collaborators Sep 4, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix empty file error in json and graphql #4553

Fix empty file error in json and graphql #4553

ad1992 commented May 26, 2018 •

edited by ikatyang

Loading

duailibe commented May 26, 2018 •

edited

Loading

ad1992 commented May 27, 2018 •

edited

Loading

j-f1 commented May 27, 2018

duailibe commented May 27, 2018

ad1992 commented Jun 2, 2018

duailibe Jun 2, 2018

ad1992 Jun 3, 2018

duailibe Jun 2, 2018

ad1992 commented Jun 5, 2018

duailibe commented Jun 5, 2018

ad1992 commented Jun 5, 2018

lydell commented Jun 5, 2018

ad1992 commented Jun 5, 2018

ad1992 commented Jun 6, 2018

duailibe commented Jun 6, 2018

Fix empty file error in json and graphql #4553

Fix empty file error in json and graphql #4553

Conversation

ad1992 commented May 26, 2018 • edited by ikatyang Loading

duailibe commented May 26, 2018 • edited Loading

ad1992 commented May 27, 2018 • edited Loading

j-f1 commented May 27, 2018

duailibe commented May 27, 2018

ad1992 commented Jun 2, 2018

duailibe Jun 2, 2018

Choose a reason for hiding this comment

ad1992 Jun 3, 2018

Choose a reason for hiding this comment

duailibe Jun 2, 2018

Choose a reason for hiding this comment

ad1992 commented Jun 5, 2018

duailibe commented Jun 5, 2018

ad1992 commented Jun 5, 2018

lydell commented Jun 5, 2018

ad1992 commented Jun 5, 2018

ad1992 commented Jun 6, 2018

duailibe commented Jun 6, 2018

ad1992 commented May 26, 2018 •

edited by ikatyang

Loading

duailibe commented May 26, 2018 •

edited

Loading

ad1992 commented May 27, 2018 •

edited

Loading