Revert "Code Quality: Added debug logs for Omnibar (#17231)"

yaira2 · yaira2 · commit cb5a99f90734 · 2025-07-01T17:09:37.000-04:00
This reverts commit bd2f5f1.
diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj
@@ -10,7 +10,6 @@
         <Platforms>x86;x64;arm64</Platforms>
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <DefineConstants>$(DefineConstants);OMNIBAR_DEBUG</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Files.App.Controls/Omnibar/Omnibar.Events.cs b/src/Files.App.Controls/Omnibar/Omnibar.Events.cs
@@ -27,8 +27,6 @@ private void AutoSuggestBox_GettingFocus(UIElement sender, GettingFocusEventArgs
 			if (args.OldFocusedElement is null)
 				return;
 
-			GlobalHelper.WriteDebugStringForOmnibar("The TextBox is getting the focus.");
-
 			_previouslyFocusedElement = new(args.OldFocusedElement as UIElement);
 		}
 
@@ -44,8 +42,6 @@ private void AutoSuggestBox_LosingFocus(UIElement sender, LosingFocusEventArgs a
 
 		private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)
 		{
-			GlobalHelper.WriteDebugStringForOmnibar("The TextBox got the focus.");
-
 			IsFocused = true;
 			_textBox.SelectAll();
 		}
@@ -56,8 +52,6 @@ private void AutoSuggestBox_LostFocus(object sender, RoutedEventArgs e)
 			if (_textBox.ContextFlyout.IsOpen)
 				return;
 
-			GlobalHelper.WriteDebugStringForOmnibar("The TextBox lost the focus.");
-
 			IsFocused = false;
 		}
 
@@ -67,16 +61,12 @@ private async void AutoSuggestBox_KeyDown(object sender, KeyRoutedEventArgs e)
 			{
 				e.Handled = true;
 
-				GlobalHelper.WriteDebugStringForOmnibar("The TextBox accepted the Enter key.");
-
 				SubmitQuery(_textBoxSuggestionsPopup.IsOpen && _textBoxSuggestionsListView.SelectedIndex is not -1 ? _textBoxSuggestionsListView.SelectedItem : null);
 			}
 			else if ((e.Key == VirtualKey.Up || e.Key == VirtualKey.Down) && _textBoxSuggestionsPopup.IsOpen)
 			{
 				e.Handled = true;
 
-				GlobalHelper.WriteDebugStringForOmnibar("The TextBox accepted the Up/Down key while the suggestions pop-up is open.");
-
 				var currentIndex = _textBoxSuggestionsListView.SelectedIndex;
 				var nextIndex = currentIndex;
 				var suggestionsCount = _textBoxSuggestionsListView.Items.Count;
@@ -105,8 +95,6 @@ private async void AutoSuggestBox_KeyDown(object sender, KeyRoutedEventArgs e)
 			{
 				e.Handled = true;
 
-				GlobalHelper.WriteDebugStringForOmnibar("The TextBox accepted the Esc key.");
-
 				if (_textBoxSuggestionsPopup.IsOpen)
 				{
 					RevertTextToUserInput();
@@ -120,8 +108,6 @@ private async void AutoSuggestBox_KeyDown(object sender, KeyRoutedEventArgs e)
 			}
 			else if (e.Key == VirtualKey.Tab && !InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down))
 			{
-				GlobalHelper.WriteDebugStringForOmnibar("The TextBox accepted the Tab key.");
-
 				// Focus on inactive content when pressing Tab instead of moving to the next control in the tab order
 				e.Handled = true;
 				IsFocused = false;
@@ -156,7 +142,6 @@ private void AutoSuggestBox_TextChanged(object sender, TextChangedEventArgs e)
 
 		private void AutoSuggestBoxSuggestionsPopup_GettingFocus(UIElement sender, GettingFocusEventArgs args)
 		{
-			// The suggestions popup is never wanted to be focused when it come to open.
 			args.TryCancel();
 		}
 
diff --git a/src/Files.App.Controls/Omnibar/Omnibar.Properties.cs b/src/Files.App.Controls/Omnibar/Omnibar.Properties.cs
@@ -27,11 +27,6 @@ partial void OnCurrentSelectedModePropertyChanged(DependencyPropertyChangedEvent
 			if (e.NewValue is not OmnibarMode newMode)
 				return;
 
-			if (e.OldValue is OmnibarMode oldMode)
-				GlobalHelper.WriteDebugStringForOmnibar($"The mode change from {oldMode} to {newMode} has been requested.");
-			else
-				GlobalHelper.WriteDebugStringForOmnibar($"The mode change to {newMode} has been requested.");
-
 			ChangeMode(e.OldValue as OmnibarMode, newMode);
 			CurrentSelectedModeName = newMode.Name;
 		}
@@ -56,8 +51,6 @@ partial void OnIsFocusedChanged(bool newValue)
 			if (CurrentSelectedMode is null || _textBox is null)
 				return;
 
-			GlobalHelper.WriteDebugStringForOmnibar($"{nameof(IsFocused)} has been changed to {IsFocused}");
-
 			if (newValue)
 			{
 				VisualStateManager.GoToState(CurrentSelectedMode, "Focused", true);
diff --git a/src/Files.App.Controls/Omnibar/Omnibar.cs b/src/Files.App.Controls/Omnibar/Omnibar.cs
@@ -51,8 +51,6 @@ public Omnibar()
 
 			Modes = [];
 			AutoSuggestBoxPadding = new(0, 0, 0, 0);
-
-			GlobalHelper.WriteDebugStringForOmnibar("Omnibar has been initialized.");
 		}
 
 		// Methods
@@ -89,8 +87,6 @@ protected override void OnApplyTemplate()
 
 			// Set the default width
 			_textBoxSuggestionsContainerBorder.Width = ActualWidth;
-
-			GlobalHelper.WriteDebugStringForOmnibar("The template and the events have been initialized.");
 		}
 
 		public void PopulateModes()
@@ -200,8 +196,6 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
 				mode.Transitions.Clear();
 				mode.UpdateLayout();
 			}
-
-			GlobalHelper.WriteDebugStringForOmnibar($"Successfully changed Mode from {oldMode} to {newMode}");
 		}
 
 		internal protected void FocusTextBox()
@@ -217,16 +211,11 @@ internal protected bool TryToggleIsSuggestionsPopupOpen(bool wantToOpen)
 			if (wantToOpen && (!IsFocused || CurrentSelectedMode?.ItemsSource is null || (CurrentSelectedMode?.ItemsSource is IList collection && collection.Count is 0)))
 			{
 				_textBoxSuggestionsPopup.IsOpen = false;
-
-				GlobalHelper.WriteDebugStringForOmnibar("The suggestions pop-up closed.");
-
 				return false;
 			}
 
 			_textBoxSuggestionsPopup.IsOpen = wantToOpen;
 
-			GlobalHelper.WriteDebugStringForOmnibar("The suggestions pop-up is open.");
-
 			return false;
 		}
 
diff --git a/src/Files.App.Controls/Omnibar/OmnibarMode.Events.cs b/src/Files.App.Controls/Omnibar/OmnibarMode.Events.cs
@@ -12,8 +12,6 @@ private void ModeButton_PointerEntered(object sender, PointerRoutedEventArgs e)
 			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)
 				return;
 
-			GlobalHelper.WriteDebugStringForOmnibar($"The mouse pointer has entered the UI area of this Mode ({this})");
-
 			VisualStateManager.GoToState(this, "PointerOver", true);
 		}
 
@@ -22,8 +20,6 @@ private void ModeButton_PointerPressed(object sender, PointerRoutedEventArgs e)
 			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)
 				return;
 
-			GlobalHelper.WriteDebugStringForOmnibar($"The mouse pointer has been pressed on the UI area of this Mode ({this})");
-
 			VisualStateManager.GoToState(this, "PointerPressed", true);
 		}
 
@@ -32,8 +28,6 @@ private void ModeButton_PointerReleased(object sender, PointerRoutedEventArgs e)
 			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)
 				return;
 
-			GlobalHelper.WriteDebugStringForOmnibar($"The mouse pointer has been unpressed from the UI area of this Mode ({this})");
-
 			VisualStateManager.GoToState(this, "PointerOver", true);
 
 			owner.IsModeButtonPressed = true;
@@ -44,8 +38,6 @@ private void ModeButton_PointerReleased(object sender, PointerRoutedEventArgs e)
 
 		private void ModeButton_PointerExited(object sender, PointerRoutedEventArgs e)
 		{
-			GlobalHelper.WriteDebugStringForOmnibar($"The mouse pointer has moved away from the UI area of this Mode ({this})");
-
 			VisualStateManager.GoToState(this, "PointerNormal", true);
 		}
 	}
diff --git a/src/Files.App.Controls/Omnibar/OmnibarMode.cs b/src/Files.App.Controls/Omnibar/OmnibarMode.cs
@@ -23,8 +23,6 @@ public partial class OmnibarMode : ItemsControl
 		public OmnibarMode()
 		{
 			DefaultStyleKey = typeof(OmnibarMode);
-
-			GlobalHelper.WriteDebugStringForOmnibar($"Omnibar Mode ({this}) has been initialized.");
 		}
 
 		// Methods
@@ -41,8 +39,6 @@ protected override void OnApplyTemplate()
 			_modeButton.PointerPressed += ModeButton_PointerPressed;
 			_modeButton.PointerReleased += ModeButton_PointerReleased;
 			_modeButton.PointerExited += ModeButton_PointerExited;
-
-			GlobalHelper.WriteDebugStringForOmnibar($"The template and the events of the Omnibar Mode ({this}) have been initialized.");
 		}
 
 		protected override void OnKeyUp(KeyRoutedEventArgs args)
@@ -92,7 +88,7 @@ public void SetOwner(Omnibar owner)
 
 		public override string ToString()
 		{
-			return Name ?? string.Empty;
+			return ModeName ?? string.Empty;
 		}
 	}
 }
diff --git a/src/Files.App.Controls/Util.cs b/src/Files.App.Controls/Util.cs
@@ -3,7 +3,7 @@
 
 namespace Files.App.Controls
 {
-	public static class GlobalHelper
+	public static class Util
 	{
 		/// <summary>
 		/// Sets cursor when hovering on a specific element.
@@ -22,11 +22,5 @@ public static void ChangeCursor(this UIElement uiElement, InputCursor cursor)
 				[cursor]
 			);
 		}
-
-		[Conditional("OMNIBAR_DEBUG")]
-		public static void WriteDebugStringForOmnibar(string? message)
-		{
-			Debug.WriteLine($"OMNIBAR DEBUG: [{message}]");
-		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ private void AutoSuggestBox_GettingFocus(UIElement sender, GettingFocusEventArgs`
`27`	`27`	`if (args.OldFocusedElement is null)`
`28`	`28`	`return;`
`29`	`29`
`30`		`- GlobalHelper.WriteDebugStringForOmnibar("The TextBox is getting the focus.");`
`31`		`-`
`32`	`30`	`_previouslyFocusedElement = new(args.OldFocusedElement as UIElement);`
`33`	`31`	`}`
`34`	`32`
`@@ -44,8 +42,6 @@ private void AutoSuggestBox_LosingFocus(UIElement sender, LosingFocusEventArgs a`
`44`	`42`
`45`	`43`	`private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)`
`46`	`44`	`{`
`47`		`- GlobalHelper.WriteDebugStringForOmnibar("The TextBox got the focus.");`
`48`		`-`
`49`	`45`	`IsFocused = true;`
`50`	`46`	`_textBox.SelectAll();`
`51`	`47`	`}`
`@@ -56,8 +52,6 @@ private void AutoSuggestBox_LostFocus(object sender, RoutedEventArgs e)`
`56`	`52`	`if (_textBox.ContextFlyout.IsOpen)`
`57`	`53`	`return;`
`58`	`54`
`59`		`- GlobalHelper.WriteDebugStringForOmnibar("The TextBox lost the focus.");`
`60`		`-`
`61`	`55`	`IsFocused = false;`
`62`	`56`	`}`
`63`	`57`
`@@ -67,16 +61,12 @@ private async void AutoSuggestBox_KeyDown(object sender, KeyRoutedEventArgs e)`
`67`	`61`	`{`
`68`	`62`	`e.Handled = true;`
`69`	`63`
`70`		`- GlobalHelper.WriteDebugStringForOmnibar("The TextBox accepted the Enter key.");`
`71`		`-`
`72`	`64`	`SubmitQuery(_textBoxSuggestionsPopup.IsOpen && _textBoxSuggestionsListView.SelectedIndex is not -1 ? _textBoxSuggestionsListView.SelectedItem : null);`
`73`	`65`	`}`
`74`	`66`	`else if ((e.Key == VirtualKey.Up \|\| e.Key == VirtualKey.Down) && _textBoxSuggestionsPopup.IsOpen)`
`75`	`67`	`{`
`76`	`68`	`e.Handled = true;`
`77`	`69`
`78`		`- GlobalHelper.WriteDebugStringForOmnibar("The TextBox accepted the Up/Down key while the suggestions pop-up is open.");`
`79`		`-`
`80`	`70`	`var currentIndex = _textBoxSuggestionsListView.SelectedIndex;`
`81`	`71`	`var nextIndex = currentIndex;`
`82`	`72`	`var suggestionsCount = _textBoxSuggestionsListView.Items.Count;`
`@@ -105,8 +95,6 @@ private async void AutoSuggestBox_KeyDown(object sender, KeyRoutedEventArgs e)`
`105`	`95`	`{`
`106`	`96`	`e.Handled = true;`
`107`	`97`
`108`		`- GlobalHelper.WriteDebugStringForOmnibar("The TextBox accepted the Esc key.");`
`109`		`-`
`110`	`98`	`if (_textBoxSuggestionsPopup.IsOpen)`
`111`	`99`	`{`
`112`	`100`	`RevertTextToUserInput();`
`@@ -120,8 +108,6 @@ private async void AutoSuggestBox_KeyDown(object sender, KeyRoutedEventArgs e)`
`120`	`108`	`}`
`121`	`109`	`else if (e.Key == VirtualKey.Tab && !InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down))`
`122`	`110`	`{`
`123`		`- GlobalHelper.WriteDebugStringForOmnibar("The TextBox accepted the Tab key.");`
`124`		`-`
`125`	`111`	`// Focus on inactive content when pressing Tab instead of moving to the next control in the tab order`
`126`	`112`	`e.Handled = true;`
`127`	`113`	`IsFocused = false;`
`@@ -156,7 +142,6 @@ private void AutoSuggestBox_TextChanged(object sender, TextChangedEventArgs e)`
`156`	`142`
`157`	`143`	`private void AutoSuggestBoxSuggestionsPopup_GettingFocus(UIElement sender, GettingFocusEventArgs args)`
`158`	`144`	`{`
`159`		`- // The suggestions popup is never wanted to be focused when it come to open.`
`160`	`145`	`args.TryCancel();`
`161`	`146`	`}`
`162`	`147`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,6 @@ public Omnibar()`
`51`	`51`
`52`	`52`	`Modes = [];`
`53`	`53`	`AutoSuggestBoxPadding = new(0, 0, 0, 0);`
`54`		`-`
`55`		`- GlobalHelper.WriteDebugStringForOmnibar("Omnibar has been initialized.");`
`56`	`54`	`}`
`57`	`55`
`58`	`56`	`// Methods`
`@@ -89,8 +87,6 @@ protected override void OnApplyTemplate()`
`89`	`87`
`90`	`88`	`// Set the default width`
`91`	`89`	`_textBoxSuggestionsContainerBorder.Width = ActualWidth;`
`92`		`-`
`93`		`- GlobalHelper.WriteDebugStringForOmnibar("The template and the events have been initialized.");`
`94`	`90`	`}`
`95`	`91`
`96`	`92`	`public void PopulateModes()`
`@@ -200,8 +196,6 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)`
`200`	`196`	`mode.Transitions.Clear();`
`201`	`197`	`mode.UpdateLayout();`
`202`	`198`	`}`
`203`		`-`
`204`		`- GlobalHelper.WriteDebugStringForOmnibar($"Successfully changed Mode from {oldMode} to {newMode}");`
`205`	`199`	`}`
`206`	`200`
`207`	`201`	`internal protected void FocusTextBox()`
`@@ -217,16 +211,11 @@ internal protected bool TryToggleIsSuggestionsPopupOpen(bool wantToOpen)`
`217`	`211`	`if (wantToOpen && (!IsFocused \|\| CurrentSelectedMode?.ItemsSource is null \|\| (CurrentSelectedMode?.ItemsSource is IList collection && collection.Count is 0)))`
`218`	`212`	`{`
`219`	`213`	`_textBoxSuggestionsPopup.IsOpen = false;`
`220`		`-`
`221`		`- GlobalHelper.WriteDebugStringForOmnibar("The suggestions pop-up closed.");`
`222`		`-`
`223`	`214`	`return false;`
`224`	`215`	`}`
`225`	`216`
`226`	`217`	`_textBoxSuggestionsPopup.IsOpen = wantToOpen;`
`227`	`218`
`228`		`- GlobalHelper.WriteDebugStringForOmnibar("The suggestions pop-up is open.");`
`229`		`-`
`230`	`219`	`return false;`
`231`	`220`	`}`
`232`	`221`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ private void ModeButton_PointerEntered(object sender, PointerRoutedEventArgs e)`
`12`	`12`	`if (_ownerRef is null \|\| _ownerRef.TryGetTarget(out var owner) is false \|\| owner.CurrentSelectedMode == this)`
`13`	`13`	`return;`
`14`	`14`
`15`		`- GlobalHelper.WriteDebugStringForOmnibar($"The mouse pointer has entered the UI area of this Mode ({this})");`
`16`		`-`
`17`	`15`	`VisualStateManager.GoToState(this, "PointerOver", true);`
`18`	`16`	`}`
`19`	`17`
`@@ -22,8 +20,6 @@ private void ModeButton_PointerPressed(object sender, PointerRoutedEventArgs e)`
`22`	`20`	`if (_ownerRef is null \|\| _ownerRef.TryGetTarget(out var owner) is false \|\| owner.CurrentSelectedMode == this)`
`23`	`21`	`return;`
`24`	`22`
`25`		`- GlobalHelper.WriteDebugStringForOmnibar($"The mouse pointer has been pressed on the UI area of this Mode ({this})");`
`26`		`-`
`27`	`23`	`VisualStateManager.GoToState(this, "PointerPressed", true);`
`28`	`24`	`}`
`29`	`25`
`@@ -32,8 +28,6 @@ private void ModeButton_PointerReleased(object sender, PointerRoutedEventArgs e)`
`32`	`28`	`if (_ownerRef is null \|\| _ownerRef.TryGetTarget(out var owner) is false \|\| owner.CurrentSelectedMode == this)`
`33`	`29`	`return;`
`34`	`30`
`35`		`- GlobalHelper.WriteDebugStringForOmnibar($"The mouse pointer has been unpressed from the UI area of this Mode ({this})");`
`36`		`-`
`37`	`31`	`VisualStateManager.GoToState(this, "PointerOver", true);`
`38`	`32`
`39`	`33`	`owner.IsModeButtonPressed = true;`
`@@ -44,8 +38,6 @@ private void ModeButton_PointerReleased(object sender, PointerRoutedEventArgs e)`
`44`	`38`
`45`	`39`	`private void ModeButton_PointerExited(object sender, PointerRoutedEventArgs e)`
`46`	`40`	`{`
`47`		`- GlobalHelper.WriteDebugStringForOmnibar($"The mouse pointer has moved away from the UI area of this Mode ({this})");`
`48`		`-`
`49`	`41`	`VisualStateManager.GoToState(this, "PointerNormal", true);`
`50`	`42`	`}`
`51`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ public partial class OmnibarMode : ItemsControl`
`23`	`23`	`public OmnibarMode()`
`24`	`24`	`{`
`25`	`25`	`DefaultStyleKey = typeof(OmnibarMode);`
`26`		`-`
`27`		`- GlobalHelper.WriteDebugStringForOmnibar($"Omnibar Mode ({this}) has been initialized.");`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`// Methods`
`@@ -41,8 +39,6 @@ protected override void OnApplyTemplate()`
`41`	`39`	`_modeButton.PointerPressed += ModeButton_PointerPressed;`
`42`	`40`	`_modeButton.PointerReleased += ModeButton_PointerReleased;`
`43`	`41`	`_modeButton.PointerExited += ModeButton_PointerExited;`
`44`		`-`
`45`		`- GlobalHelper.WriteDebugStringForOmnibar($"The template and the events of the Omnibar Mode ({this}) have been initialized.");`
`46`	`42`	`}`
`47`	`43`
`48`	`44`	`protected override void OnKeyUp(KeyRoutedEventArgs args)`
`@@ -92,7 +88,7 @@ public void SetOwner(Omnibar owner)`
`92`	`88`
`93`	`89`	`public override string ToString()`
`94`	`90`	`{`
`95`		`- return Name ?? string.Empty;`
	`91`	`+ return ModeName ?? string.Empty;`
`96`	`92`	`}`
`97`	`93`	`}`
`98`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Files.App.Controls`
`5`	`5`	`{`
`6`		`- public static class GlobalHelper`
	`6`	`+ public static class Util`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Sets cursor when hovering on a specific element.`
`@@ -22,11 +22,5 @@ public static void ChangeCursor(this UIElement uiElement, InputCursor cursor)`
`22`	`22`	`[cursor]`
`23`	`23`	`);`
`24`	`24`	`}`
`25`		`-`
`26`		`- [Conditional("OMNIBAR_DEBUG")]`
`27`		`- public static void WriteDebugStringForOmnibar(string? message)`
`28`		`- {`
`29`		`- Debug.WriteLine($"OMNIBAR DEBUG: [{message}]");`
`30`		`- }`
`31`	`25`	`}`
`32`	`26`	`}`