mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-16 11:48:06 +01:00
CmdPal: Align spellchecker and naming to .NET guidelines (#43974)
## Summary of the Pull Request - Add command-line parameter value (icf) - Unify file and class name casing to match .NET naming conventions (RDP -> Rdp as Url, Dns, Xml) -- fixes IRDP spellchecking error - Rename IRdpConnectionManager to IRdpConnectionsManager (*s) to match the class name <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx <!-- - [ ] Closes: #yyy (add separate lines for additional resolved issues) --> - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed
This commit is contained in:
2
.github/actions/spell-check/expect.txt
vendored
2
.github/actions/spell-check/expect.txt
vendored
@@ -728,6 +728,7 @@ HWNDPARENT
|
|||||||
HWNDPREV
|
HWNDPREV
|
||||||
hyjiacan
|
hyjiacan
|
||||||
IAI
|
IAI
|
||||||
|
icf
|
||||||
ICONERROR
|
ICONERROR
|
||||||
ICONLOCATION
|
ICONLOCATION
|
||||||
IDCANCEL
|
IDCANCEL
|
||||||
@@ -800,7 +801,6 @@ invokecommand
|
|||||||
ipcmanager
|
ipcmanager
|
||||||
IPREVIEW
|
IPREVIEW
|
||||||
ipreviewhandlervisualssetfont
|
ipreviewhandlervisualssetfont
|
||||||
irdp
|
|
||||||
IPTC
|
IPTC
|
||||||
irow
|
irow
|
||||||
irprops
|
irprops
|
||||||
|
|||||||
@@ -113,10 +113,10 @@ public class FallbackRemoteDesktopItemTests
|
|||||||
return field.GetValue(command) as string ?? string.Empty;
|
return field.GetValue(command) as string ?? string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static (FallbackRemoteDesktopItem Fallback, IRdpConnectionManager Manager) CreateFallback(params string[] connectionNames)
|
private static (FallbackRemoteDesktopItem Fallback, IRdpConnectionsManager Manager) CreateFallback(params string[] connectionNames)
|
||||||
{
|
{
|
||||||
var settingsManager = new MockSettingsManager(connectionNames);
|
var settingsManager = new MockSettingsManager(connectionNames);
|
||||||
var connectionsManager = new MockRDPConnectionsManager(settingsManager);
|
var connectionsManager = new MockRdpConnectionsManager(settingsManager);
|
||||||
|
|
||||||
var fallback = new FallbackRemoteDesktopItem(connectionsManager);
|
var fallback = new FallbackRemoteDesktopItem(connectionsManager);
|
||||||
|
|
||||||
|
|||||||
@@ -10,13 +10,13 @@ using Microsoft.CmdPal.Ext.RemoteDesktop.Settings;
|
|||||||
|
|
||||||
namespace Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests;
|
namespace Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests;
|
||||||
|
|
||||||
internal sealed class MockRDPConnectionsManager : IRdpConnectionManager
|
internal sealed class MockRdpConnectionsManager : IRdpConnectionsManager
|
||||||
{
|
{
|
||||||
private readonly List<ConnectionListItem> _connections = new();
|
private readonly List<ConnectionListItem> _connections = new();
|
||||||
|
|
||||||
public IReadOnlyCollection<ConnectionListItem> Connections => _connections.AsReadOnly();
|
public IReadOnlyCollection<ConnectionListItem> Connections => _connections.AsReadOnly();
|
||||||
|
|
||||||
public MockRDPConnectionsManager(ISettingsInterface settingsManager)
|
public MockRdpConnectionsManager(ISettingsInterface settingsManager)
|
||||||
{
|
{
|
||||||
_connections.AddRange(settingsManager.PredefinedConnections.Select(ConnectionHelpers.MapToResult));
|
_connections.AddRange(settingsManager.PredefinedConnections.Select(ConnectionHelpers.MapToResult));
|
||||||
}
|
}
|
||||||
@@ -10,13 +10,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
|
|||||||
namespace Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests;
|
namespace Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests;
|
||||||
|
|
||||||
[TestClass]
|
[TestClass]
|
||||||
public class RDPConnectionsManagerTests
|
public class RdpConnectionsManagerTests
|
||||||
{
|
{
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void Constructor_AddsOpenCommandItem()
|
public void Constructor_AddsOpenCommandItem()
|
||||||
{
|
{
|
||||||
// Act
|
// Act
|
||||||
var manager = new RDPConnectionsManager(new MockSettingsManager(["test.local"]));
|
var manager = new RdpConnectionsManager(new MockSettingsManager(["test.local"]));
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
Assert.IsTrue(manager.Connections.Any(item => string.IsNullOrEmpty(item.ConnectionName)));
|
Assert.IsTrue(manager.Connections.Any(item => string.IsNullOrEmpty(item.ConnectionName)));
|
||||||
@@ -23,9 +23,9 @@ internal sealed partial class FallbackRemoteDesktopItem : FallbackCommandItem
|
|||||||
];
|
];
|
||||||
|
|
||||||
private static readonly CompositeFormat RemoteDesktopOpenHostFormat = CompositeFormat.Parse(Resources.remotedesktop_open_host);
|
private static readonly CompositeFormat RemoteDesktopOpenHostFormat = CompositeFormat.Parse(Resources.remotedesktop_open_host);
|
||||||
private readonly IRdpConnectionManager _rdpConnectionsManager;
|
private readonly IRdpConnectionsManager _rdpConnectionsManager;
|
||||||
|
|
||||||
public FallbackRemoteDesktopItem(IRdpConnectionManager rdpConnectionsManager)
|
public FallbackRemoteDesktopItem(IRdpConnectionsManager rdpConnectionsManager)
|
||||||
: base(new OpenRemoteDesktopCommand(string.Empty), Resources.remotedesktop_title)
|
: base(new OpenRemoteDesktopCommand(string.Empty), Resources.remotedesktop_title)
|
||||||
{
|
{
|
||||||
_rdpConnectionsManager = rdpConnectionsManager;
|
_rdpConnectionsManager = rdpConnectionsManager;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Ext.RemoteDesktop.Commands;
|
|||||||
|
|
||||||
namespace Microsoft.CmdPal.Ext.RemoteDesktop.Helper;
|
namespace Microsoft.CmdPal.Ext.RemoteDesktop.Helper;
|
||||||
|
|
||||||
internal interface IRdpConnectionManager
|
internal interface IRdpConnectionsManager
|
||||||
{
|
{
|
||||||
IReadOnlyCollection<ConnectionListItem> Connections { get; }
|
IReadOnlyCollection<ConnectionListItem> Connections { get; }
|
||||||
}
|
}
|
||||||
@@ -13,7 +13,7 @@ using Microsoft.Win32;
|
|||||||
|
|
||||||
namespace Microsoft.CmdPal.Ext.RemoteDesktop.Helper;
|
namespace Microsoft.CmdPal.Ext.RemoteDesktop.Helper;
|
||||||
|
|
||||||
internal class RDPConnectionsManager : IRdpConnectionManager
|
internal class RdpConnectionsManager : IRdpConnectionsManager
|
||||||
{
|
{
|
||||||
private readonly ISettingsInterface _settingsManager;
|
private readonly ISettingsInterface _settingsManager;
|
||||||
private readonly ConnectionListItem _openRdpCommandListItem = new(string.Empty);
|
private readonly ConnectionListItem _openRdpCommandListItem = new(string.Empty);
|
||||||
@@ -23,7 +23,7 @@ internal class RDPConnectionsManager : IRdpConnectionManager
|
|||||||
private const int MinutesToCache = 1;
|
private const int MinutesToCache = 1;
|
||||||
private DateTime? _connectionsLastLoaded;
|
private DateTime? _connectionsLastLoaded;
|
||||||
|
|
||||||
public RDPConnectionsManager(ISettingsInterface settingsManager)
|
public RdpConnectionsManager(ISettingsInterface settingsManager)
|
||||||
{
|
{
|
||||||
_settingsManager = settingsManager;
|
_settingsManager = settingsManager;
|
||||||
_settingsManager.Settings.SettingsChanged += (s, e) =>
|
_settingsManager.Settings.SettingsChanged += (s, e) =>
|
||||||
@@ -12,16 +12,16 @@ namespace Microsoft.CmdPal.Ext.RemoteDesktop.Pages;
|
|||||||
|
|
||||||
internal sealed partial class RemoteDesktopListPage : ListPage
|
internal sealed partial class RemoteDesktopListPage : ListPage
|
||||||
{
|
{
|
||||||
private readonly IRdpConnectionManager _rdpConnectionManager;
|
private readonly IRdpConnectionsManager _rdpConnectionsManager;
|
||||||
|
|
||||||
public RemoteDesktopListPage(IRdpConnectionManager rdpConnectionManager)
|
public RemoteDesktopListPage(IRdpConnectionsManager rdpConnectionsManager)
|
||||||
{
|
{
|
||||||
Icon = Icons.RDPIcon;
|
Icon = Icons.RDPIcon;
|
||||||
Name = Resources.remotedesktop_title;
|
Name = Resources.remotedesktop_title;
|
||||||
Id = "com.microsoft.cmdpal.builtin.remotedesktop";
|
Id = "com.microsoft.cmdpal.builtin.remotedesktop";
|
||||||
|
|
||||||
_rdpConnectionManager = rdpConnectionManager;
|
_rdpConnectionsManager = rdpConnectionsManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override IListItem[] GetItems() => _rdpConnectionManager.Connections.ToArray();
|
public override IListItem[] GetItems() => _rdpConnectionsManager.Connections.ToArray();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ public partial class RemoteDesktopCommandProvider : CommandProvider
|
|||||||
Icon = Icons.RDPIcon;
|
Icon = Icons.RDPIcon;
|
||||||
|
|
||||||
var settingsManager = new SettingsManager();
|
var settingsManager = new SettingsManager();
|
||||||
var rdpConnectionsManager = new RDPConnectionsManager(settingsManager);
|
var rdpConnectionsManager = new RdpConnectionsManager(settingsManager);
|
||||||
var listPage = new RemoteDesktopListPage(rdpConnectionsManager);
|
var listPage = new RemoteDesktopListPage(rdpConnectionsManager);
|
||||||
|
|
||||||
fallback = new FallbackRemoteDesktopItem(rdpConnectionsManager);
|
fallback = new FallbackRemoteDesktopItem(rdpConnectionsManager);
|
||||||
|
|||||||
Reference in New Issue
Block a user