Skip to content

Preserve newlines between try/catch/finally, if/else, do/while #39280

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jun 26, 2020

Conversation

andrewbranch
Copy link
Member

Fixes #38017

@andrewbranch andrewbranch changed the title Preserve newlines between try/catch, if/else, do/while Preserve newlines between try/catch/finally, if/else, do/while Jun 26, 2020
@andrewbranch andrewbranch merged commit 3d22a4f into microsoft:master Jun 26, 2020
cangSDARM added a commit to cangSDARM/TypeScript that referenced this pull request Jun 28, 2020
* upstream/master:
  LEGO: check in for master to temporary branch.
  Preserve newlines between try/catch/finally, if/else, do/while (microsoft#39280)
  not narrow static property without type annotation in constructor. (microsoft#39252)
  Switch to ES Map/Set internally (microsoft#33771)
  fix(38840): omit completions for a spread like argument in a function definition (microsoft#38897)
  fix(38785): include in NavigationBar child items from default exported functions (microsoft#38915)
  LEGO: check in for master to temporary branch.
  LEGO: check in for master to temporary branch.
  Avoid effect of element access expression (microsoft#39174)
  Update typescript-eslint to 3.4.1-alpha.1 (microsoft#39260)
  Handle 'keyof' for generic tuple types (microsoft#39218)
  Disable unsound T[K] rule in subtype relations (microsoft#39249)
  LEGO: check in for master to temporary branch.
  Upgrade typescript-eslint version (microsoft#39242)
  Handle recursive type references up to a certain level of expansion in inference (microsoft#38011)
  Do not consider binding patterns in contextual types for return type inference where all the signature type parameters have defaults (microsoft#39081)
  LEGO: check in for master to temporary branch.

# Conflicts:
#	src/compiler/program.ts
#	src/compiler/types.ts
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactor changes if/else formatting
3 participants