Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: prettier/prettier
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.5.1
Choose a base ref
...
head repository: prettier/prettier
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.5.2
Choose a head ref
  • 19 commits
  • 47 files changed
  • 3 contributors

Commits on Jun 27, 2017

  1. Fix locEnd() for postcss parser (#2295)

    * Fix locEnd() for postcss parser
    
    `node.source` doesn't have an `end`, but `node.nodes[-1].source` does.
    
    Fixes #2267
    
    * Add regression test for #2267
    
    See #2295 (comment)
    
    * Make locEnd() postcss fix more focused
    
    This passes the tests again.
    
    * Use getLast() instead of .slice()
    
    See #2295 (comment)
    
    * Move CSS range test into tests/range_css
    
    This is so that the AST_COMPARE=1 tests don't try to parse CSS with Flow.
    josephfrazier authored and vjeux committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    5f063ab View commit details
    Browse the repository at this point in the history
  2. Allow formatting ranges of JSON (#2298)

    * Add test for #2297
    
    * Add JSON types to isSourceElement()
    
    See #2297
    
    * Avoid expanding format range when possible
    
    This fixes #2297
    
    * Move JSON range test into tests/range_json
    
    This is so that the AST_COMPARE=1 tests don't try to parse JSON with Flow.
    
    * Check parser in isSourceElement()
    
    Otherwise JSON formatting would format weird things inside of JS.
    See #2298 (comment)
    
    * Use arrow functions instead of .bind()
    
    See #2298 (comment)
    
    * Add test of range-formatting JSON identifier
    
    See https://github.com/prettier/prettier/pull/2298/files#r124410750
    
    * Allow range-formatting JSON identifier
    
    See https://github.com/prettier/prettier/pull/2298/files#r124410750
    
    * Fix lint
    josephfrazier authored and vjeux committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    b47c0b4 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2017

  1. Tweak name

    vjeux committed Jun 28, 2017
    Configuration menu
    Copy the full SHA
    850d51a View commit details
    Browse the repository at this point in the history
  2. GraphQL: Remove circular dependency in ast (#2304)

    The tokens are attached to the location via the prototype (so they are not visible when you JSON.stringify) but the various places where we traverse the ast see them. It causes stack overflows and comments that are not printed because they are attached to tokens instead of real nodes.
    
    Fixes #2302
    vjeux authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    4d46a39 View commit details
    Browse the repository at this point in the history
  3. GraphQL: Use spaces instead of commas (#2303)

    "Daniel Schafer: Yeah, that's definitely what I'd describe as the canonical style; anytime you have two "things" on a line, use commas, but if you have a newline it's not needed."
    vjeux authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    189027c View commit details
    Browse the repository at this point in the history
  4. Initial support for GraphQL ObjectTypeDefinition (#2305)

    It appears in some files inside of fb codebase
    vjeux authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    f96fe1e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    af309e3 View commit details
    Browse the repository at this point in the history
  6. Fix master

    vjeux committed Jun 28, 2017
    Configuration menu
    Copy the full SHA
    ee07ff5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    fbf4c3a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    51c7503 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b63e1c2 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    8e31088 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    0a2a099 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    bbf8f76 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    14caabd View commit details
    Browse the repository at this point in the history
  14. GraphQL: Fix directives separator (#2315)

    I couldn't figure out what the separator was, I tried `,`, `on` but none of them worked. Turns out it is `|`!
    vjeux authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    019beb5 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    45c8e40 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    b231948 View commit details
    Browse the repository at this point in the history
  17. 1.5.2

    vjeux committed Jun 28, 2017
    Configuration menu
    Copy the full SHA
    5db9407 View commit details
    Browse the repository at this point in the history
Loading