Discard redundant throw away and switch remaining suggestions to hint…

… or warning
ppy · Jun 24, 2022 · d567280 · d567280
1 parent 58b49a4
commit d567280
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 24 deletions.
diff --git a/osu-framework.sln.DotSettings b/osu-framework.sln.DotSettings
@@ -124,6 +124,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingLinebreak/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingSpace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MoreSpecificForeachVariableTypeAvailable/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MoveVariableDeclarationInsideLoopCondition/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleStatementsOnOneLine/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleTypeMembersOnOneLine/@EntryIndexedValue">WARNING</s:String>
@@ -137,6 +138,8 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PropertyCanBeMadeInitOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PropertyCanBeMadeInitOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
@@ -147,6 +150,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantDiscardDesignation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>

diff --git a/osu.Framework.Tests/Visual/Input/TestSceneTouchInput.cs b/osu.Framework.Tests/Visual/Input/TestSceneTouchInput.cs
@@ -465,10 +465,10 @@ protected override bool Handle(UIEvent e)
 
                         break;
 
-                    case MouseDownEvent _:
-                    case MouseMoveEvent _:
-                    case DragEvent _:
-                    case MouseUpEvent _:
+                    case MouseDownEvent:
+                    case MouseMoveEvent:
+                    case DragEvent:
+                    case MouseUpEvent:
                         if (HandleMouse?.Invoke((MouseEvent)e) != false)
                         {
                             MouseEvents.Enqueue((MouseEvent)e);

diff --git a/osu.Framework/Audio/Track/TrackBass.cs b/osu.Framework/Audio/Track/TrackBass.cs
@@ -133,9 +133,9 @@ private int prepareStream(Stream data, bool quick)
         {
             switch (data)
             {
-                case MemoryStream _:
-                case UnmanagedMemoryStream _:
-                case AsyncBufferStream _:
+                case MemoryStream:
+                case UnmanagedMemoryStream:
+                case AsyncBufferStream:
                     // Buffering memory stream is definitely unworthy.
                     dataStream = data;
                     break;

diff --git a/osu.Framework/Bindables/Bindable.cs b/osu.Framework/Bindables/Bindable.cs
@@ -245,7 +245,7 @@ public virtual void Parse(object input)
                     Value = t;
                     break;
 
-                case IBindable _:
+                case IBindable:
                     if (!(input is IBindable<T> bindable))
                         throw new ArgumentException($"Expected bindable of type {nameof(IBindable)}<{typeof(T)}>, got {input.GetType()}", nameof(input));
 

diff --git a/osu.Framework/Graphics/Containers/Markdown/MarkdownContainer.cs b/osu.Framework/Graphics/Containers/Markdown/MarkdownContainer.cs
@@ -259,11 +259,11 @@ protected virtual void AddMarkdownComponent(IMarkdownObject markdownObject, Fill
                         AddMarkdownComponent(single, container, level);
                     break;
 
-                case HtmlBlock _:
+                case HtmlBlock:
                     // HTML is not supported
                     break;
 
-                case LinkReferenceDefinitionGroup _:
+                case LinkReferenceDefinitionGroup:
                     // Link reference doesn't need to be displayed.
                     break;
 

diff --git a/osu.Framework/Graphics/Containers/Markdown/MarkdownTextFlowContainer.cs b/osu.Framework/Graphics/Containers/Markdown/MarkdownTextFlowContainer.cs
@@ -56,7 +56,7 @@ public void AddInlineText(ContainerInline container)
                         {
                             switch (literal.Parent)
                             {
-                                case EmphasisInline _:
+                                case EmphasisInline:
                                     var parent = literal.Parent;
 
                                     var emphases = new List<string>();
@@ -94,8 +94,8 @@ public void AddInlineText(ContainerInline container)
                         AddImage(linkInline);
                         break;
 
-                    case HtmlInline _:
-                    case HtmlEntityInline _:
+                    case HtmlInline:
+                    case HtmlEntityInline:
                         // Handled by the next literal
                         break;
 

diff --git a/osu.Framework/Graphics/Containers/OverlayContainer.cs b/osu.Framework/Graphics/Containers/OverlayContainer.cs
@@ -49,13 +49,13 @@ protected override bool Handle(UIEvent e)
         {
             switch (e)
             {
-                case ScrollEvent _:
+                case ScrollEvent:
                     if (BlockScrollInput && base.ReceivePositionalInputAt(e.ScreenSpaceMousePosition))
                         return true;
 
                     break;
 
-                case MouseEvent _:
+                case MouseEvent:
                     if (BlockPositionalInput)
                         return true;
 

diff --git a/osu.Framework/Input/InputManager.cs b/osu.Framework/Input/InputManager.cs
@@ -890,9 +890,9 @@ private bool shouldLog(UIEvent eventType)
                 case KeyDownEvent k:
                     return !k.Repeat;
 
-                case DragEvent _:
-                case ScrollEvent _:
-                case MouseMoveEvent _:
+                case DragEvent:
+                case ScrollEvent:
+                case MouseMoveEvent:
                     return false;
 
                 default:

diff --git a/osu.Framework/Input/PassThroughInputManager.cs b/osu.Framework/Input/PassThroughInputManager.cs
@@ -120,11 +120,11 @@ protected override bool Handle(UIEvent e)
                     new MidiKeyInput(midi.Key, midi.Velocity, midi.IsPressed(midi.Key)).Apply(CurrentState, this);
                     break;
 
-                case KeyboardEvent _:
-                case JoystickButtonEvent _:
-                case JoystickAxisMoveEvent _:
-                case TabletPenButtonEvent _:
-                case TabletAuxiliaryButtonEvent _:
+                case KeyboardEvent:
+                case JoystickButtonEvent:
+                case JoystickAxisMoveEvent:
+                case TabletPenButtonEvent:
+                case TabletAuxiliaryButtonEvent:
                     SyncInputState(e.CurrentState);
                     break;
             }

diff --git a/osu.Framework/Input/UserInputManager.cs b/osu.Framework/Input/UserInputManager.cs
@@ -73,7 +73,7 @@ public override void HandleInputStateChange(InputStateChangeEvent inputStateChan
 
                     break;
 
-                case MouseScrollChangeEvent _:
+                case MouseScrollChangeEvent:
                     if (Host.Window?.CursorInWindow.Value == false)
                         return;
-Original file line number
+Diff line change
@@ Expand Up @@
                         break;
-                    case MouseScrollChangeEvent _:
+                    case MouseScrollChangeEvent:
                         if (Host.Window?.CursorInWindow.Value == false)
                             return;
@@ Expand Down @@