diff --git a/src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace_XmlConsumption.cs b/src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace_XmlConsumption.cs index 7fef27d3bfcdd1b05ec35899631a1ad4eb929b99..e98127a87eb08f29c2d1fb8d7cadf9c8943f0306 100644 --- a/src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace_XmlConsumption.cs +++ b/src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace_XmlConsumption.cs @@ -85,7 +85,7 @@ public static TestWorkspace Create(string xmlDefinition, bool completed = true, throw new ArgumentException(); } - exportProvider = exportProvider ?? TestExportProvider.ExportProviderWithCSharpAndVisualBasic; + exportProvider ??= TestExportProvider.ExportProviderWithCSharpAndVisualBasic; var workspace = new TestWorkspace(exportProvider, workspaceKind); diff --git a/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs b/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs index 001636f0168a1bc358cfb64568fb89e28b9dbeca..ca8bd64a225e5e41ba83191933b3056b2dfdf407 100644 --- a/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs +++ b/src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs @@ -63,8 +63,8 @@ public async Task TestResetREPLWithProjectContext() List expectedReferences = null, List expectedUsings = null) { - expectedReferences = expectedReferences ?? new List(); - expectedUsings = expectedUsings ?? new List(); + expectedReferences ??= new List(); + expectedUsings ??= new List(); var testHost = new InteractiveWindowTestHost(workspace.ExportProvider); var executedSubmissionCalls = new List(); diff --git a/src/VisualStudio/Core/Def/Implementation/Remote/RemoteHostClientServiceFactory.SolutionChecksumUpdater.cs b/src/VisualStudio/Core/Def/Implementation/Remote/RemoteHostClientServiceFactory.SolutionChecksumUpdater.cs index c600067c4d8d3678e23d6b58ca179e5ac8edc765..879ba4fb93d0fc3314122bbc963c6f75f331b9a0 100644 --- a/src/VisualStudio/Core/Def/Implementation/Remote/RemoteHostClientServiceFactory.SolutionChecksumUpdater.cs +++ b/src/VisualStudio/Core/Def/Implementation/Remote/RemoteHostClientServiceFactory.SolutionChecksumUpdater.cs @@ -111,7 +111,7 @@ private void EnqueueChecksumUpdate() lock (_gate) { - _lastToken = _lastToken ?? Listener.BeginAsyncOperation(nameof(SolutionChecksumUpdater)); + _lastToken ??= Listener.BeginAsyncOperation(nameof(SolutionChecksumUpdater)); } _event.Release(); diff --git a/src/VisualStudio/Core/Impl/CodeModel/AbstractCodeModelService.cs b/src/VisualStudio/Core/Impl/CodeModel/AbstractCodeModelService.cs index 34fed5a4434a8fea6704e0d51761428ab45cba06..4ba25679a24a828bd32a3d3ca73082e409456fdf 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/AbstractCodeModelService.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/AbstractCodeModelService.cs @@ -592,7 +592,7 @@ protected EnvDTE.vsCMElement GetElementKind(ITypeSymbol typeSymbol) { if (location.IsInSource) { - compilation = compilation ?? project.GetCompilationAsync(CancellationToken.None).WaitAndGetResult_CodeModel(CancellationToken.None); + compilation ??= project.GetCompilationAsync(CancellationToken.None).WaitAndGetResult_CodeModel(CancellationToken.None); if (compilation.ContainsSyntaxTree(location.SourceTree)) { @@ -606,7 +606,7 @@ protected EnvDTE.vsCMElement GetElementKind(ITypeSymbol typeSymbol) } else { - generatedCode = generatedCode ?? Tuple.Create(document.Id, location); + generatedCode ??= Tuple.Create(document.Id, location); } } } diff --git a/src/VisualStudio/Core/Impl/CodeModel/FileCodeModel.cs b/src/VisualStudio/Core/Impl/CodeModel/FileCodeModel.cs index e693d0f19956fa781c06cfa35ed4bdf2bb41ed35..184b53d8ea1d945efd38999855156332ce61d24f 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/FileCodeModel.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/FileCodeModel.cs @@ -673,7 +673,7 @@ int IVBFileCodeModelEvents.EndEdit() var node = element.LookupNode(); if (node != null) { - elementAndPaths = elementAndPaths ?? new List>(); + elementAndPaths ??= new List>(); elementAndPaths.Add(ValueTuple.Create(element, new SyntaxPath(node))); } } diff --git a/src/Workspaces/Remote/Core/Services/SolutionCreator.cs b/src/Workspaces/Remote/Core/Services/SolutionCreator.cs index b6bf8d490305b17aaa9e44ed8eb3a057de9a221a..3371803cc377281d6785c5c50664e45e3067516f 100644 --- a/src/Workspaces/Remote/Core/Services/SolutionCreator.cs +++ b/src/Workspaces/Remote/Core/Services/SolutionCreator.cs @@ -313,7 +313,7 @@ private async Task UpdateProjectInfoAsync(Project project, Checksum inf { if (!oldMap.ContainsKey(kv.Key)) { - documentsToAdd = documentsToAdd ?? ImmutableArray.CreateBuilder(); + documentsToAdd ??= ImmutableArray.CreateBuilder(); // we have new document added var documentInfo = await SolutionInfoCreator.CreateDocumentInfoAsync(_assetService, kv.Value.Checksum, _cancellationToken).ConfigureAwait(false);