Fix warnings.

GuOrg · Feb 28, 2018 · 16bc187 · 16bc187
1 parent 1075771
commit 16bc187
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 14 deletions.
diff --git a/Gu.Reactive.Analyzers/ConstructorAnalyzer.cs b/Gu.Reactive.Analyzers/ConstructorAnalyzer.cs
@@ -160,7 +160,7 @@ private static bool TryGetObservableAndCriteriaMismatch(ArgumentListSyntax argum
                             {
                                 if (context.SemanticModel.GetSymbolSafe(name, context.CancellationToken) is IPropertySymbol property)
                                 {
-                                    observed.Item.Add(property);
+                                    observed.Item.Add(property).IgnoreReturnValue();
                                 }
                             }
 
@@ -174,7 +174,7 @@ private static bool TryGetObservableAndCriteriaMismatch(ArgumentListSyntax argum
                                             !property.IsGetOnly() &&
                                             !property.IsPrivateSetAssignedInCtorOnly(context.SemanticModel, context.CancellationToken))
                                         {
-                                            usedInCriteria.Item.Add(property);
+                                            usedInCriteria.Item.Add(property).IgnoreReturnValue();
                                         }
                                     }
                                 }

diff --git a/Gu.Reactive.Analyzers/Helpers/Walkers/MutationWalker.cs b/Gu.Reactive.Analyzers/Helpers/Walkers/MutationWalker.cs
@@ -66,7 +66,8 @@ public override void VisitArgument(ArgumentSyntax node)
         internal static MutationWalker Borrow(SyntaxNode node, ISymbol symbol, SemanticModel semanticModel, CancellationToken cancellationToken)
         {
             var walker = BorrowAndVisit(node, () => new MutationWalker());
-            walker.mutations.RemoveAll(x => !IsForSymbol(x, symbol, semanticModel, cancellationToken));
+            walker.mutations.RemoveAll(x => !IsForSymbol(x, symbol, semanticModel, cancellationToken))
+                            .IgnoreReturnValue();
             return walker;
         }
 

diff --git a/Gu.Reactive.Benchmarks/Program.cs b/Gu.Reactive.Benchmarks/Program.cs
@@ -1,4 +1,4 @@
-#pragma warning disable 162
+#pragma warning disable 162
 namespace Gu.Reactive.Benchmarks
 {
     using System;
@@ -8,6 +8,7 @@ namespace Gu.Reactive.Benchmarks
     using BenchmarkDotNet.Reports;
     using BenchmarkDotNet.Running;
     using Gu.Reactive.Analyzers;
+    using Gu.Reactive.Internals;
     using Gu.Roslyn.Asserts;
 
     public class Program
@@ -25,7 +26,7 @@ public static void Main()
                 // Warmup
                 benchmark.Run();
                 Console.WriteLine("Attach profiler and press any key to continue...");
-                Console.ReadKey();
+                Console.ReadKey().IgnoreReturnValue();
                 benchmark.Run();
             }
             else if (true)

diff --git a/Gu.Reactive.Demo/DataGridAndEventsView.xaml.cs b/Gu.Reactive.Demo/DataGridAndEventsView.xaml.cs
@@ -1,17 +1,18 @@
-namespace Gu.Reactive.Demo
+namespace Gu.Reactive.Demo
 {
     using System;
     using System.Collections;
     using System.Collections.ObjectModel;
     using System.Collections.Specialized;
+    using System.Reactive.Disposables;
     using System.Reactive.Linq;
     using System.Windows;
     using System.Windows.Controls;
 
     /// <summary>
     /// Interaction logic for DataGridAndEventsView.xaml
     /// </summary>
-    public partial class DataGridAndEventsView : UserControl
+    public partial class DataGridAndEventsView : UserControl, IDisposable
     {
         public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
             nameof(Source),
@@ -34,6 +35,9 @@ public partial class DataGridAndEventsView : UserControl
             typeof(DataGridAndEventsView),
             new PropertyMetadata(default(string)));
 
+        private readonly SerialDisposable disposable = new SerialDisposable();
+        private bool disposed;
+
         public DataGridAndEventsView()
         {
             this.InitializeComponent();
@@ -58,6 +62,17 @@ public string Header
             set => this.SetValue(HeaderProperty, value);
         }
 
+        public void Dispose()
+        {
+            if (this.disposed)
+            {
+                return;
+            }
+
+            this.disposed = true;
+            this.disposable.Dispose();
+        }
+
         private static object CoerceSource(DependencyObject d, object basevalue)
         {
             ((DataGridAndEventsView)d).Changes?.Clear();
@@ -67,10 +82,17 @@ private static object CoerceSource(DependencyObject d, object basevalue)
         private static void OnSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var dataGridAndEventsView = (DataGridAndEventsView)d;
-            var notifyCollectionChanged = e.NewValue as INotifyCollectionChanged;
-            notifyCollectionChanged.ObserveCollectionChangedSlim(signalInitial: false)
-                                   .ObserveOnDispatcher()
-                                   .Subscribe(x => dataGridAndEventsView.Changes.Add(x));
+            if (e.NewValue is INotifyCollectionChanged notifyCollectionChanged)
+            {
+                dataGridAndEventsView.disposable.Disposable = notifyCollectionChanged
+                                                              .ObserveCollectionChangedSlim(signalInitial: false)
+                                                              .ObserveOnDispatcher()
+                                                              .Subscribe(x => dataGridAndEventsView.Changes.Add(x));
+            }
+            else
+            {
+                dataGridAndEventsView.disposable.Disposable = null;
+            }
         }
     }
 }
diff --git a/Gu.Wpf.Reactive.Tests/Collections/MutableViews/ThrottledViewTests.cs b/Gu.Wpf.Reactive.Tests/Collections/MutableViews/ThrottledViewTests.cs
@@ -78,8 +78,7 @@ public async Task AddToSourceAwait()
                     using (var actual = view.SubscribeAll())
                     {
                         source.Add(4);
-                        await Task.Delay(TimeSpan.FromMilliseconds(20))
-                                  .ConfigureAwait(false);
+                        await Task.Delay(TimeSpan.FromMilliseconds(40)).ConfigureAwait(false);
                         CollectionAssert.AreEqual(source, view);
                         CollectionAssert.AreEqual(expected, actual, EventArgsComparer.Default);
                     }
@@ -237,4 +236,4 @@ public async Task WhenManyAddsToSourceWithBufferTime()
             }
         }
     }
-}
+}
diff --git a/Gu.Wpf.Reactive.UiTests/Helpers/Ignore.cs b/Gu.Wpf.Reactive.UiTests/Helpers/Ignore.cs
@@ -0,0 +1,10 @@
+namespace Gu.Wpf.Reactive.UiTests
+{
+    internal static class Ignore
+    {
+        // ReSharper disable once UnusedParameter.Global
+        internal static void IgnoreReturnValue<T>(this T returnValue)
+        {
+        }
+    }
+}
diff --git a/Gu.Wpf.Reactive.UiTests/MainWindowTests.cs b/Gu.Wpf.Reactive.UiTests/MainWindowTests.cs
@@ -1,3 +1,4 @@
+#pragma warning disable GU0011 // Don't ignore the return value.
 namespace Gu.Wpf.Reactive.UiTests
 {
     using Gu.Wpf.UiAutomation;