Merge pull request #20846 from CyrusNajmabadi/useDefault

Use simple default expressions

src/Compilers/Core/Portable/Collections/ImmutableArrayExtensions.cs

@@ -57,7 +57,7 @@ public static ImmutableArray<T> AsImmutableOrNull<T>(this IEnumerable<T> items)
         {
             if (items == null)
             {
-                return default(ImmutableArray<T>);
+                return default;
             }
 
             return ImmutableArray.CreateRange<T>(items);
@@ -86,7 +86,7 @@ public static ImmutableArray<T> AsImmutableOrNull<T>(this T[] items)
         {
             if (items == null)
             {
-                return default(ImmutableArray<T>);
+                return default;
             }
 
             return ImmutableArray.Create<T>(items);

src/Compilers/Core/Portable/InternalUtilities/AssemblyIdentityUtils.cs

@@ -34,7 +34,7 @@ public static AssemblyIdentity TryGetAssemblyIdentity(string filePath)
                     BlobHandle publicKeyHandle = assemblyDefinition.PublicKey;
                     ImmutableArray<byte> publicKeyOrToken = !publicKeyHandle.IsNil
                         ? metadataReader.GetBlobBytes(publicKeyHandle).AsImmutableOrNull()
-                        : default(ImmutableArray<byte>);
+                        : default;
                     return new AssemblyIdentity(name, version, cultureName, publicKeyOrToken, hasPublicKey);
                 }
             }

src/Compilers/Core/Portable/InternalUtilities/ConcurrentLruCache.cs

@@ -178,7 +178,7 @@ public bool UnsafeTryGetValue(K key, out V value)
             }
             else
             {
-                value = default(V);
+                value = default;
                 return false;
             }
         }

src/Compilers/Core/Portable/InternalUtilities/ConsList`1.cs

@@ -25,7 +25,7 @@ internal struct Enumerator : IEnumerator<T>
 
             internal Enumerator(ConsList<T> list)
             {
-                _current = default(T);
+                _current = default;
                 _tail = list;
             }
 
@@ -50,7 +50,7 @@ public bool MoveNext()
                     return true;
                 }
 
-                _current = default(T);
+                _current = default;
                 return false;
             }
 
@@ -74,7 +74,7 @@ public void Reset()
 
         private ConsList()
         {
-            _head = default(T);
+            _head = default;
             _tail = null;
         }
 

src/Compilers/Core/Portable/InternalUtilities/MultiDictionary.cs

@@ -23,8 +23,8 @@ public Enumerator(ValueSet v)
                 {
                     if (v._value == null)
                     {
-                        _value = default(V);
-                        _values = default(ImmutableHashSet<V>.Enumerator);
+                        _value = default;
+                        _values = default;
                         _count = 0;
                     }
                     else
@@ -33,12 +33,12 @@ public Enumerator(ValueSet v)
                         if (set == null)
                         {
                             _value = (V)v._value;
-                            _values = default(ImmutableHashSet<V>.Enumerator);
+                            _values = default;
                             _count = 1;
                         }
                         else
                         {
-                            _value = default(V);
+                            _value = default;
                             _values = set.GetEnumerator();
                             _count = set.Count;
                             Debug.Assert(_count > 1);
@@ -177,7 +177,7 @@ public ValueSet this[K k]
         {
             get
             {
-                return _dictionary.TryGetValue(k, out var set) ? set : default(ValueSet);
+                return _dictionary.TryGetValue(k, out var set) ? set : default;
             }
         }
 

src/Compilers/Core/Portable/InternalUtilities/OneOrMany.cs

@@ -22,7 +22,7 @@ internal struct OneOrMany<T>
         public OneOrMany(T one)
         {
             _one = one;
-            _many = default(ImmutableArray<T>);
+            _many = default;
         }
 
         public OneOrMany(ImmutableArray<T> many)
@@ -32,7 +32,7 @@ public OneOrMany(ImmutableArray<T> many)
                 throw new ArgumentNullException(nameof(many));
             }
 
-            _one = default(T);
+            _one = default;
             _many = many;
         }
 
@@ -103,7 +103,7 @@ public OneOrMany<T> RemoveAll(T item)
         {
             if (_many.IsDefault)
             {
-                return item.Equals(_one) ? default(OneOrMany<T>) : this;
+                return item.Equals(_one) ? default : this;
             }
 
             var builder = ArrayBuilder<T>.GetInstance();
@@ -118,7 +118,7 @@ public OneOrMany<T> RemoveAll(T item)
 
             if (builder.Count == 0)
             {
-                return default(OneOrMany<T>);
+                return default;
             }
 
             return builder.Count == Count ? this : new OneOrMany<T>(builder.ToImmutableAndFree());

src/Compilers/Core/Portable/InternalUtilities/ReflectionUtilities.cs

@@ -105,7 +105,7 @@ public static T CreateDelegate<T>(this MethodInfo methodInfo)
         {
             if (methodInfo == null)
             {
-                return default(T);
+                return default;
             }
 
             return (T)(object)methodInfo.CreateDelegate(typeof(T));
@@ -115,7 +115,7 @@ public static T InvokeConstructor<T>(this ConstructorInfo constructorInfo, param
         {
             if (constructorInfo == null)
             {
-                return default(T);
+                return default;
             }
 
             try
@@ -126,7 +126,7 @@ public static T InvokeConstructor<T>(this ConstructorInfo constructorInfo, param
             {
                 ExceptionDispatchInfo.Capture(e.InnerException).Throw();
                 Debug.Assert(false, "Unreachable");
-                return default(T);
+                return default;
             }
         }
 

src/Compilers/Core/Portable/InternalUtilities/SemaphoreSlimExtensions.cs

@@ -8,13 +8,13 @@ namespace Roslyn.Utilities
 {
     internal static class SemaphoreSlimExtensions
     {
-        public static SemaphoreDisposer DisposableWait(this SemaphoreSlim semaphore, CancellationToken cancellationToken = default(CancellationToken))
+        public static SemaphoreDisposer DisposableWait(this SemaphoreSlim semaphore, CancellationToken cancellationToken = default)
         {
             semaphore.Wait(cancellationToken);
             return new SemaphoreDisposer(semaphore);
         }
 
-        public async static Task<SemaphoreDisposer> DisposableWaitAsync(this SemaphoreSlim semaphore, CancellationToken cancellationToken = default(CancellationToken))
+        public async static Task<SemaphoreDisposer> DisposableWaitAsync(this SemaphoreSlim semaphore, CancellationToken cancellationToken = default)
         {
             await semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
             return new SemaphoreDisposer(semaphore);

src/Compilers/Core/Portable/InternalUtilities/SpecializedCollections.Empty.Dictionary.cs

@@ -45,7 +45,7 @@ public bool Remove(TKey key)
 
                 public bool TryGetValue(TKey key, out TValue value)
                 {
-                    value = default(TValue);
+                    value = default;
                     return false;
                 }
 

src/Compilers/Core/Portable/Serialization/ObjectReader.cs

@@ -85,7 +85,7 @@ private ObjectReader(
         /// </summary>
         public static ObjectReader TryGetReader(
             Stream stream,
-            CancellationToken cancellationToken = default(CancellationToken))
+            CancellationToken cancellationToken = default)
         {
             if (stream == null)
             {

src/Compilers/Core/Portable/Serialization/ObjectWriter.cs

@@ -72,7 +72,7 @@ internal sealed partial class ObjectWriter : IDisposable
         /// <param name="cancellationToken"></param>
         public ObjectWriter(
             Stream stream,
-            CancellationToken cancellationToken = default(CancellationToken))
+            CancellationToken cancellationToken = default)
         {
             // String serialization assumes both reader and writer to be of the same endianness.
             // It can be adjusted for BigEndian if needed.

src/Compilers/Core/Portable/Syntax/SyntaxTreeExtensions.cs

@@ -99,7 +99,7 @@ private static int FindFirstDifference(string s1, string s2)
         /// <summary>
         /// Returns <c>true</c> if the provided position is in a hidden region inaccessible to the user.
         /// </summary>
-        public static bool IsHiddenPosition(this SyntaxTree tree, int position, CancellationToken cancellationToken = default(CancellationToken))
+        public static bool IsHiddenPosition(this SyntaxTree tree, int position, CancellationToken cancellationToken = default)
         {
             if (!tree.HasHiddenRegions())
             {

src/Dependencies/CodeAnalysis.Debugging/CustomDebugInfoReader.cs

@@ -57,7 +57,7 @@ public static ImmutableArray<byte> TryGetCustomDebugInfoRecord(byte[] customDebu
                 }
             }
 
-            return default(ImmutableArray<byte>);
+            return default;
         }
 
         /// <remarks>
@@ -349,16 +349,16 @@ public static ImmutableArray<ImmutableArray<string>> GetCSharpGroupedImportStrin
             Func<int, TArg, ImmutableArray<string>> getMethodImportStrings,
             out ImmutableArray<string> externAliasStrings)
         {
-            externAliasStrings = default(ImmutableArray<string>);
+            externAliasStrings = default;
 
-            ImmutableArray<short> groupSizes = default(ImmutableArray<short>);
+            ImmutableArray<short> groupSizes = default;
             bool seenForward = false;
 
         RETRY:
             byte[] bytes = getMethodCustomDebugInfo(methodToken, arg);
             if (bytes == null)
             {
-                return default(ImmutableArray<ImmutableArray<string>>);
+                return default;
             }
 
             foreach (var record in GetCustomDebugInfoRecords(bytes))
@@ -421,7 +421,7 @@ public static ImmutableArray<ImmutableArray<string>> GetCSharpGroupedImportStrin
             if (groupSizes.IsDefault)
             {
                 // This can happen in malformed PDBs (e.g. chains of forwards).
-                return default(ImmutableArray<ImmutableArray<string>>);
+                return default;
             }
 
             ImmutableArray<string> importStrings = getMethodImportStrings(methodToken, arg);
@@ -593,7 +593,7 @@ public static bool TryParseCSharpImportString(string import, out string alias, o
             alias = null;
             externAlias = null;
             target = null;
-            kind = default(ImportTargetKind);
+            kind = default;
 
             if (string.IsNullOrEmpty(import))
             {
@@ -693,8 +693,8 @@ public static bool TryParseVisualBasicImportString(string import, out string ali
         {
             alias = null;
             target = null;
-            kind = default(ImportTargetKind);
-            scope = default(VBImportScopeKind);
+            kind = default;
+            scope = default;
 
             if (import == null)
             {

src/Dependencies/PooledObjects/ArrayBuilder.cs

@@ -100,7 +100,7 @@ public void SetItem(int index, T value)
         {
             while (index > _builder.Count)
             {
-                _builder.Add(default(T));
+                _builder.Add(default);
             }
 
             if (index == _builder.Count)
@@ -241,7 +241,7 @@ public ImmutableArray<T> ToImmutableOrNull()
         {
             if (Count == 0)
             {
-                return default(ImmutableArray<T>);
+                return default;
             }
 
             return this.ToImmutable();

src/EditorFeatures/Core/Extensibility/BraceMatching/IBraceMatcher.cs

@@ -7,6 +7,6 @@ namespace Microsoft.CodeAnalysis.Editor
 {
     internal interface IBraceMatcher
     {
-        Task<BraceMatchingResult?> FindBracesAsync(Document document, int position, CancellationToken cancellationToken = default(CancellationToken));
+        Task<BraceMatchingResult?> FindBracesAsync(Document document, int position, CancellationToken cancellationToken = default);
     }
 }

src/EditorFeatures/Core/IBraceMatchingService.cs

@@ -8,7 +8,7 @@ namespace Microsoft.CodeAnalysis.Editor
 {
     internal interface IBraceMatchingService
     {
-        Task<BraceMatchingResult?> GetMatchingBracesAsync(Document document, int position, CancellationToken cancellationToken = default(CancellationToken));
+        Task<BraceMatchingResult?> GetMatchingBracesAsync(Document document, int position, CancellationToken cancellationToken = default);
     }
 
     internal struct BraceMatchingResult

src/EditorFeatures/Core/IForegroundNotificationService.cs

@@ -11,15 +11,15 @@ namespace Microsoft.CodeAnalysis.Editor
     /// </summary>
     internal interface IForegroundNotificationService
     {
-        void RegisterNotification(Action action, IAsyncToken asyncToken, CancellationToken cancellationToken = default(CancellationToken));
+        void RegisterNotification(Action action, IAsyncToken asyncToken, CancellationToken cancellationToken = default);
 
-        void RegisterNotification(Action action, int delayInMS, IAsyncToken asyncToken, CancellationToken cancellationToken = default(CancellationToken));
+        void RegisterNotification(Action action, int delayInMS, IAsyncToken asyncToken, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// if action return true, the service will call it back again when it has time.
         /// </summary>
-        void RegisterNotification(Func<bool> action, IAsyncToken asyncToken, CancellationToken cancellationToken = default(CancellationToken));
+        void RegisterNotification(Func<bool> action, IAsyncToken asyncToken, CancellationToken cancellationToken = default);
 
-        void RegisterNotification(Func<bool> action, int delayInMS, IAsyncToken asyncToken, CancellationToken cancellationToken = default(CancellationToken));
+        void RegisterNotification(Func<bool> action, int delayInMS, IAsyncToken asyncToken, CancellationToken cancellationToken = default);
     }
 }

src/EditorFeatures/Core/IInlineRenameService.cs

@@ -18,7 +18,7 @@ internal interface IInlineRenameService
         /// <param name="triggerSpan">The triggerSpan itself.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
         /// <returns>The rename session.</returns>
-        InlineRenameSessionInfo StartInlineSession(Document document, TextSpan triggerSpan, CancellationToken cancellationToken = default(CancellationToken));
+        InlineRenameSessionInfo StartInlineSession(Document document, TextSpan triggerSpan, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Returns the currently active inline session, or null if none is active.

src/EditorFeatures/Core/ILineSeparatorService.cs

@@ -10,6 +10,6 @@ namespace Microsoft.CodeAnalysis.Editor
 {
     internal interface ILineSeparatorService : ILanguageService
     {
-        Task<IEnumerable<TextSpan>> GetLineSeparatorsAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken = default(CancellationToken));
+        Task<IEnumerable<TextSpan>> GetLineSeparatorsAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken = default);
     }
 }

src/EditorFeatures/Core/IMetadataAsSourceFileService.cs

@@ -17,7 +17,7 @@ internal interface IMetadataAsSourceFileService
         /// from.</param>
         /// <param name="symbol">The symbol whose interface to generate source for</param>
         /// <param name="cancellationToken">To cancel project and document operations</param>
-        Task<MetadataAsSourceFile> GetGeneratedFileAsync(Project project, ISymbol symbol, CancellationToken cancellationToken = default(CancellationToken));
+        Task<MetadataAsSourceFile> GetGeneratedFileAsync(Project project, ISymbol symbol, CancellationToken cancellationToken = default);
 
         bool TryAddDocumentToWorkspace(string filePath, ITextBuffer buffer);
 

src/EditorFeatures/Core/Implementation/Adornments/AdornmentManager.cs

@@ -339,7 +339,7 @@ private bool TryMapToSingleSnapshotSpan(IMappingSpan mappingSpan, ITextSnapshot
             var spans = mappingSpan.GetSpans(viewSnapshot);
             if (spans.Count != 1)
             {
-                span = default(SnapshotSpan);
+                span = default;
                 return false; // span is unmapped or disjoint.
             }
 

src/EditorFeatures/Core/Implementation/AutomaticCompletion/Extensions.cs

@@ -43,7 +43,7 @@ public static SyntaxToken FindToken(this ITextSnapshot snapshot, int position, C
             var document = snapshot.GetOpenDocumentInCurrentContextWithChanges();
             if (document == null)
             {
-                return default(SyntaxToken);
+                return default;
             }
 
             var root = document.GetSyntaxRootSynchronously(cancellationToken);
@@ -53,7 +53,7 @@ public static SyntaxToken FindToken(this ITextSnapshot snapshot, int position, C
         /// <summary>
         /// insert text to workspace and get updated version of the document
         /// </summary>
-        public static Document InsertText(this Document document, int position, string text, CancellationToken cancellationToken = default(CancellationToken))
+        public static Document InsertText(this Document document, int position, string text, CancellationToken cancellationToken = default)
         {
             return document.ReplaceText(new TextSpan(position, 0), text, cancellationToken);
         }
@@ -94,7 +94,7 @@ public static Document ApplyTextChanges(this Document document, IEnumerable<Text
         /// <summary>
         /// Update the solution so that the document with the Id has the text changes
         /// </summary>
-        public static Solution UpdateDocument(this Solution solution, DocumentId id, IEnumerable<TextChange> textChanges, CancellationToken cancellationToken = default(CancellationToken))
+        public static Solution UpdateDocument(this Solution solution, DocumentId id, IEnumerable<TextChange> textChanges, CancellationToken cancellationToken = default)
         {
             var oldDocument = solution.GetDocument(id);
             var newText = oldDocument.GetTextAsync(cancellationToken).WaitAndGetResult(cancellationToken).WithChanges(textChanges);

src/EditorFeatures/Core/Implementation/BraceMatching/AbstractBraceMatcher.cs

@@ -46,7 +46,7 @@ where tok.Span.Length > 0
                 }
             }
 
-            match = default(SyntaxToken);
+            match = default;
             return false;
         }