From 6663bab8a3159f15500fd1c95575f32b2cb170fd Mon Sep 17 00:00:00 2001 From: Christopher Chedeau Date: Sat, 24 Jun 2017 12:23:34 -0700 Subject: [PATCH] Support trailing commas for function calls (#2257) --- src/printer-graphql.js | 1 + .../__snapshots__/jsfmt.spec.js.snap | 45 +++++++++++++++---- tests/graphql_trailing_comma/trailing.graphql | 8 +++- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/src/printer-graphql.js b/src/printer-graphql.js index b5e617103..d1da76366 100644 --- a/src/printer-graphql.js +++ b/src/printer-graphql.js @@ -41,6 +41,7 @@ function genericPrint(path, options, print) { ) ]) ), + options.trailingComma === "none" ? "" : ifBreak(","), softline, ")" ]) diff --git a/tests/graphql_trailing_comma/__snapshots__/jsfmt.spec.js.snap b/tests/graphql_trailing_comma/__snapshots__/jsfmt.spec.js.snap index ee215ae24..5b3084245 100644 --- a/tests/graphql_trailing_comma/__snapshots__/jsfmt.spec.js.snap +++ b/tests/graphql_trailing_comma/__snapshots__/jsfmt.spec.js.snap @@ -1,8 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`trailing.graphql 1`] = ` -fragment Visit on HighlightedVisit - @argumentDefinitions( +query CityGuidesSocialUnitRendererQuery( + $pageID: ID! + $scale: Float + $SOCIAL_UNIT_PROFILE_PICTURE_SIZE: Int + $SOCIAL_UNIT_CARD_SIZE: Int +) @argumentDefinitions( count: {type: "Int", defaultValue: 20, someSuperSuperSuperSuperLongType: 301} test: [{type: "Int", defaultValue: 20, someSuperSuperSuperSuperLongType: 301}] ) { @@ -18,7 +22,12 @@ fragment Visit on HighlightedVisit } } ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -fragment Visit on HighlightedVisit +query CityGuidesSocialUnitRendererQuery( + $pageID: ID!, + $scale: Float, + $SOCIAL_UNIT_PROFILE_PICTURE_SIZE: Int, + $SOCIAL_UNIT_CARD_SIZE: Int +) @argumentDefinitions( count: { type: "Int", @@ -43,8 +52,12 @@ fragment Visit on HighlightedVisit `; exports[`trailing.graphql 2`] = ` -fragment Visit on HighlightedVisit - @argumentDefinitions( +query CityGuidesSocialUnitRendererQuery( + $pageID: ID! + $scale: Float + $SOCIAL_UNIT_PROFILE_PICTURE_SIZE: Int + $SOCIAL_UNIT_CARD_SIZE: Int +) @argumentDefinitions( count: {type: "Int", defaultValue: 20, someSuperSuperSuperSuperLongType: 301} test: [{type: "Int", defaultValue: 20, someSuperSuperSuperSuperLongType: 301}] ) { @@ -60,7 +73,12 @@ fragment Visit on HighlightedVisit } } ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -fragment Visit on HighlightedVisit +query CityGuidesSocialUnitRendererQuery( + $pageID: ID!, + $scale: Float, + $SOCIAL_UNIT_PROFILE_PICTURE_SIZE: Int, + $SOCIAL_UNIT_CARD_SIZE: Int, +) @argumentDefinitions( count: { type: "Int", @@ -85,8 +103,12 @@ fragment Visit on HighlightedVisit `; exports[`trailing.graphql 3`] = ` -fragment Visit on HighlightedVisit - @argumentDefinitions( +query CityGuidesSocialUnitRendererQuery( + $pageID: ID! + $scale: Float + $SOCIAL_UNIT_PROFILE_PICTURE_SIZE: Int + $SOCIAL_UNIT_CARD_SIZE: Int +) @argumentDefinitions( count: {type: "Int", defaultValue: 20, someSuperSuperSuperSuperLongType: 301} test: [{type: "Int", defaultValue: 20, someSuperSuperSuperSuperLongType: 301}] ) { @@ -102,7 +124,12 @@ fragment Visit on HighlightedVisit } } ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -fragment Visit on HighlightedVisit +query CityGuidesSocialUnitRendererQuery( + $pageID: ID!, + $scale: Float, + $SOCIAL_UNIT_PROFILE_PICTURE_SIZE: Int, + $SOCIAL_UNIT_CARD_SIZE: Int, +) @argumentDefinitions( count: { type: "Int", diff --git a/tests/graphql_trailing_comma/trailing.graphql b/tests/graphql_trailing_comma/trailing.graphql index 43e90261a..448a41d57 100644 --- a/tests/graphql_trailing_comma/trailing.graphql +++ b/tests/graphql_trailing_comma/trailing.graphql @@ -1,5 +1,9 @@ -fragment Visit on HighlightedVisit - @argumentDefinitions( +query CityGuidesSocialUnitRendererQuery( + $pageID: ID! + $scale: Float + $SOCIAL_UNIT_PROFILE_PICTURE_SIZE: Int + $SOCIAL_UNIT_CARD_SIZE: Int +) @argumentDefinitions( count: {type: "Int", defaultValue: 20, someSuperSuperSuperSuperLongType: 301} test: [{type: "Int", defaultValue: 20, someSuperSuperSuperSuperLongType: 301}] ) {