Skip to content

Merge master to features/embeddedRegex#27732

Merged
5 commits merged intofeatures/embeddedRegexfrom
merges/master-to-features/embeddedRegex
Jun 11, 2018
Merged

Merge master to features/embeddedRegex#27732
5 commits merged intofeatures/embeddedRegexfrom
merges/master-to-features/embeddedRegex

Conversation

@dotnet-bot
Copy link
Copy Markdown
Collaborator

This is an automatically generated pull request from master into features/embeddedRegex.

git fetch --all
git checkout merges/master-to-features/embeddedRegex
git reset --hard upstream/features/embeddedRegex
git merge upstream/master
# Fix merge conflicts
git commit
git push merges/master-to-features/embeddedRegex --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

TIHan and others added 5 commits April 30, 2018 11:18
This bug ocurred because the height was calculated too early. We can't rely on `view.LineHeight` too early because Visual Studio may still change it depending on your `Font Settings` or `Editor Zoom %`.

I've also done some refactoring & removed the comments because they are no longer needed.
Fix for #2128 (Outlining cuts off closing } )
Raise events when connecting or disconnecting from a workspace for semantic changed
Copy link
Copy Markdown

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Auto-approval

@ghost ghost merged commit 9bc2688 into features/embeddedRegex Jun 11, 2018
@ghost ghost deleted the merges/master-to-features/embeddedRegex branch June 11, 2018 21:30
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 11, 2018 22:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 11, 2018 22:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 11, 2018 23:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 11, 2018 23:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 11, 2018 23:15
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 11, 2018 23:15
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 00:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 00:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 01:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 01:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 02:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 02:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 03:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 03:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 04:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 04:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 05:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 05:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 06:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 06:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 07:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 07:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 08:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 08:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 09:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 09:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 10:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 10:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 11:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 11:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 12:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 12:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 13:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 13:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 14:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 14:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 15:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 15:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 16:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 16:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 17:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 17:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 18:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 18:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 19:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 19:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedRegex branch June 12, 2018 20:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedRegex branch June 12, 2018 20:00
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants