Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary async and await code (#989) #990

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Remove unnecessary async and await code (#989) #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions CodeMaidShared/Helpers/SettingsMonitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ public SettingsMonitor(TSetting settings, JoinableTaskFactory joinableTaskFactor
_settings.SettingsSaving += OnSettingsSaving;
}

public async Task WatchAsync<TValue>(Expression<Func<TSetting, TValue>> setting, Func<TValue, Task> changedCallback)
public Task WatchAsync<TValue>(Expression<Func<TSetting, TValue>> setting, Func<TValue, Task> changedCallback)
{
var settingName = (setting.Body as MemberExpression).Member.Name;
await WatchAsync<TValue>(new[] { settingName }, async values => await changedCallback(values[0]));
return WatchAsync<TValue>(new[] { settingName }, values => changedCallback(values[0]));
}

public async Task WatchAsync<TValue>(string[] settings, Func<TValue[], Task> changedCallback)
public Task WatchAsync<TValue>(string[] settings, Func<TValue[], Task> changedCallback)
{
await WatchAsync(settings, async (object[] values) =>
return WatchAsync(settings, (object[] values) =>
{
var typedValues = Array.ConvertAll(values, v => (TValue)v);
await changedCallback(typedValues);
return changedCallback(typedValues);
});
}

Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/AboutCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ private AboutCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new AboutCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/BuildProgressToolWindowCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ private IVsWindowFrame BuildProgressWindowFrame
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new BuildProgressToolWindowCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_BuildProgressToolWindow, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_BuildProgressToolWindow, Instance.SwitchAsync);
}

public override async Task SwitchAsync(bool on)
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/CleanupActiveCodeCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ internal CleanupActiveCodeCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new CleanupActiveCodeCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_CleanupActiveCode, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_CleanupActiveCode, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/CleanupAllCodeCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ private IEnumerable<ProjectItem> AllProjectItems
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new CleanupAllCodeCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_CleanupAllCode, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_CleanupAllCode, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/CleanupOpenCodeCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ private IEnumerable<Document> OpenDocuments
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new CleanupOpenCodeCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_CleanupOpenCode, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_CleanupOpenCode, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/CleanupSelectedCodeCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ private IEnumerable<ProjectItem> SelectedProjectItems
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new CleanupSelectedCodeCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_CleanupSelectedCode, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_CleanupSelectedCode, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/CloseAllReadOnlyCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ internal CloseAllReadOnlyCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new CloseAllReadOnlyCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_CloseAllReadOnly, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_CloseAllReadOnly, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/CollapseAllSolutionExplorerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ internal CollapseAllSolutionExplorerCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new CollapseAllSolutionExplorerCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_CollapseAllSolutionExplorer, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_CollapseAllSolutionExplorer, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/CollapseSelectedSolutionExplorerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ internal CollapseSelectedSolutionExplorerCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new CollapseSelectedSolutionExplorerCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_CollapseSelectedSolutionExplorer, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_CollapseSelectedSolutionExplorer, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/CommentFormatCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ internal CommentFormatCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new CommentFormatCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_CommentFormat, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_CommentFormat, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/FindInSolutionExplorerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ internal FindInSolutionExplorerCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new FindInSolutionExplorerCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_FindInSolutionExplorer, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_FindInSolutionExplorer, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/JoinLinesCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ internal JoinLinesCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new JoinLinesCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_JoinLines, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_JoinLines, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/OptionsCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ internal OptionsCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new OptionsCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions CodeMaidShared/Integration/Commands/ReadOnlyToggleCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ internal ReadOnlyToggleCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new ReadOnlyToggleCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_ReadOnlyToggle, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_ReadOnlyToggle, Instance.SwitchAsync);
}

/// <summary>
Expand Down Expand Up @@ -64,7 +64,7 @@ protected override void OnExecute()
}
catch (Exception ex)
{
OutputWindowHelper.ExceptionWriteLine($"{ Resources.UnableToToggleReadOnlyStateOn}'{document.FullName}'", ex);
OutputWindowHelper.ExceptionWriteLine($"{Resources.UnableToToggleReadOnlyStateOn}'{document.FullName}'", ex);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/RemoveRegionCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ private enum RegionCommandScope
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new RemoveRegionCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_RemoveRegion, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_RemoveRegion, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/ReorganizeActiveCodeCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ internal ReorganizeActiveCodeCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new ReorganizeActiveCodeCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_ReorganizeActiveCode, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_ReorganizeActiveCode, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SettingCleanupOnSaveCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ public bool CleanupOnSave
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SettingCleanupOnSaveCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_SettingCleanupOnSave, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_SettingCleanupOnSave, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SortLinesCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ internal SortLinesCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SortLinesCommand(package);
await package.SettingsMonitor.WatchAsync(s => s.Feature_SortLines, Instance.SwitchAsync);
return package.SettingsMonitor.WatchAsync(s => s.Feature_SortLines, Instance.SwitchAsync);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SpadeContextDeleteCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ internal SpadeContextDeleteCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SpadeContextDeleteCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SpadeContextFindReferencesCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ internal SpadeContextFindReferencesCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SpadeContextFindReferencesCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SpadeContextInsertRegionCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ internal SpadeContextInsertRegionCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SpadeContextInsertRegionCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SpadeContextRemoveRegionCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ internal SpadeContextRemoveRegionCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SpadeContextRemoveRegionCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SpadeOptionsCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ internal SpadeOptionsCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SpadeOptionsCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SpadeRefreshCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ internal SpadeRefreshCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SpadeRefreshCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SpadeSearchCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ internal SpadeSearchCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SpadeSearchCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SpadeSortOrderAlphaCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ internal SpadeSortOrderAlphaCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SpadeSortOrderAlphaCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SpadeSortOrderFileCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ internal SpadeSortOrderFileCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SpadeSortOrderFileCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions CodeMaidShared/Integration/Commands/SpadeSortOrderTypeCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ internal SpadeSortOrderTypeCommand(CodeMaidPackage package)
/// </summary>
/// <param name="package">The hosting package.</param>
/// <returns>A task.</returns>
public static async Task InitializeAsync(CodeMaidPackage package)
public static Task InitializeAsync(CodeMaidPackage package)
{
Instance = new SpadeSortOrderTypeCommand(package);
await Instance.SwitchAsync(on: true);
return Instance.SwitchAsync(on: true);
}

/// <summary>
Expand Down
Loading