Merge pull request #36765 from dotnet/merges/master-to-release/dev16.3-preview1

Merge master to release/dev16.3-preview1

Author: dotnet-automerge-bot

src/EditorFeatures/CSharpTest/DisposeAnalysis/DisposeObjectsBeforeLosingScopeTests.cs

@@ -5024,6 +5024,37 @@ void M1()
 }");
         }
 
+        [Fact, WorkItem(32100, "https://github.com/dotnet/roslyn/issues/32100")]
+        public async Task UsingDeclaration()
+        {
+            await TestDiagnosticsAsync(@"
+using System;
+class C : IDisposable
+{
+    public void Dispose() { }
+    void M1()
+    {
+        [|using var c = new C()|];
+    }
+}", parseOptions: CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.Preview));
+        }
+
+        [Fact, WorkItem(32100, "https://github.com/dotnet/roslyn/issues/32100")]
+        public async Task UsingDeclarationWithInitializer()
+        {
+            await TestDiagnosticsAsync(@"
+using System;
+class C : IDisposable
+{
+    public int P { get; set; }
+    public void Dispose() { }
+    void M1()
+    {
+        [|using var c = new C() { P = 1 }|];
+    }
+}", parseOptions: CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.Preview));
+        }
+
         [Fact]
         public async Task MissingDisposeInMethodWithAttributes()
         {

src/EditorFeatures/CSharpTest/RemoveUnusedParametersAndValues/RemoveUnusedValueAssignmentTests.cs

@@ -6999,5 +6999,48 @@ int M()
     int M2() => 0;
 }", options: PreferUnusedLocal, parseOptions: new CSharpParseOptions(LanguageVersion.CSharp8));
         }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedValues)]
+        [WorkItem(33464, "https://github.com/dotnet/roslyn/issues/33464")]
+        public async Task UsingDeclaration()
+        {
+            await TestMissingInRegularAndScriptAsync(
+@"using System;
+
+class C : IDisposable
+{
+    public void Dispose()
+    {
+    }
+
+    void M()
+    {
+        using var [|x|] = new C();
+    }
+}", options: PreferDiscard,
+    parseOptions: CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.Preview));
+        }
+
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsRemoveUnusedValues)]
+        [WorkItem(33464, "https://github.com/dotnet/roslyn/issues/33464")]
+        public async Task UsingDeclarationWithInitializer()
+        {
+            await TestMissingInRegularAndScriptAsync(
+@"using System;
+
+class C : IDisposable
+{
+    public int P { get; set; }
+    public void Dispose()
+    {
+    }
+
+    void M()
+    {
+        using var [|x|] = new C() { P = 1 };
+    }
+}", options: PreferDiscard,
+    parseOptions: CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.Preview));
+        }
     }
 }

src/Features/Core/Portable/DisposeAnalysis/DisposeObjectsBeforeLosingScopeDiagnosticAnalyzer.cs

@@ -103,6 +103,13 @@ private void PerformFlowAnalysisOnOperationBlock(
                     ComputeDiagnostics(disposeDataAtExit, notDisposedDiagnostics, mayBeNotDisposedDiagnostics,
                         disposeAnalysisResult, pointsToAnalysisResult);
 
+                    if (disposeAnalysisResult.ControlFlowGraph.OriginalOperation.HasAnyOperationDescendant(o => o.Kind == OperationKind.None))
+                    {
+                        // Workaround for https://github.com/dotnet/roslyn/issues/32100
+                        // Bail out in presence of OperationKind.None - not implemented IOperation.
+                        return;
+                    }
+
                     // Report diagnostics preferring *not* disposed diagnostics over may be not disposed diagnostics
                     // and avoiding duplicates.
                     foreach (var diagnostic in notDisposedDiagnostics.Concat(mayBeNotDisposedDiagnostics))

src/Features/Core/Portable/RemoveUnusedParametersAndValues/AbstractRemoveUnusedParametersAndValuesDiagnosticAnalyzer.SymbolStartAnalyzer.BlockAnalyzer.cs

@@ -331,6 +331,16 @@ private bool ShouldAnalyze(IOperation operationBlock, ISymbol owningSymbol)
                             // Skip blocks from attributes (which have OperationKind.None) and parameter initializers.
                             // We don't have any unused values in such operation blocks.
                             return false;
+
+                        default:
+                            if (operationBlock.HasAnyOperationDescendant(o => o.Kind == OperationKind.None))
+                            {
+                                // Workaround for https://github.com/dotnet/roslyn/issues/32100
+                                // Bail out in presence of OperationKind.None - not implemented IOperation.
+                                return false;
+                            }
+
+                            break;
                     }
 
                     // We currently do not support points-to analysis, which is needed to accurately track locations of

src/VisualStudio/Core/SolutionExplorerShim/AnalyzersCommandHandler.cs

@@ -5,6 +5,7 @@
 using System.Collections.Immutable;
 using System.ComponentModel.Composition;
 using System.ComponentModel.Design;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using EnvDTE;
@@ -62,6 +63,7 @@ internal class AnalyzersCommandHandler : IAnalyzersCommandHandler, IVsUpdateSolu
         private Workspace _workspace;
 
         private bool _allowProjectSystemOperations = true;
+        private bool _initialized;
 
         [ImportingConstructor]
         public AnalyzersCommandHandler(
@@ -112,6 +114,8 @@ public void Initialize(IMenuCommandService menuCommandService)
 
                 var buildManager = (IVsSolutionBuildManager)_serviceProvider.GetService(typeof(SVsSolutionBuildManager));
                 buildManager.AdviseUpdateSolutionEvents(this, out var cookie);
+
+                _initialized = true;
             }
         }
 
@@ -189,11 +193,13 @@ public IContextMenuController DiagnosticContextMenuController
 
         private bool ShouldShowDiagnosticContextMenu(IEnumerable<object> items)
         {
-            return items.All(item => item is BaseDiagnosticItem);
+            return _initialized && items.All(item => item is BaseDiagnosticItem);
         }
 
         private void UpdateDiagnosticContextMenu()
         {
+            Debug.Assert(_initialized);
+
             UpdateSeverityMenuItemsChecked();
             UpdateSeverityMenuItemsEnabled();
             UpdateOpenHelpLinkMenuItemVisibility();

src/VisualStudio/Core/Test/SolutionExplorer/AnalyzerCommandHandlerTests.vb

@@ -0,0 +1,27 @@
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+Imports Microsoft.CodeAnalysis
+Imports Microsoft.CodeAnalysis.Test.Utilities
+Imports Microsoft.VisualStudio.LanguageServices.Implementation.SolutionExplorer
+Imports Roslyn.Test.Utilities
+
+Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.SolutionExplorer
+    Public Class AnalyzerCommandHandlerTests
+        <Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)>
+        <WorkItem(36304, "https://github.com/dotnet/roslyn/issues/36304")>
+        Public Sub TestLazyInitialization()
+            Dim descriptor = New DiagnosticDescriptor(
+                id:="TST0001",
+                title:="A test diagnostic",
+                messageFormat:="A test message",
+                category:="Test",
+                defaultSeverity:=DiagnosticSeverity.Error,
+                isEnabledByDefault:=True)
+            Dim diagnosticItem = New LegacyDiagnosticItem(Nothing, descriptor, ReportDiagnostic.Error, Nothing)
+
+            Dim handler = New AnalyzersCommandHandler(Nothing, Nothing, Nothing)
+            Dim shown = handler.DiagnosticContextMenuController.ShowContextMenu({diagnosticItem}, Nothing)
+            Debug.Assert(Not shown)
+        End Sub
+    End Class
+End Namespace