diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 35ab18554f..ec3898aa7e 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,7 +2,7 @@ blank_issues_enabled: false contact_links: - name: "\U0001F4F7 Video Conference Mute Issue" url: https://github.com/microsoft/PowerToys/issues/6246 - about: Report Bug for the Video Conference Mute utiltity + about: Report Bug for the Video Conference Mute utility - name: "\U0001F6A8 Microsoft Security Response Center (MSRC)" url: https://msrc.microsoft.com/create-report about: Report security bugs diff --git a/README.md b/README.md index f33f6e0acf..df93a1e556 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ Install the [pre-release experimental version of PowerToys][github-prerelease-li ### Other install methods -There are [community driven install methods](./doc/unofficalInstallMethods.md) such as Chocolatey and Scoop. If these are your preferred install solutions, this will have the install instructions. +There are [community driven install methods](./doc/unofficialInstallMethods.md) such as Chocolatey and Scoop. If these are your preferred install solutions, this will have the install instructions. ### Known issues diff --git a/doc/devdocs/modules/launcher/plugins/overview.md b/doc/devdocs/modules/launcher/plugins/overview.md index ea6233c6c4..924d97fcde 100644 --- a/doc/devdocs/modules/launcher/plugins/overview.md +++ b/doc/devdocs/modules/launcher/plugins/overview.md @@ -5,7 +5,7 @@ The following basic functions are common to each of the plugins. They perform so Each plugin implements the `IPlugin` interface which comprises of the `Init()` and `Query()` functions. ### `Init` -- The `Init()` function initializes the context, storage and settings of each plugin. This is equivalent to a contructor and is the first function to be called in the `Main.cs` file for each plugin. +- The `Init()` function initializes the context, storage and settings of each plugin. This is equivalent to a constructor and is the first function to be called in the `Main.cs` file for each plugin. ### `Query` - For every query that the user enters into PT Run, the `PluginManager.cs` executes the `Query()` function in the `Main.cs` file corresponding to each Plugin. diff --git a/doc/devdocs/readme.md b/doc/devdocs/readme.md index cd873fda77..7ecd9bd2a4 100644 --- a/doc/devdocs/readme.md +++ b/doc/devdocs/readme.md @@ -97,7 +97,7 @@ Our installer is two parts, an EXE and an MSI. The EXE contains the MSI and han - From the `installer` folder open `PowerToysSetup.sln` in Visual Studio, in the `Solutions Configuration` drop-down menu select `Release`, from the `Build` menu choose `Build Solution`. - The resulting `PowerToysSetup.msi` installer will be available in the `installer\PowerToysSetup\x64\Release\` folder. -### Compiling Bootstraper Installer (.EXE) +### Compiling Bootstrapper Installer (.EXE) - MSI Installer needs to be built in release mode - Build `PowerToysBootstrapper` solution (`installer\PowerToysBootstrapper\`) diff --git a/doc/devdocs/settingsv2/viewmodels.md b/doc/devdocs/settingsv2/viewmodels.md index 18efd6344f..226ac3ea2b 100644 --- a/doc/devdocs/settingsv2/viewmodels.md +++ b/doc/devdocs/settingsv2/viewmodels.md @@ -18,7 +18,7 @@ The viewmodels are located within the [`Microsoft.PowerToys.Settings.UI.Library` ### Settings viewmodel anomalies - The reason behind using the `SettingsRepository` is to ensure that the settings process does not try to access the `settings.json` files directly but rather does it through this class which encapsulates all the file operations from the viewmodels. - However, this could not be expanded to all the viewmodels directly for the following reasons. Some refactoring must be done to unify these cases and to bring them under the same model: - - The PowerRename viewodel does not save the settings configurations in the same format as the rest of the powertoys, ie. {name, version, properties}. However, it only stores the properties directly. + - The PowerRename viewmodel does not save the settings configurations in the same format as the rest of the powertoys, ie. {name, version, properties}. However, it only stores the properties directly. - Some viewmodels expect the runner to create the file instead of creating the file themselves, like in keyboard manager. - The colorpicker powertoy creates the `settings.json` within the module. This must be taken care of when encapsulated within the settingsRepository. - Currently, all modules use the `SettingsRepository` to access the General Settings config. diff --git a/doc/unofficalInstallMethods.md b/doc/unofficialInstallMethods.md similarity index 100% rename from doc/unofficalInstallMethods.md rename to doc/unofficialInstallMethods.md diff --git a/src/codeAnalysis/GlobalSuppressions.cs b/src/codeAnalysis/GlobalSuppressions.cs index 84431d6686..8ef1d2b41b 100644 --- a/src/codeAnalysis/GlobalSuppressions.cs +++ b/src/codeAnalysis/GlobalSuppressions.cs @@ -25,14 +25,14 @@ using System.Diagnostics.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Design", "CA1009:DeclareEventHandlersCorrectly", Scope = "member", Target = "Microsoft.Templates.Core.Locations.TemplatesSynchronization.#SyncStatusChanged", Justification = "Using an Action does not allow the required notation")] -// Non general supressions +// Non general suppressions [assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "The WebBrowser is loading source code to be shown to the user. No localization required.", MessageId = "System.Windows.Controls.WebBrowser.NavigateToString(System.String)", Scope = "member", Target = "Microsoft.Templates.UI.Controls.CodeViewer.#UpdateCodeView(System.Func`2,System.String,System.String,System.Boolean)")] [assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "This is part of the markdown processing", MessageId = "System.Windows.Documents.Run.#ctor(System.String)", Scope = "member", Target = "Microsoft.Templates.UI.Controls.Markdown.#ImageInlineEvaluator(System.Text.RegularExpressions.Match)")] -[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer especification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.ITemplateInfoExtensions.#GetQueryableProperties(Microsoft.TemplateEngine.Abstractions.ITemplateInfo)")] -[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer especification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.Composition.CompositionQuery.#Match(System.Collections.Generic.IEnumerable`1,Microsoft.Templates.Core.Composition.QueryablePropertyDictionary)")] +[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.ITemplateInfoExtensions.#GetQueryableProperties(Microsoft.TemplateEngine.Abstractions.ITemplateInfo)")] +[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.Composition.CompositionQuery.#Match(System.Collections.Generic.IEnumerable`1,Microsoft.Templates.Core.Composition.QueryablePropertyDictionary)")] [assembly: SuppressMessage("Usage", "VSTHRD103:Call async methods when in an async method", Justification = "Resource DictionaryWriter does not implement flush async", Scope = "member", Target = "~M:Microsoft.Templates.Core.PostActions.Catalog.Merge.MergeResourceDictionaryPostAction.ExecuteInternalAsync~System.Threading.Tasks.Task")] -// Threading supressions +// Threading suppressions [assembly: SuppressMessage("Microsoft.VisualStudio.Threading.Analyzers", "VSTHRD100:Avoid async void methods", Justification = "Event handlers needs async void", Scope = "member", Target = "~M:Microsoft.Templates.UI.Controls.Notification.OnClose")] [assembly: SuppressMessage("Microsoft.VisualStudio.Threading.Analyzers", "VSTHRD100:Avoid async void methods", Justification = "Event handlers needs async void", Scope = "member", Target = "~M:Microsoft.Templates.UI.ViewModels.Common.SavedTemplateViewModel.OnDelete")] [assembly: SuppressMessage("Microsoft.VisualStudio.Threading.Analyzers", "VSTHRD100:Avoid async void methods", Justification = "Event handlers needs async void", Scope = "member", Target = "~M:Microsoft.Templates.UI.ViewModels.Common.WizardNavigation.GoBack")] diff --git a/src/codeAnalysis/Rules.ruleset b/src/codeAnalysis/Rules.ruleset index 98a7888fff..2b106a9730 100644 --- a/src/codeAnalysis/Rules.ruleset +++ b/src/codeAnalysis/Rules.ruleset @@ -1,5 +1,5 @@  - + diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/SystemIOProvider.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/SystemIOProvider.cs index ada9b15fbc..f2895ffd4e 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/SystemIOProvider.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/SystemIOProvider.cs @@ -30,8 +30,8 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities public bool CreateDirectory(string path) { - var directioryInfo = _directory.CreateDirectory(path); - return directioryInfo != null; + var directoryInfo = _directory.CreateDirectory(path); + return directoryInfo != null; } public void DeleteDirectory(string path) diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs index d2353b0ced..67cec70568 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs @@ -88,7 +88,7 @@ namespace Microsoft.PowerToys.Settings.UI.Runner shellPage.Refresh(); } - // XAML Islands: If the window is open, explicity force it to be shown to solve the blank dialog issue https://github.com/microsoft/PowerToys/issues/3384 + // XAML Islands: If the window is open, explicitly force it to be shown to solve the blank dialog issue https://github.com/microsoft/PowerToys/issues/3384 if (isOpen) { Show(); diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs index 86f6db4255..01efdd2370 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs @@ -42,7 +42,7 @@ namespace ViewModelTests ColorPickerViewModel viewModel = new ColorPickerViewModel(mockSettingsUtils, generalSettingsRepository, ColorPickerIsEnabledByDefaultIPC); //Assert - // Verifiy that the old settings persisted + // Verify that the old settings persisted Assert.AreEqual(originalGeneralSettings.Enabled.ColorPicker, viewModel.IsEnabled); Assert.AreEqual(originalSettings.Properties.ActivationShortcut.ToString(), viewModel.ActivationShortcut.ToString()); Assert.AreEqual(originalSettings.Properties.ChangeCursor, viewModel.ChangeCursor); diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs index 8e3a3262df..d40f1d9e94 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs @@ -46,7 +46,7 @@ namespace ViewModelTests // Initialise View Model with test Config files FancyZonesViewModel viewModel = new FancyZonesViewModel(generalSettingsRepository, fancyZonesRepository, ColorPickerIsEnabledByDefault_IPC); - // Verifiy that the old settings persisted + // Verify that the old settings persisted Assert.AreEqual(originalGeneralSettings.Enabled.FancyZones, viewModel.IsEnabled); Assert.AreEqual(originalSettings.Properties.FancyzonesAppLastZoneMoveWindows.Value, viewModel.AppLastZoneMoveWindows); Assert.AreEqual(originalSettings.Properties.FancyzonesBorderColor.Value, viewModel.ZoneBorderColor); diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs index 425f75f7cf..98a5a19bd4 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs @@ -65,7 +65,7 @@ namespace ViewModelTests ipcMSGCheckForUpdatesCallBackFunc: SendCheckForUpdatesIPCMessage, configFileSubfolder: string.Empty); - // Verifiy that the old settings persisted + // Verify that the old settings persisted Assert.AreEqual(originalGeneralSettings.AutoDownloadUpdates, viewModel.AutoDownloadUpdates); Assert.AreEqual(originalGeneralSettings.Packaged, viewModel.Packaged); Assert.AreEqual(originalGeneralSettings.PowertoysVersion, viewModel.PowerToysVersion); diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs index 62eed7965a..452b54a8d9 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs @@ -60,7 +60,7 @@ namespace ViewModelTests Func SendMockIPCConfigMSG = msg => { return 0; }; ImageResizerViewModel viewModel = new ImageResizerViewModel(mockSettingsUtils, generalSettingsRepository, SendMockIPCConfigMSG); - // Verifiy that the old settings persisted + // Verify that the old settings persisted Assert.AreEqual(originalGeneralSettings.Enabled.ImageResizer, viewModel.IsEnabled); Assert.AreEqual(ImageResizerViewModel.GetEncoderIndex(originalSettings.Properties.ImageresizerFallbackEncoder.Value), viewModel.Encoder); Assert.AreEqual(originalSettings.Properties.ImageresizerFileName.Value, viewModel.FileName); @@ -240,7 +240,7 @@ namespace ViewModelTests } [TestMethod] - public void UpdateWidthAndHeightShouldUpateSizeWhenCorrectValuesAreProvided() + public void UpdateWidthAndHeightShouldUpdateSizeWhenCorrectValuesAreProvided() { // arrange ImageSize imageSize = new ImageSize() diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs index f6a405f19a..3662d18094 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs @@ -69,7 +69,7 @@ namespace ViewModelTests Func SendMockIPCConfigMSG = msg => { return 0; }; PowerLauncherViewModel viewModel = new PowerLauncherViewModel(mockSettingsUtils, generalSettingsRepository, SendMockIPCConfigMSG, 32); - // Verifiy that the old settings persisted + // Verify that the old settings persisted Assert.AreEqual(originalGeneralSettings.Enabled.PowerLauncher, viewModel.EnablePowerLauncher); Assert.AreEqual(originalSettings.Properties.ClearInputOnLaunch, viewModel.ClearInputOnLaunch); Assert.AreEqual(originalSettings.Properties.CopyPathLocation.ToString(), viewModel.CopyPathLocation.ToString()); diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs index 4564578c89..c68c973eae 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs @@ -56,7 +56,7 @@ namespace ViewModelTests Func SendMockIPCConfigMSG = msg => { return 0; }; PowerPreviewViewModel viewModel = new PowerPreviewViewModel(repository, generalSettingsRepository, SendMockIPCConfigMSG); - // Verifiy that the old settings persisted + // Verify that the old settings persisted Assert.AreEqual(originalGeneralSettings.IsElevated, viewModel.IsElevated); Assert.AreEqual(originalSettings.Properties.EnableMdPreview, viewModel.MDRenderIsEnabled); Assert.AreEqual(originalSettings.Properties.EnableSvgPreview, viewModel.SVGRenderIsEnabled); diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs index efaa2710c6..571d061734 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs @@ -57,7 +57,7 @@ namespace ViewModelTests Func SendMockIPCConfigMSG = msg => { return 0; }; PowerRenameViewModel viewModel = new PowerRenameViewModel(mockSettingsUtils, generalSettingsRepository, SendMockIPCConfigMSG); - // Verifiy that the old settings persisted + // Verify that the old settings persisted Assert.AreEqual(originalGeneralSettings.Enabled.PowerRename, viewModel.IsEnabled); Assert.AreEqual(originalSettings.ExtendedContextMenuOnly, viewModel.EnabledOnContextExtendedMenu); Assert.AreEqual(originalSettings.MRUEnabled, viewModel.MRUEnabled); diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs index fbdd209adc..53f7a11f06 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs @@ -44,7 +44,7 @@ namespace ViewModelTests Func SendMockIPCConfigMSG = msg => { return 0; }; ShortcutGuideViewModel viewModel = new ShortcutGuideViewModel(generalSettingsRepository, shortcutSettingsRepository, SendMockIPCConfigMSG); - // Verifiy that the old settings persisted + // Verify that the old settings persisted Assert.AreEqual(originalGeneralSettings.Enabled.ShortcutGuide, viewModel.IsEnabled); Assert.AreEqual(originalSettings.Properties.OverlayOpacity.Value, viewModel.OverlayOpacity); Assert.AreEqual(originalSettings.Properties.PressTime.Value, viewModel.PressTime); diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Interop.cs b/src/core/Microsoft.PowerToys.Settings.UI/Interop.cs index 2ad765b37f..3a74a233f4 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Interop.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI/Interop.cs @@ -23,7 +23,7 @@ namespace Microsoft.PowerToys.Settings.UI } } - [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Interop naming consistancy")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Interop naming consistency")] public const int SW_HIDE = 0; } } diff --git a/src/modules/colorPicker/ColorPickerUI/Helpers/ColorRepresentationHelper.cs b/src/modules/colorPicker/ColorPickerUI/Helpers/ColorRepresentationHelper.cs index f3aed7884d..1b2294d915 100644 --- a/src/modules/colorPicker/ColorPickerUI/Helpers/ColorRepresentationHelper.cs +++ b/src/modules/colorPicker/ColorPickerUI/Helpers/ColorRepresentationHelper.cs @@ -10,7 +10,7 @@ using Microsoft.PowerToys.Settings.UI.Library; namespace ColorPicker.Helpers { /// - /// Helper class to easier work with color represantation + /// Helper class to easier work with color representation /// internal static class ColorRepresentationHelper { diff --git a/src/modules/colorPicker/ColorPickerUI/Helpers/IThrottledActionInvoker.cs b/src/modules/colorPicker/ColorPickerUI/Helpers/IThrottledActionInvoker.cs index 6d1860e75d..678b40b3ed 100644 --- a/src/modules/colorPicker/ColorPickerUI/Helpers/IThrottledActionInvoker.cs +++ b/src/modules/colorPicker/ColorPickerUI/Helpers/IThrottledActionInvoker.cs @@ -8,6 +8,6 @@ namespace ColorPicker.Helpers { public interface IThrottledActionInvoker { - void ScheduleAction(Action action, int miliseconds); + void ScheduleAction(Action action, int milliseconds); } } diff --git a/src/modules/colorPicker/ColorPickerUI/Helpers/ThrottledActionInvoker.cs b/src/modules/colorPicker/ColorPickerUI/Helpers/ThrottledActionInvoker.cs index b27386f089..4d8cb8c42f 100644 --- a/src/modules/colorPicker/ColorPickerUI/Helpers/ThrottledActionInvoker.cs +++ b/src/modules/colorPicker/ColorPickerUI/Helpers/ThrottledActionInvoker.cs @@ -21,7 +21,7 @@ namespace ColorPicker.Helpers _timer.Tick += Timer_Tick; } - public void ScheduleAction(Action action, int miliseconds) + public void ScheduleAction(Action action, int milliseconds) { if (_timer.IsEnabled) { @@ -29,7 +29,7 @@ namespace ColorPicker.Helpers } _actionToRun = action; - _timer.Interval = new TimeSpan(0, 0, 0, 0, miliseconds); + _timer.Interval = new TimeSpan(0, 0, 0, 0, milliseconds); _timer.Start(); } diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridData.cs b/src/modules/fancyzones/editor/FancyZonesEditor/GridData.cs index 6b2dcd4b39..9e61428498 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/GridData.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridData.cs @@ -370,24 +370,24 @@ namespace FancyZonesEditor if (delta > 0) { - int sourcRow = 0; + int sourceRow = 0; for (int row = 0; row < rows; row++) { for (int col = 0; col < cols; col++) { if (row == draggedResizerStartRow + 1 && (col < resizer.StartCol || col >= resizer.EndCol)) { - newCellChildMap[row, col] = cellChildMap[sourcRow + 1, col]; + newCellChildMap[row, col] = cellChildMap[sourceRow + 1, col]; } else { - newCellChildMap[row, col] = cellChildMap[sourcRow, col]; + newCellChildMap[row, col] = cellChildMap[sourceRow, col]; } } if (row != draggedResizerStartRow) { - sourcRow++; + sourceRow++; } } diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridDragHandles.cs b/src/modules/fancyzones/editor/FancyZonesEditor/GridDragHandles.cs index 43155a90ed..c126f6c1df 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/GridDragHandles.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridDragHandles.cs @@ -461,10 +461,10 @@ namespace FancyZonesEditor _resizers.Clear(); } - public bool HasSnappedNonAdjascentResizers(GridResizer resizer) + public bool HasSnappedNonAdjacentResizers(GridResizer resizer) { /** - * Resizers between zones 0,1 and 4,5 are snapped to each other and not adjascent. + * Resizers between zones 0,1 and 4,5 are snapped to each other and not adjacent. * ------------------------------ * | 0 | 1 | * ------------------------------ @@ -473,7 +473,7 @@ namespace FancyZonesEditor * | 4 | 5 | * ------------------------------ * - * Resizers between zones 0,1 and 2,3 are snapped to each other and adjascent. + * Resizers between zones 0,1 and 2,3 are snapped to each other and adjacent. * ------------------------------ * | 0 | 1 | * ------------------------------ @@ -484,7 +484,7 @@ namespace FancyZonesEditor * * Vertical resizers should have same StartColumn and different StartRow. * Horizontal resizers should have same StartRow and different StartColumn. - * Difference between rows or colums should be more than 1. + * Difference between rows or columns should be more than 1. */ foreach (GridResizer r in _resizers) { diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs index cd1ee13dac..9b71ede841 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs @@ -400,7 +400,7 @@ namespace FancyZonesEditor GridData.ResizeInfo resizeInfo = _data.CalculateResizeInfo(resizer, delta); if (resizeInfo.IsResizeAllowed) { - if (_dragHandles.HasSnappedNonAdjascentResizers(resizer)) + if (_dragHandles.HasSnappedNonAdjacentResizers(resizer)) { double spacing = 0; Settings settings = ((App)Application.Current).ZoneSettings; diff --git a/src/modules/fancyzones/lib/Settings.cpp b/src/modules/fancyzones/lib/Settings.cpp index c696b263d3..b782d926af 100644 --- a/src/modules/fancyzones/lib/Settings.cpp +++ b/src/modules/fancyzones/lib/Settings.cpp @@ -158,7 +158,7 @@ IFACEMETHODIMP_(void) FancyZonesSettings::CallCustomAction(PCWSTR action) noexce } catch (...) { - // Currently only custom action comming from main PowerToys window is request to launch editor. + // Currently only custom action coming from main PowerToys window is request to launch editor. // If new custom action is added, error message need to be modified. std::wstring errorMessage = GET_RESOURCE_STRING(IDS_FANCYZONES_EDITOR_LAUNCH_ERROR) + L" " + NonLocalizable::PowerToysIssuesURL; MessageBox(NULL, diff --git a/src/modules/fancyzones/lib/VirtualDesktopUtils.cpp b/src/modules/fancyzones/lib/VirtualDesktopUtils.cpp index fb0bf91318..5e7915d2d9 100644 --- a/src/modules/fancyzones/lib/VirtualDesktopUtils.cpp +++ b/src/modules/fancyzones/lib/VirtualDesktopUtils.cpp @@ -96,7 +96,7 @@ namespace VirtualDesktopUtils // Second fallback scenario is to get array of virtual desktops stored in registry, but not kept per // session. Note that we are taking first element from virtual desktop array, which is primary desktop. // If user has more than one virtual desktop, one of previous functions should return correct value, - // as desktop switch occured in current session. + // as desktop switch occurred in current session. else { std::vector ids{}; diff --git a/src/modules/imageresizer/codeAnalysis/GlobalSuppressions.cs b/src/modules/imageresizer/codeAnalysis/GlobalSuppressions.cs index 94ba50d7d7..24fb04bae4 100644 --- a/src/modules/imageresizer/codeAnalysis/GlobalSuppressions.cs +++ b/src/modules/imageresizer/codeAnalysis/GlobalSuppressions.cs @@ -25,14 +25,14 @@ using System.Diagnostics.CodeAnalysis; [assembly: SuppressMessage("Microsoft.Design", "CA1009:DeclareEventHandlersCorrectly", Scope = "member", Target = "Microsoft.Templates.Core.Locations.TemplatesSynchronization.#SyncStatusChanged", Justification = "Using an Action does not allow the required notation")] -// Non general supressions +// Non general suppressions [assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "The WebBrowser is loading source code to be shown to the user. No localization required.", MessageId = "System.Windows.Controls.WebBrowser.NavigateToString(System.String)", Scope = "member", Target = "Microsoft.Templates.UI.Controls.CodeViewer.#UpdateCodeView(System.Func`2,System.String,System.String,System.Boolean)")] [assembly: SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "This is part of the markdown processing", MessageId = "System.Windows.Documents.Run.#ctor(System.String)", Scope = "member", Target = "Microsoft.Templates.UI.Controls.Markdown.#ImageInlineEvaluator(System.Text.RegularExpressions.Match)")] -[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer especification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.ITemplateInfoExtensions.#GetQueryableProperties(Microsoft.TemplateEngine.Abstractions.ITemplateInfo)")] -[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer especification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.Composition.CompositionQuery.#Match(System.Collections.Generic.IEnumerable`1,Microsoft.Templates.Core.Composition.QueryablePropertyDictionary)")] +[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.ITemplateInfoExtensions.#GetQueryableProperties(Microsoft.TemplateEngine.Abstractions.ITemplateInfo)")] +[assembly: SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "We need to have the names of these keys in lowercase to be able to compare with the keys becoming form the template json. ContainsKey does not allow StringComparer specification to IgnoreCase", Scope = "member", Target = "Microsoft.Templates.Core.Composition.CompositionQuery.#Match(System.Collections.Generic.IEnumerable`1,Microsoft.Templates.Core.Composition.QueryablePropertyDictionary)")] [assembly: SuppressMessage("Usage", "VSTHRD103:Call async methods when in an async method", Justification = "Resource DictionaryWriter does not implement flush async", Scope = "member", Target = "~M:Microsoft.Templates.Core.PostActions.Catalog.Merge.MergeResourceDictionaryPostAction.ExecuteInternalAsync~System.Threading.Tasks.Task")] -// Threading supressions +// Threading suppressions [assembly: SuppressMessage("Microsoft.VisualStudio.Threading.Analyzers", "VSTHRD100:Avoid async void methods", Justification = "Event handlers needs async void", Scope = "member", Target = "~M:Microsoft.Templates.UI.Controls.Notification.OnClose")] [assembly: SuppressMessage("Microsoft.VisualStudio.Threading.Analyzers", "VSTHRD100:Avoid async void methods", Justification = "Event handlers needs async void", Scope = "member", Target = "~M:Microsoft.Templates.UI.ViewModels.Common.SavedTemplateViewModel.OnDelete")] [assembly: SuppressMessage("Microsoft.VisualStudio.Threading.Analyzers", "VSTHRD100:Avoid async void methods", Justification = "Event handlers needs async void", Scope = "member", Target = "~M:Microsoft.Templates.UI.ViewModels.Common.WizardNavigation.GoBack")] diff --git a/src/modules/keyboardmanager/common/Helpers.cpp b/src/modules/keyboardmanager/common/Helpers.cpp index 3d82ccd95d..ee8483848f 100644 --- a/src/modules/keyboardmanager/common/Helpers.cpp +++ b/src/modules/keyboardmanager/common/Helpers.cpp @@ -270,13 +270,13 @@ namespace KeyboardManagerHelper return process_name; } - // Function to set key events for modifier keys: When shortcutToCompare is passed (non-empty shortcut), then the key event is sent only if both shortcut's don't have the same modifier key. When keyToBeReleased is passed (non-NULL), then the key event is sent if either the shortcuts don't have the same modfifier or if the shortcutToBeSent's modifier matches the keyToBeReleased + // Function to set key events for modifier keys: When shortcutToCompare is passed (non-empty shortcut), then the key event is sent only if both shortcut's don't have the same modifier key. When keyToBeReleased is passed (non-NULL), then the key event is sent if either the shortcuts don't have the same modifier or if the shortcutToBeSent's modifier matches the keyToBeReleased void SetModifierKeyEvents(const Shortcut& shortcutToBeSent, const ModifierKey& winKeyInvoked, LPINPUT keyEventArray, int& index, bool isKeyDown, ULONG_PTR extraInfoFlag, const Shortcut& shortcutToCompare, const DWORD& keyToBeReleased) { // If key down is to be sent, send in the order Win, Ctrl, Alt, Shift if (isKeyDown) { - // If shortcutToCompare is non-empty, then the key event is sent only if both shortcut's don't have the same modifier key. If keyToBeReleased is non-NULL, then the key event is sent if either the shortcuts don't have the same modfifier or if the shortcutToBeSent's modifier matches the keyToBeReleased + // If shortcutToCompare is non-empty, then the key event is sent only if both shortcut's don't have the same modifier key. If keyToBeReleased is non-NULL, then the key event is sent if either the shortcuts don't have the same modifier or if the shortcutToBeSent's modifier matches the keyToBeReleased if (shortcutToBeSent.GetWinKey(winKeyInvoked) != NULL && (shortcutToCompare.IsEmpty() || shortcutToBeSent.GetWinKey(winKeyInvoked) != shortcutToCompare.GetWinKey(winKeyInvoked)) && (keyToBeReleased == NULL || !shortcutToBeSent.CheckWinKey(keyToBeReleased))) { KeyboardManagerHelper::SetKeyEvent(keyEventArray, index, INPUT_KEYBOARD, (WORD)shortcutToBeSent.GetWinKey(winKeyInvoked), 0, extraInfoFlag); @@ -302,7 +302,7 @@ namespace KeyboardManagerHelper // If key up is to be sent, send in the order Shift, Alt, Ctrl, Win else { - // If shortcutToCompare is non-empty, then the key event is sent only if both shortcut's don't have the same modifier key. If keyToBeReleased is non-NULL, then the key event is sent if either the shortcuts don't have the same modfifier or if the shortcutToBeSent's modifier matches the keyToBeReleased + // If shortcutToCompare is non-empty, then the key event is sent only if both shortcut's don't have the same modifier key. If keyToBeReleased is non-NULL, then the key event is sent if either the shortcuts don't have the same modifier or if the shortcutToBeSent's modifier matches the keyToBeReleased if (shortcutToBeSent.GetShiftKey() != NULL && (shortcutToCompare.IsEmpty() || shortcutToBeSent.GetShiftKey() != shortcutToCompare.GetShiftKey() || shortcutToBeSent.CheckShiftKey(keyToBeReleased))) { KeyboardManagerHelper::SetKeyEvent(keyEventArray, index, INPUT_KEYBOARD, (WORD)shortcutToBeSent.GetShiftKey(), KEYEVENTF_KEYUP, extraInfoFlag); diff --git a/src/modules/keyboardmanager/common/Helpers.h b/src/modules/keyboardmanager/common/Helpers.h index 202b3a3af4..0bd550f246 100644 --- a/src/modules/keyboardmanager/common/Helpers.h +++ b/src/modules/keyboardmanager/common/Helpers.h @@ -96,7 +96,7 @@ namespace KeyboardManagerHelper // Function to return the executable name of the application in focus std::wstring GetCurrentApplication(bool keepPath); - // Function to set key events for modifier keys: When shortcutToCompare is passed (non-empty shortcut), then the key event is sent only if both shortcut's don't have the same modifier key. When keyToBeReleased is passed (non-NULL), then the key event is sent if either the shortcuts don't have the same modfifier or if the shortcutToBeSent's modifier matches the keyToBeReleased + // Function to set key events for modifier keys: When shortcutToCompare is passed (non-empty shortcut), then the key event is sent only if both shortcut's don't have the same modifier key. When keyToBeReleased is passed (non-NULL), then the key event is sent if either the shortcuts don't have the same modifier or if the shortcutToBeSent's modifier matches the keyToBeReleased void SetModifierKeyEvents(const Shortcut& shortcutToBeSent, const ModifierKey& winKeyInvoked, LPINPUT keyEventArray, int& index, bool isKeyDown, ULONG_PTR extraInfoFlag, const Shortcut& shortcutToCompare = Shortcut(), const DWORD& keyToBeReleased = NULL); // Function to filter the key codes for artificial key codes diff --git a/src/modules/keyboardmanager/common/KeyboardManagerState.cpp b/src/modules/keyboardmanager/common/KeyboardManagerState.cpp index 7a91c84d45..c2061b5ac8 100644 --- a/src/modules/keyboardmanager/common/KeyboardManagerState.cpp +++ b/src/modules/keyboardmanager/common/KeyboardManagerState.cpp @@ -618,13 +618,13 @@ std::wstring KeyboardManagerState::GetCurrentConfigName() return currentConfig; } -// Sets the activated target application in app-specfic shortcut +// Sets the activated target application in app-specific shortcut void KeyboardManagerState::SetActivatedApp(const std::wstring& appName) { activatedAppSpecificShortcutTarget = appName; } -// Gets the activated target application in app-specfic shortcut +// Gets the activated target application in app-specific shortcut std::wstring KeyboardManagerState::GetActivatedApp() { return activatedAppSpecificShortcutTarget; diff --git a/src/modules/keyboardmanager/common/KeyboardManagerState.h b/src/modules/keyboardmanager/common/KeyboardManagerState.h index 85a0467249..70969de2d5 100644 --- a/src/modules/keyboardmanager/common/KeyboardManagerState.h +++ b/src/modules/keyboardmanager/common/KeyboardManagerState.h @@ -85,7 +85,7 @@ private: std::map> keyDelays; std::mutex keyDelays_mutex; - // Stores the activated target application in app-specfic shortcut + // Stores the activated target application in app-specific shortcut std::wstring activatedAppSpecificShortcutTarget; // Thread safe boolean value to check if remappings are currently enabled. This is used to disable remappings while the remap tables are being updated by the UI thread @@ -225,10 +225,10 @@ public: // Gets the Current Active Configuration Name. std::wstring GetCurrentConfigName(); - // Sets the activated target application in app-specfic shortcut + // Sets the activated target application in app-specific shortcut void SetActivatedApp(const std::wstring& appName); - // Gets the activated target application in app-specfic shortcut + // Gets the activated target application in app-specific shortcut std::wstring GetActivatedApp(); bool AreRemappingsEnabled(); diff --git a/src/modules/keyboardmanager/test/OSLevelShortcutRemappingTests.cpp b/src/modules/keyboardmanager/test/OSLevelShortcutRemappingTests.cpp index fa3aad3a1a..5705bbfa5c 100644 --- a/src/modules/keyboardmanager/test/OSLevelShortcutRemappingTests.cpp +++ b/src/modules/keyboardmanager/test/OSLevelShortcutRemappingTests.cpp @@ -2237,7 +2237,7 @@ namespace RemappingLogicTests } // Test that shortcut is not disabled if the shortcut which was remapped to Disable is pressed followed by another key - TEST_METHOD (ShortcutDisable_ShouldNotDisableShortcutSuperset_AfterShorcutWasDisabled) + TEST_METHOD (ShortcutDisable_ShouldNotDisableShortcutSuperset_AfterShortcutWasDisabled) { Shortcut src; src.SetKey(VK_CONTROL); diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs index 88afff427f..4bb5cc74dc 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs @@ -119,7 +119,7 @@ namespace Microsoft.Plugin.Indexer } // Function to add the context menu item to run as admin - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "We want to keep the process alive, and instead log the exeption message")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "We want to keep the process alive, and instead log the exception message")] private static ContextMenuResult CreateRunAsAdminContextMenu(SearchResult record) { return new ContextMenuResult diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/ProgramArgumentParser/ProgramArgumentParserTests.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/ProgramArgumentParser/ProgramArgumentParserTests.cs index 06179a493b..8420568d54 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/ProgramArgumentParser/ProgramArgumentParserTests.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/ProgramArgumentParser/ProgramArgumentParserTests.cs @@ -28,7 +28,7 @@ namespace Microsoft.Plugin.Program.UnitTests.ProgramArgumentParser var argumentParsers = new IProgramArgumentParser[] { new DoubleDashProgramArgumentParser(), - new InferedProgramArgumentParser(), + new InferredProgramArgumentParser(), new NoArgumentsArgumentParser(), }; diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Storage/ListRepositoryTests.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Storage/ListRepositoryTests.cs index fbd9f7b7d8..cbaaae7e7f 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Storage/ListRepositoryTests.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Storage/ListRepositoryTests.cs @@ -90,7 +90,7 @@ namespace Microsoft.Plugin.Program.UnitTests.Storage } }); - // Assert that this does not throw. Collections that aren't syncronized will throw an invalidoperatioexception if the list is modified while enumerating + // Assert that this does not throw. Collections that aren't synchronized will throw an invalidoperatioexception if the list is modified while enumerating await Task.WhenAll(new Task[] { iterationTask, addTask }).ConfigureAwait(false); } @@ -129,7 +129,7 @@ namespace Microsoft.Plugin.Program.UnitTests.Storage } }); - // Assert that this does not throw. Collections that aren't syncronized will throw an invalidoperatioexception if the list is modified while enumerating + // Assert that this does not throw. Collections that aren't synchronized will throw an invalidoperatioexception if the list is modified while enumerating await Task.WhenAll(new Task[] { iterationTask, addTask }).ConfigureAwait(false); } } diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs index 67b2dc78b3..1b875a19d1 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs @@ -26,7 +26,7 @@ namespace Microsoft.Plugin.Program private static readonly IProgramArgumentParser[] _programArgumentParsers = new IProgramArgumentParser[] { new DoubleDashProgramArgumentParser(), - new InferedProgramArgumentParser(), + new InferredProgramArgumentParser(), new NoArgumentsArgumentParser(), }; diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/InferedProgramArgumentParser.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/InferredProgramArgumentParser.cs similarity index 95% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/InferedProgramArgumentParser.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/InferredProgramArgumentParser.cs index b3aa16eb6f..faa41bf8e1 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/InferedProgramArgumentParser.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/ProgramArgumentParser/InferredProgramArgumentParser.cs @@ -8,7 +8,7 @@ using Wox.Plugin; namespace Microsoft.Plugin.Program { - public class InferedProgramArgumentParser : IProgramArgumentParser + public class InferredProgramArgumentParser : IProgramArgumentParser { private static readonly Regex ArgumentPrefixRegex = new Regex("^(-|--|/)[a-zA-Z]+", RegexOptions.Compiled); diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs index 3fa63e77b0..a03df33aab 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs @@ -134,7 +134,7 @@ namespace Microsoft.Plugin.Program.Programs Version = PackageVersion.Unknown; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentially keeping the process alive.")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentionally keeping the process alive.")] public static UWPApplication[] All() { var windows10 = new Version(10, 0); @@ -172,7 +172,7 @@ namespace Microsoft.Plugin.Program.Programs } } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentially keeping the process alive.")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentionally keeping the process alive.")] private static IEnumerable CurrentUserPackages() { var ps = PackageManagerWrapper.FindPackagesForCurrentUser(); diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWPApplication.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWPApplication.cs index a1924a527e..13889677d8 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWPApplication.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWPApplication.cs @@ -124,7 +124,7 @@ namespace Microsoft.Plugin.Program.Programs return result; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentially keeping the process alive.")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentionally keeping the process alive.")] public List ContextMenus(string queryArguments, IPublicAPI api) { if (api == null) @@ -202,7 +202,7 @@ namespace Microsoft.Plugin.Program.Programs return contextMenus; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentially keeping the process alive, and showing the user an error message")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentionally keeping the process alive, and showing the user an error message")] private async void Launch(IPublicAPI api, string queryArguments) { var appManager = new ApplicationActivationHelper.ApplicationActivationManager(); diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs index 22c5a11814..43a4418b2e 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs @@ -253,7 +253,7 @@ namespace Microsoft.Plugin.Program.Programs return result; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentially keeping the process alive.")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentionally keeping the process alive.")] public List ContextMenus(string queryArguments, IPublicAPI api) { if (api == null) diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Storage/PackageRepository.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Storage/PackageRepository.cs index 9d787cc847..7c4b4e1f21 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Storage/PackageRepository.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Storage/PackageRepository.cs @@ -14,7 +14,7 @@ namespace Microsoft.Plugin.Program.Storage { /// /// A repository for storing packaged applications such as UWP apps or appx packaged desktop apps. - /// This repository will also monitor for changes to the PackageCatelog and update the repository accordingly + /// This repository will also monitor for changes to the PackageCatalog and update the repository accordingly /// internal class PackageRepository : ListRepository, IProgramRepository { diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Storage/Win32ProgramRepository.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Storage/Win32ProgramRepository.cs index cd2b611cab..da5c27ef89 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Storage/Win32ProgramRepository.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Storage/Win32ProgramRepository.cs @@ -92,7 +92,7 @@ namespace Microsoft.Plugin.Program.Storage } } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentially keeping the process alive>")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentionally keeping the process alive>")] private void OnAppRenamed(object sender, RenamedEventArgs e) { string oldPath = e.OldFullPath; diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Main.cs index 0d1ec88a58..670620717b 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Main.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/Main.cs @@ -26,7 +26,7 @@ namespace Microsoft.Plugin.Uri private readonly PluginJsonStorage _storage; private bool _disposed; private UriSettings _uriSettings; - private RegisteryWrapper _registeryWrapper; + private RegistryWrapper _registryWrapper; public Main() { @@ -34,7 +34,7 @@ namespace Microsoft.Plugin.Uri _uriSettings = _storage.Load(); _uriParser = new ExtendedUriParser(); _uriResolver = new UriResolver(); - _registeryWrapper = new RegisteryWrapper(); + _registryWrapper = new RegistryWrapper(); } public string BrowserIconPath { get; set; } @@ -113,14 +113,14 @@ namespace Microsoft.Plugin.Uri { try { - var progId = _registeryWrapper.GetRegistryValue("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\http\\UserChoice", "ProgId"); + var progId = _registryWrapper.GetRegistryValue("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\http\\UserChoice", "ProgId"); var programLocation = // Resolve App Icon (UWP) - _registeryWrapper.GetRegistryValue("HKEY_CLASSES_ROOT\\" + progId + "\\Application", "ApplicationIcon") + _registryWrapper.GetRegistryValue("HKEY_CLASSES_ROOT\\" + progId + "\\Application", "ApplicationIcon") // Resolves default file association icon (UWP + Normal) - ?? _registeryWrapper.GetRegistryValue("HKEY_CLASSES_ROOT\\" + progId + "\\DefaultIcon", null); + ?? _registryWrapper.GetRegistryValue("HKEY_CLASSES_ROOT\\" + progId + "\\DefaultIcon", null); // "Handles 'Indirect Strings' (UWP programs)" // Using Ordinal since this is internal and used with a symbol @@ -152,7 +152,7 @@ namespace Microsoft.Plugin.Uri catch (Exception e) { BrowserIconPath = DefaultIconPath; - Log.Exception("Exception when retreiving icon", e, GetType()); + Log.Exception("Exception when retrieving icon", e, GetType()); } } diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/RegisteryWrapper.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/RegistryWrapper.cs similarity index 90% rename from src/modules/launcher/Plugins/Microsoft.Plugin.Uri/RegisteryWrapper.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Uri/RegistryWrapper.cs index 86993799ae..2aad1b5412 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/RegisteryWrapper.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/RegistryWrapper.cs @@ -7,7 +7,7 @@ using Microsoft.Win32; namespace Microsoft.Plugin.Uri { - public class RegisteryWrapper : IRegistryWrapper + public class RegistryWrapper : IRegistryWrapper { public string GetRegistryValue(string registryLocation, string valueName) { diff --git a/src/modules/launcher/Wox.Infrastructure/StringMatcher.cs b/src/modules/launcher/Wox.Infrastructure/StringMatcher.cs index 3519950725..bebe110f36 100644 --- a/src/modules/launcher/Wox.Infrastructure/StringMatcher.cs +++ b/src/modules/launcher/Wox.Infrastructure/StringMatcher.cs @@ -167,7 +167,7 @@ namespace Wox.Infrastructure return new MatchResult(false, UserSettingSearchPrecision); } - // To get the index of the closest space which preceeds the first matching index + // To get the index of the closest space which precedes the first matching index private static int CalculateClosestSpaceIndex(List spaceIndices, int firstMatchIndex) { if (spaceIndices.Count == 0) diff --git a/src/modules/launcher/Wox.Plugin/Properties/Resources.resx b/src/modules/launcher/Wox.Plugin/Properties/Resources.resx index c5d21a23d5..609f1edd55 100644 --- a/src/modules/launcher/Wox.Plugin/Properties/Resources.resx +++ b/src/modules/launcher/Wox.Plugin/Properties/Resources.resx @@ -127,6 +127,6 @@ Unable to verify folders and files between {0} and {1} - paramaters: fromPath, toPath + parameters: fromPath, toPath \ No newline at end of file diff --git a/src/modules/launcher/Wox.Test/QueryBuilderTest.cs b/src/modules/launcher/Wox.Test/QueryBuilderTest.cs index 2b99aea2bd..b3c50755c5 100644 --- a/src/modules/launcher/Wox.Test/QueryBuilderTest.cs +++ b/src/modules/launcher/Wox.Test/QueryBuilderTest.cs @@ -178,7 +178,7 @@ namespace Wox.Test } [Test] - public void QueryBuilderShouldSetTermsCorrentlyWhenCalled() + public void QueryBuilderShouldSetTermsCorrectlyWhenCalled() { // Arrange string searchQuery = "abcd efgh"; diff --git a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.cs b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.cs index f59275321c..af09d1369d 100644 --- a/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.cs +++ b/src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.cs @@ -31,14 +31,14 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Svg public IStream Stream { get; private set; } /// - /// The maxium dimension (width or height) thumbnail we will generate. + /// The maximum dimension (width or height) thumbnail we will generate. /// private const uint MaxThumbnailSize = 10000; /// /// Captures an image representation of browser contents. /// - /// The WebBrowser instance rendring the SVG. + /// The WebBrowser instance rendering the SVG. /// The client rectangle to capture from. /// The default background color to apply. /// A Bitmap representing the browser contents. diff --git a/src/runner/settings_window.cpp b/src/runner/settings_window.cpp index 83b3dd7647..439e2cdf08 100644 --- a/src/runner/settings_window.cpp +++ b/src/runner/settings_window.cpp @@ -327,7 +327,7 @@ void run_settings_window() settings_isUserAnAdmin = L"false"; } - // create general settings file to initialze the settings file with installation configurations like : + // create general settings file to initialize the settings file with installation configurations like : // 1. Run on start up. PTSettingsHelper::save_general_settings(save_settings.to_json()); diff --git a/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.cpp b/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.cpp index 679022b870..0547c99a19 100644 --- a/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.cpp +++ b/tools/FancyZones_DrawLayoutTest/FancyZones_DrawLayoutTest.cpp @@ -76,7 +76,7 @@ int GetHighlightedZoneIdx(const std::vector& zones, const POINT& cursorPos void ShowZoneWindow() { - // InvalidateRect will esentially send WM_PAINT to main window. + // InvalidateRect will essentially send WM_PAINT to main window. UINT flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE; SetWindowPos(mainWindow, nullptr, 0, 0, 0, 0, flags);