Merge pull request #44527 from dotnet/merges/master-to-master-vs-deps

Merge master to master-vs-deps

Author: JoeRobich

.editorconfig

@@ -264,3 +264,9 @@ dotnet_diagnostic.IDE0060.severity = warning
 
 # CA1822: Make member static
 dotnet_diagnostic.CA1822.severity = warning
+
+# Prefer "var" everywhere
+dotnet_diagnostic.IDE0007.severity = warning
+csharp_style_var_for_built_in_types = true:warning
+csharp_style_var_when_type_is_apparent = true:warning
+csharp_style_var_elsewhere = true:warning

azure-pipelines.yml

@@ -34,7 +34,7 @@ jobs:
       release_64:
         _configuration: Release
         _testKind: Test64
-  timeoutInMinutes: 90
+  timeoutInMinutes: 120
 
   steps:
     - script: eng/cibuild.cmd -configuration $(_configuration) -prepareMachine -testDesktop -$(_testKind) -procdump
@@ -62,7 +62,7 @@ jobs:
   pool:
     name: NetCorePublic-Pool
     queue: BuildPool.Windows.10.Amd64.ES.VS2017.Open
-  timeoutInMinutes: 105
+  timeoutInMinutes: 120
 
   steps:
     - script: eng/cibuild.cmd -configuration Debug -prepareMachine -testDesktop

eng/build.ps1

@@ -423,7 +423,7 @@ function TestUsingOptimizedRunner() {
     if ($testVsi) {
       $args += " -timeout:110"
     } else {
-      $args += " -timeout:75"
+      $args += " -timeout:90"
     }
   }
 

src/Analyzers/CSharp/CodeFixes/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.Rewriter.cs

@@ -128,7 +128,7 @@ private static PatternSyntax GetPattern(SyntaxList<SwitchLabelSyntax> switchLabe
 
 #if !CODE_STYLE
 
-                for (int i = 1; i < switchLabels.Count; i++)
+                for (var i = 1; i < switchLabels.Count; i++)
                 {
                     var nextPatternPart = GetPattern(switchLabels[i], out whenClauseUnused);
                     Debug.Assert(whenClauseUnused == null, "We should not have offered to convert multiple cases if any have a when clause");

src/Analyzers/CSharp/Tests/UseExplicitTupleName/UseExplicitTupleNameTests.cs

@@ -231,7 +231,7 @@ void M()
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsUseExplicitTupleName)]
         public async Task TestOnRestField()
         {
-            string valueTuple8 = @"
+            var valueTuple8 = @"
 namespace System
 {
     public struct ValueTuple<T1>

src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests_XmlDoc.vb

@@ -1233,5 +1233,54 @@ class c
                 Await state.AssertSelectedCompletionItem(displayText:="param name=""bar""")
             End Using
         End Function
+
+        <WorkItem(44472, "https://github.com/dotnet/roslyn/issues/44472")>
+        <WpfTheory, CombinatorialData, Trait(Traits.Feature, Traits.Features.Completion)>
+        Public Async Function InvokeWithAliasAndImportedNamespace(showCompletionInArgumentLists As Boolean) As Task
+
+            Using state = TestStateFactory.CreateTestStateFromWorkspace(
+                <Workspace>
+                    <Project Language="C#" AssemblyName="Assembly1" CommonReferences="true">
+                        <Document>
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace First.NestedA
+{
+    public class MyClass
+    {
+    }
+}
+                        </Document>
+                        <Document>
+using First.NestedA;
+using MyClassLongDescription = First.NestedA.MyClass;
+
+namespace Second.NestedB
+{
+    class OtherClass
+    {
+        /// &lt;summary&gt;
+        /// This is from &lt;see cref="MyClassL$$"/&gt;
+        /// &lt;/summary&gt;
+        public void Method()
+        {
+        }
+    }
+}
+                        </Document>
+                    </Project>
+                </Workspace>, showCompletionInArgumentLists:=showCompletionInArgumentLists)
+
+                state.SendInvokeCompletionList()
+                Await state.AssertCompletionSession()
+                Await state.AssertSelectedCompletionItem(displayText:="MyClassLongDescription")
+                state.SendTab()
+                Await state.AssertNoCompletionSession()
+
+                Await state.AssertLineTextAroundCaret("        /// This is from <see cref=""MyClassLongDescription", """/>")
+            End Using
+        End Function
     End Class
 End Namespace

src/Features/CSharp/Portable/ChangeSignature/CSharpChangeSignatureService.cs

@@ -560,7 +560,10 @@ private static bool IsParamsArrayExpanded(SemanticModel semanticModel, SyntaxNod
             }
             else
             {
+#pragma warning disable IDE0007 // Use implicit type - Using 'var' causes "error CS8506: No best type was found for the switch expression"
+                // TODO: File a bug on IDE0007 analyzer
                 BaseArgumentListSyntax? argumentList = node switch
+#pragma warning restore IDE0007 // Use implicit type
                 {
                     InvocationExpressionSyntax invocation => invocation.ArgumentList,
                     ObjectCreationExpressionSyntax objectCreation => objectCreation.ArgumentList,

src/Features/CSharp/Portable/Completion/CompletionProviders/CrefCompletionProvider.cs

@@ -385,6 +385,7 @@ private static CompletionItem CreateItemFromBuilder(ISymbol symbol, int position
                 symbols: ImmutableArray.Create(symbol),
                 contextPosition: position,
                 sortText: symbolText,
+                filterText: insertionText,
                 properties: options,
                 rules: GetRules(insertionText));
         }

src/Features/CSharp/Portable/ConvertIfToSwitch/CSharpConvertIfToSwitchCodeRefactoringProvider.Rewriting.cs

@@ -47,7 +47,7 @@ private static SwitchExpressionArmSyntax AsSwitchExpressionArmSyntax(AnalyzedSwi
 
             Debug.Assert(whenClause == null || section.Labels.Length == 1, "We shouldn't have guards when we're combining multiple cases into a single arm");
 
-            for (int i = 1; i < section.Labels.Length; i++)
+            for (var i = 1; i < section.Labels.Length; i++)
             {
                 var label = section.Labels[i];
                 Debug.Assert(label.Guards.Length == 0, "We shouldn't have guards when we're combining multiple cases into a single arm");

src/Features/CSharp/Portable/EditAndContinue/CSharpEditAndContinueAnalyzer.cs

@@ -256,7 +256,7 @@ protected override SyntaxNode GetEncompassingAncestorImpl(SyntaxNode bodyOrMatch
 
         protected override SyntaxNode FindStatementAndPartner(SyntaxNode declarationBody, TextSpan span, SyntaxNode? partnerDeclarationBody, out SyntaxNode? partner, out int statementPart)
         {
-            int position = span.Start;
+            var position = span.Start;
 
             SyntaxUtilities.AssertIsBody(declarationBody, allowLambda: false);
 
@@ -306,7 +306,7 @@ protected override SyntaxNode FindStatementAndPartner(SyntaxNode declarationBody
 
             while (true)
             {
-                bool isBody = node == declarationBody || LambdaUtilities.IsLambdaBodyStatementOrExpression(node);
+                var isBody = node == declarationBody || LambdaUtilities.IsLambdaBodyStatementOrExpression(node);
 
                 if (isBody || StatementSyntaxComparer.HasLabel(node))
                 {
@@ -513,7 +513,7 @@ internal override bool IsClosureScope(SyntaxNode node)
         {
             var root = GetEncompassingAncestor(container);
 
-            SyntaxNode? current = node;
+            var current = node;
             while (current != root && current != null)
             {
                 if (LambdaUtilities.IsLambdaBodyStatementOrExpression(current, out var body))
@@ -2981,7 +2981,7 @@ protected override List<SyntaxNode> GetExceptionHandlingAncestors(SyntaxNode nod
         {
             var result = new List<SyntaxNode>();
 
-            SyntaxNode? current = node;
+            var current = node;
             while (current != null)
             {
                 var kind = current.Kind();