Skip to content

Commit 6f85ee6

Browse files
authored
Merge pull request #3720 from gui-cs/v2_develop
merge v2_develop into v2_release
2 parents 9b87f52 + deadd5b commit 6f85ee6

File tree

12 files changed

+20
-14
lines changed

12 files changed

+20
-14
lines changed

Terminal.Gui/Configuration/ConfigurationManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ public enum ConfigLocations
110110
TypeInfoResolver = SourceGenerationContext.Default
111111
};
112112

113+
[SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
113114
internal static readonly SourceGenerationContext _serializerContext = new (_serializerOptions);
114115

115116
[SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]

Terminal.Gui/Terminal.Gui.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,4 @@
141141
<EnableSourceLink>true</EnableSourceLink>
142142
<Authors>Miguel de Icaza, Tig Kindel (@tig), @BDisp</Authors>
143143
</PropertyGroup>
144-
</Project>
144+
</Project>

Terminal.Gui/View/Layout/Dim.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace Terminal.Gui;
4949
/// </item>
5050
/// <item>
5151
/// <term>
52-
/// <see cref="Dim.Fill(int)"/>
52+
/// <see cref="Dim.Fill(Dim)"/>
5353
/// </term>
5454
/// <description>
5555
/// Creates a <see cref="Dim"/> object that fills the dimension from the View's X position

Terminal.Gui/View/Layout/Pos.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ public static Pos Percent (int percent)
333333
/// <summary>
334334
/// Indicates whether the specified type <typeparamref name="T"/> is in the hierarchy of this Pos object.
335335
/// </summary>
336-
/// <param name="pos">A reference to this <see cref="Pos}"/> instance.</param>
336+
/// <param name="pos">A reference to this <see cref="Pos"/> instance.</param>
337337
/// <returns></returns>
338338
public bool Has<T> (out Pos pos) where T : Pos
339339
{

Terminal.Gui/View/View.Hierarchy.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#nullable enable
22
using System.Diagnostics;
3+
using System.Diagnostics.CodeAnalysis;
34

45
namespace Terminal.Gui;
56

67
public partial class View // SuperView/SubView hierarchy management (SuperView, SubViews, Add, Remove, etc.)
78
{
9+
[SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
810
private static readonly IList<View> _empty = new List<View> (0).AsReadOnly ();
911

1012
private List<View>? _subviews; // This is null, and allocated on demand.

Terminal.Gui/View/View.Layout.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ public Pos Y
451451
/// .
452452
/// </para>
453453
/// <para>
454-
/// If set to a relative value (e.g. <see cref="Dim.Fill(int)"/>) the value is indeterminate until the view has
454+
/// If set to a relative value (e.g. <see cref="Dim.Fill(Dim)"/>) the value is indeterminate until the view has
455455
/// been initialized ( <see cref="IsInitialized"/> is true) and <see cref="SetRelativeLayout"/> has been
456456
/// called.
457457
/// </para>
@@ -500,7 +500,7 @@ public Dim? Height
500500
/// .
501501
/// </para>
502502
/// <para>
503-
/// If set to a relative value (e.g. <see cref="Dim.Fill(int)"/>) the value is indeterminate until the view has
503+
/// If set to a relative value (e.g. <see cref="Dim.Fill(Dim)"/>) the value is indeterminate until the view has
504504
/// been initialized ( <see cref="IsInitialized"/> is true) and <see cref="SetRelativeLayout"/> has been
505505
/// called.
506506
/// </para>

Terminal.Gui/Views/ColorPicker.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private void CreateNameField ()
154154
_tfName.Autocomplete = auto;
155155

156156
_tfName.HasFocusChanged += UpdateValueFromName;
157-
_tfName.Accept += (_s, _) => UpdateValueFromName ();
157+
_tfName.Accept += (s, _) => UpdateValueFromName ();
158158
}
159159

160160
private void CreateTextField ()
@@ -303,7 +303,7 @@ private void UpdateSingleBarValueFromTextField (object? sender)
303303
}
304304
}
305305

306-
private void UpdateValueFromName (object sender, HasFocusEventArgs e)
306+
private void UpdateValueFromName (object? sender, HasFocusEventArgs e)
307307
{
308308
// if the new value of Focused is true then it is an enter event so ignore
309309
if (e.NewValue)

Terminal.Gui/Views/Toplevel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public partial class Toplevel : View
2424
/// <summary>
2525
/// Initializes a new instance of the <see cref="Toplevel"/> class,
2626
/// defaulting to full screen. The <see cref="View.Width"/> and <see cref="View.Height"/> properties will be set to the
27-
/// dimensions of the terminal using <see cref="Dim.Fill"/>.
27+
/// dimensions of the terminal using <see cref="Dim.Fill(Dim)"/>.
2828
/// </summary>
2929
public Toplevel ()
3030
{

UICatalog/UICatalog.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Collections.ObjectModel;
66
using System.CommandLine;
77
using System.Diagnostics;
8+
using System.Diagnostics.CodeAnalysis;
89
using System.Globalization;
910
using System.IO;
1011
using System.Linq;
@@ -55,9 +56,11 @@ public class UICatalogApp
5556
private static int _cachedScenarioIndex;
5657
private static string? _cachedTheme = string.Empty;
5758
private static ObservableCollection<string>? _categories;
59+
[SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
5860
private static readonly FileSystemWatcher _currentDirWatcher = new ();
5961
private static ViewDiagnosticFlags _diagnosticFlags;
6062
private static string _forceDriver = string.Empty;
63+
[SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
6164
private static readonly FileSystemWatcher _homeDirWatcher = new ();
6265
private static bool _isFirstRunning = true;
6366
private static Options _options;
@@ -406,7 +409,7 @@ public UICatalogTopLevel ()
406409
_diagnosticFlags = Diagnostics;
407410

408411
_themeMenuItems = CreateThemeMenuItems ();
409-
_themeMenuBarItem = new ("_Themes", _themeMenuItems);
412+
_themeMenuBarItem = new ("_Themes", _themeMenuItems!);
410413

411414
MenuBar menuBar = new ()
412415
{
@@ -676,7 +679,7 @@ public void ConfigChanged ()
676679

677680
ColorScheme = Colors.ColorSchemes [_topLevelColorScheme];
678681

679-
MenuBar!.Menus [0].Children [0].ShortcutKey = Application.QuitKey;
682+
MenuBar!.Menus [0].Children! [0]!.ShortcutKey = Application.QuitKey;
680683

681684
if (StatusBar is { })
682685
{
@@ -783,6 +786,7 @@ private void CategoryView_SelectedChanged (object? sender, ListViewItemEventArgs
783786

784787
private void ConfigAppliedHandler (object? sender, ConfigurationManagerEventArgs? a) { ConfigChanged (); }
785788

789+
[SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
786790
private MenuItem [] CreateDiagnosticFlagsMenuItems ()
787791
{
788792
const string OFF = "View Diagnostics: _Off";

UnitTests/FileServices/FileDialogTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Terminal.Gui.FileServicesTests;
66

7-
public class FileDialogTests (ITestOutputHelper output)
7+
public class FileDialogTests ()
88
{
99
[Theory]
1010
[InlineData (true)]
@@ -787,7 +787,6 @@ private TextField GetTextField (FileDialog dlg, FileDialogPart part)
787787
return dlg.Subviews.OfType<TextField> ().ElementAt (0);
788788
case FileDialogPart.SearchField:
789789
return dlg.Subviews.OfType<TextField> ().ElementAt (1);
790-
break;
791790
default:
792791
throw new ArgumentOutOfRangeException (nameof (part), part, null);
793792
}

0 commit comments

Comments
 (0)