Skip to content

Add regex to dedent else and friends - #6497

Merged
Kim-Adeline Miguel (kimadeline) merged 23 commits into
microsoft:masterfrom
kimadeline:6333-dedent-else
Jul 12, 2019
Merged

Add regex to dedent else and friends#6497
Kim-Adeline Miguel (kimadeline) merged 23 commits into
microsoft:masterfrom
kimadeline:6333-dedent-else

Conversation

@kimadeline

@kimadeline Kim-Adeline Miguel (kimadeline) commented Jul 8, 2019

Copy link
Copy Markdown

For #6333

  • Dedent else (and elif while we're at it)
  • Remove unnecessary rule now that we introduced the indentationRules key
  • Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR)
  • Title summarizes what is changing
  • Has a news entry file (remember to thank yourself!)
  • [n/a] Appropriate comments and documentation strings in the code
  • [n/a] Has sufficient logging.
  • [n/a] Has telemetry for enhancements.
  • Unit tests & system/integration tests are added/updated
  • [n/a] Test plan is updated as appropriate
  • [n/a] package-lock.json has been regenerated by running npm install (if dependencies have changed)
  • [n/a] The wiki is updated with any design decisions/details.

brettcannon
Brett Cannon (brettcannon) reviewed Jul 8, 2019
View reviewed changes
Comment thread src/client/language/languageConfiguration.ts Outdated
brettcannon
Brett Cannon (brettcannon) previously requested changes Jul 8, 2019
View reviewed changes
Comment thread src/client/language/languageConfiguration.ts Outdated
@brettcannon Brett Cannon (brettcannon) changed the title Add regex to dedent else Add regex to dedent else and friends Jul 9, 2019
@brettcannon

Brett Cannon (brettcannon) commented Jul 9, 2019 •
edited
Loading

Copy link
Copy Markdown
Member

Going through Python's grammar, here is the thinking:

Dedent the following line after the statement

  • break
  • continue
  • pass
  • raise
  • return (although check if it still indents if an dangling/open [, e.g.
return [  # Does the following line still get indented (which is what we want)?

Indent the the following line after the statement

  • \
  • if
  • while
  • for
  • try
  • with
  • def
  • class
  • async def
  • async for
  • async with

Dedent the statement line itself while still indenting the following line

  • elif
  • else
  • except
  • finally

@kimadeline

Kim-Adeline Miguel (kimadeline) commented Jul 9, 2019

Copy link
Copy Markdown
Author

Make sure #4241 and #3284 are not impacted

@brettcannon Brett Cannon (brettcannon) mentioned this pull request Jul 10, 2019
Closed
7 tasks
ericsnowcurrently
Eric Snow (ericsnowcurrently) suggested changes Jul 11, 2019
View reviewed changes

@ericsnowcurrently Eric Snow (ericsnowcurrently) left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly LGTM. Everything looks correct. I just have a few comments relative to helping out readers.

Comment thread src/client/language/languageConfiguration.ts Outdated
Comment thread src/client/language/languageConfiguration.ts Outdated
Comment thread src/client/language/languageConfiguration.ts Outdated
Comment thread src/client/language/languageConfiguration.ts Outdated
Comment thread src/client/language/languageConfiguration.ts Outdated
Comment thread src/client/language/languageConfiguration.ts Outdated
Comment thread src/test/language/languageConfiguration.unit.test.ts Outdated
Comment thread src/test/language/languageConfiguration.unit.test.ts
Comment thread src/test/language/languageConfiguration.unit.test.ts Outdated
Comment thread src/test/language/languageConfiguration.unit.test.ts Outdated
ericsnowcurrently
Eric Snow (ericsnowcurrently) reviewed Jul 11, 2019
View reviewed changes
Comment thread src/client/language/languageConfiguration.ts Outdated
ericsnowcurrently
Eric Snow (ericsnowcurrently) approved these changes Jul 12, 2019
View reviewed changes

@ericsnowcurrently Eric Snow (ericsnowcurrently) left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@kimadeline
Kim-Adeline Miguel (kimadeline) merged commit 2454423 into microsoft:master Jul 12, 2019
@kimadeline
Kim-Adeline Miguel (kimadeline) deleted the 6333-dedent-else branch July 12, 2019 16:16
This was referenced Jul 12, 2019
Closed
Closed
@lock lock Bot locked as resolved and limited conversation to collaborators Jul 29, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@brettcannon Brett Cannon (brettcannon) Awaiting requested review from brettcannon
1 more reviewer
@ericsnowcurrently Eric Snow (ericsnowcurrently) ericsnowcurrently approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kimadeline @brettcannon @ericsnowcurrently