Skip to content

Merging master into features/embeddedJson#26634

Merged
jcouv merged 369 commits intofeatures/embeddedJsonfrom
master
May 4, 2018
Merged

Merging master into features/embeddedJson#26634
jcouv merged 369 commits intofeatures/embeddedJsonfrom
master

Conversation

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor

No description provided.

dpoeschl and others added 30 commits April 19, 2018 15:19
Leading/trailing decorative text can interfere with the pattern
matcher's ability to find/bold matching spans and add redundant items to
the MRU list.
…nce. (#25865)

* Initial UseConditional work.

* Initial UseConditional work.

* Working replacement.

* Extract common code.

* Make 'var' work properly in the simplifier service.

* Move types to their own files.

* Provide a way to create types that are not simplified to 'var'.

* Update test options.

* Update test.

* Move CSharp code style code down to the Workspace layer.

* Rename config value.

* Add ui options.

* Add VB ui options.

* Add VB support

* Strip trivia

* Initial stubs for 'use conditional for returns'

* Add VB impl.

* Only support processing of real trees.

* Actually assign variable.

* Don't assume a single variable.

* Share more code.

* Fix shared code.

* Add check.

* Simplify code.

* Only the analyzer needs to check the severity.

* Generalize loc strings.

* remove static.

* Remove unneeded methods.

* Do cheap checks first.

* Handle more cases.

* Handle more cases.

* Add test.

* Add tests.

* Add test.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Fix tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Format multiline conditions.

* Add multiline formatting for VB.

* Move code.

* Simpler formilization of casts.

* Extract out code.

* Remove file.

* Move files.

* Share more code.

* Share more code.

* Break out types.

* Share more code.

* Add more tests.

* Add VB tests.

* Simplify.

* Add comment.

* Remove newlines.

* Move method.

* Move method.

* Add comments.

* Simplify

* Update comment.

* Update comment.

* Remove line.

* Update comment.

* Update comment.

* Update comment.

* Fix comment.

* Wrap long lines.

* Wrap long lines.

* Wrap long lines.

* Handle trivia.

* Simplify.

* Fix check.

* better support for else-if chains.

* Add comments.

* Remove 'Use Conditional Expressoin'

* Remove more vestiges of
 feature.

* Remove code.

* Add back newline.
* move back to debug assert.

realized why this was debug assert. if user kills OOP explicitly, connection can disconnect without us explicitly disposing it. especially for connection that kept alive (KeepAliveConnection). that is why this was debug assert.

moving back to debug assert.

* updated wording on assert
Now that System.Threading.Tasks.Extensions is referenced, the documentation can
contain direct links to ValueTask<TResult>.
Changing some IDE tests from async void to Task
Fixing NullReferenceException inside ConvertToInterpolatedString
# Conflicts:
#	src/NuGet/Bootstrap.csproj
#	src/NuGet/BuildNuGets.csx
Don't try to create a XamlProject for a null hierarchy.
* Initial UseConditional work.

* Initial UseConditional work.

* Working replacement.

* Extract common code.

* Make 'var' work properly in the simplifier service.

* Move types to their own files.

* Provide a way to create types that are not simplified to 'var'.

* Update test options.

* Update test.

* Move CSharp code style code down to the Workspace layer.

* Rename config value.

* Add ui options.

* Add VB ui options.

* Add VB support

* Strip trivia

* Initial stubs for 'use conditional for returns'

* Add VB impl.

* Only support processing of real trees.

* Actually assign variable.

* Don't assume a single variable.

* Share more code.

* Fix shared code.

* Add check.

* Simplify code.

* Only the analyzer needs to check the severity.

* Generalize loc strings.

* remove static.

* Remove unneeded methods.

* Do cheap checks first.

* Handle more cases.

* Handle more cases.

* Add test.

* Add tests.

* Add test.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Fix tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Add tests.

* Format multiline conditions.

* Add multiline formatting for VB.

* Move code.

* Simpler formilization of casts.

* Extract out code.

* Remove file.

* Move files.

* Share more code.

* Share more code.

* Break out types.

* Share more code.

* Add more tests.

* Add VB tests.

* Simplify.

* Add comment.

* Remove newlines.

* Move method.

* Move method.

* Add comments.

* Simplify

* Update comment.

* Update comment.

* Remove line.

* Update comment.

* Update comment.

* Update comment.

* Fix comment.

* Wrap long lines.

* Wrap long lines.

* Wrap long lines.

* Handle trivia.

* Simplify.

* Fix check.

* better support for else-if chains.

* Add comments.

* Remove 'Use Conditional Expressoin'

* Remove more vestiges of
 feature.

* Remove code.

* Add back newline.

* Remove helper.  The simplifier will do the right thing now.

* try to use var first, before removing casts.

* Update tests.
Skipping GenerateMethodInClosedFile with recurring failures
Fix race condition in SolutionExplorer_InProc.OpenFile
…exts

Make sure we always subscribe to shared hierarchy eventing
Need to thread through the official build value to ensure packages are
built with the correct prerelease modifiers (beta, async, etc ...)
instead of simply dev.
Build NuGet with correct prerelease tags
sharwell and others added 13 commits May 3, 2018 18:21
VisualStudioRuleSetManager acts a single global cache for the contents
of rule set files, and also offers eventing if the effective contents
change. This was previously only being called on the UI thread
everywhere, but it won't be much sooner.

Now that we have ReferenceCountedDisposable, I also take advantage of
that type to change how we do caching: previously, we would keep filling
this cache until the solution close, and then we'd clear out everything
at once. There are two things that aren't great about this pattern:

1. It's a small memory leak, at least up until solution close if you
   stopped using a rule set -- we'll keep holding onto it until we
   close everything.
2. It assumes that once solution close happens, all projects are indeed
   gone. This isn't a good assumption if we ever open up our project
   APIs and let anybody add things to VisualStudioWorkspace, since
   projects may then live past the solution close event.
Fix Use Auto Property handling of VB's As New syntax
Completion for attributes: searching for attributes recursively
Update the entry for
Microsoft.CodeAnalysis.EditorFeatures.Wpf.resources.dll to actually
include the "resources" part of the file name.
Fixed incorrect suggestion for collection initialization simplification
Use SyntaxEditorBasedCodeFixProvider for 'qualify member access'
…nager

Make VisualStudioRuleSetManager thread safe
@CyrusNajmabadi CyrusNajmabadi requested review from a team as code owners May 4, 2018 21:00
@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

Tagging @jcouv . Just keeping this branch up to date. Finally got through the unicorn. Thanks!

@jcouv jcouv self-assigned this May 4, 2018
@etbyrd etbyrd added the Community The pull request was submitted by a contributor who is not a Microsoft employee. label May 4, 2018
@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

Hrmm... i'm getting:

14:09:57 D:\j\workspace\perf_correctn---5f8d76d8>.\build\scripts\cibuild.cmd -testPerfCorrectness 
14:09:57 Repo Dir D:\j\workspace\perf_correctn---5f8d76d8
14:09:57 Binaries Dir D:\j\workspace\perf_correctn---5f8d76d8\Binaries
14:09:57 Unsupported argument -testPerfCorrectness
14:09:57 Usage: build.ps1
14:09:57   -release                 

@jaredpar @agocke do you know what that's about?

…180502

Add resources to our NuGet packages
@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

@tmeschter did you mean to merge into thsi branch?

@Neme12
Copy link
Copy Markdown
Contributor

Neme12 commented May 4, 2018

@CyrusNajmabadi I think the commits are updated live as master itself is updated.

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

That is super cool.

@Neme12
Copy link
Copy Markdown
Contributor

Neme12 commented May 4, 2018

did you mean to merge into thsi branch?

The branch you are merging from is master, so probably yes. I don't think there's any way to update this PR without updating master and vice versa.

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

@jcouv can you merge this quickly before anything else goes into master :) It's really just a merge commit, so reviewwise, there's nothing much to so.

@Neme12
Copy link
Copy Markdown
Contributor

Neme12 commented May 4, 2018

retest perf_correctness_prtest please

@Neme12
Copy link
Copy Markdown
Contributor

Neme12 commented May 4, 2018

retest windows_release_vs-integration_prtest please

@jcouv jcouv merged commit 1840c71 into features/embeddedJson May 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Community The pull request was submitted by a contributor who is not a Microsoft employee.

Projects

None yet

Development

Successfully merging this pull request may close these issues.