From e31bef7d3c7481a45f63427308efa1132b06fee6 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Tue, 26 Jan 2021 18:01:39 +1100 Subject: [PATCH] fix formatting + naming --- Flow.Launcher.Infrastructure/StringMatcher.cs | 6 +----- Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 2 +- Flow.Launcher.Plugin/IPublicAPI.cs | 2 +- .../{SharedModel => SharedModels}/MatchResult.cs | 6 ++---- Flow.Launcher.Test/FuzzyMatcherTest.cs | 2 +- Flow.Launcher/PublicAPIInstance.cs | 3 +-- Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 2 +- .../Commands/Bookmarks.cs | 2 +- Plugins/Flow.Launcher.Plugin.Sys/Main.cs | 1 - 9 files changed, 9 insertions(+), 17 deletions(-) rename Flow.Launcher.Plugin/{SharedModel => SharedModels}/MatchResult.cs (94%) diff --git a/Flow.Launcher.Infrastructure/StringMatcher.cs b/Flow.Launcher.Infrastructure/StringMatcher.cs index 300404b9e..bc4e4b408 100644 --- a/Flow.Launcher.Infrastructure/StringMatcher.cs +++ b/Flow.Launcher.Infrastructure/StringMatcher.cs @@ -1,9 +1,7 @@ -using Flow.Launcher.Plugin.SharedModel; +using Flow.Launcher.Plugin.SharedModels; using System; using System.Collections.Generic; -using System.ComponentModel; using System.Linq; -using static Flow.Launcher.Infrastructure.StringMatcher; namespace Flow.Launcher.Infrastructure { @@ -242,8 +240,6 @@ namespace Flow.Launcher.Infrastructure } } - - public class MatchOption { public bool IgnoreCase { get; set; } = true; diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 5a6bd0a2f..76a370978 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -3,7 +3,7 @@ using System.Collections.ObjectModel; using System.Drawing; using System.Text.Json.Serialization; using Flow.Launcher.Plugin; -using Flow.Launcher.Plugin.SharedModel; +using Flow.Launcher.Plugin.SharedModels; namespace Flow.Launcher.Infrastructure.UserSettings { diff --git a/Flow.Launcher.Plugin/IPublicAPI.cs b/Flow.Launcher.Plugin/IPublicAPI.cs index 3bc2f8e63..dd73eb0e5 100644 --- a/Flow.Launcher.Plugin/IPublicAPI.cs +++ b/Flow.Launcher.Plugin/IPublicAPI.cs @@ -1,4 +1,4 @@ -using Flow.Launcher.Plugin.SharedModel; +using Flow.Launcher.Plugin.SharedModels; using JetBrains.Annotations; using System; using System.Collections.Generic; diff --git a/Flow.Launcher.Plugin/SharedModel/MatchResult.cs b/Flow.Launcher.Plugin/SharedModels/MatchResult.cs similarity index 94% rename from Flow.Launcher.Plugin/SharedModel/MatchResult.cs rename to Flow.Launcher.Plugin/SharedModels/MatchResult.cs index 26fc09cb9..5144eb61d 100644 --- a/Flow.Launcher.Plugin/SharedModel/MatchResult.cs +++ b/Flow.Launcher.Plugin/SharedModels/MatchResult.cs @@ -1,8 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; -namespace Flow.Launcher.Plugin.SharedModel +namespace Flow.Launcher.Plugin.SharedModels { public class MatchResult { diff --git a/Flow.Launcher.Test/FuzzyMatcherTest.cs b/Flow.Launcher.Test/FuzzyMatcherTest.cs index 97e5f2574..14a0fd92a 100644 --- a/Flow.Launcher.Test/FuzzyMatcherTest.cs +++ b/Flow.Launcher.Test/FuzzyMatcherTest.cs @@ -5,7 +5,7 @@ using System.Linq; using NUnit.Framework; using Flow.Launcher.Infrastructure; using Flow.Launcher.Plugin; -using Flow.Launcher.Plugin.SharedModel; +using Flow.Launcher.Plugin.SharedModels; namespace Flow.Launcher.Test { diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs index 0a824ee81..427fd9fc6 100644 --- a/Flow.Launcher/PublicAPIInstance.cs +++ b/Flow.Launcher/PublicAPIInstance.cs @@ -5,7 +5,6 @@ using System.Net; using System.Threading.Tasks; using System.Windows; using Squirrel; -using Flow.Launcher.Core; using Flow.Launcher.Core.Plugin; using Flow.Launcher.Core.Resource; using Flow.Launcher.Helper; @@ -14,7 +13,7 @@ using Flow.Launcher.Infrastructure.Hotkey; using Flow.Launcher.Infrastructure.Image; using Flow.Launcher.Plugin; using Flow.Launcher.ViewModel; -using Flow.Launcher.Plugin.SharedModel; +using Flow.Launcher.Plugin.SharedModels; using System.Threading; using System.IO; using Flow.Launcher.Infrastructure.Http; diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index f4a34e754..98685dc1b 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -17,7 +17,7 @@ using Flow.Launcher.Infrastructure.Image; using Flow.Launcher.Infrastructure.Storage; using Flow.Launcher.Infrastructure.UserSettings; using Flow.Launcher.Plugin; -using Flow.Launcher.Plugin.SharedModel; +using Flow.Launcher.Plugin.SharedModels; namespace Flow.Launcher.ViewModel { diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/Bookmarks.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/Bookmarks.cs index 4e3f4f513..60c4a0ee6 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/Bookmarks.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/Bookmarks.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using Flow.Launcher.Infrastructure; -using Flow.Launcher.Plugin.SharedModel; +using Flow.Launcher.Plugin.SharedModels; namespace Flow.Launcher.Plugin.BrowserBookmark.Commands { diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs index 624fe05bc..0aa37cdf5 100644 --- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Runtime.InteropServices; -using System.Threading.Tasks; using System.Windows; using System.Windows.Forms; using System.Windows.Interop;