Skip to content

Commit b7bd1cc

Browse files
committed
Improve code quality
1 parent 7732442 commit b7bd1cc

2 files changed

Lines changed: 6 additions & 11 deletions

File tree

Flow.Launcher.Infrastructure/StringMatcher.cs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
using System;
22
using System.Buffers;
33
using System.Collections.Generic;
4-
using System.Globalization;
54
using System.Linq;
6-
using System.Text;
75
using CommunityToolkit.Mvvm.DependencyInjection;
86
using Flow.Launcher.Infrastructure.UserSettings;
97
using Flow.Launcher.Plugin.SharedModels;
@@ -21,16 +19,13 @@ public class StringMatcher
2119
public StringMatcher(IAlphabet alphabet, Settings settings)
2220
{
2321
_alphabet = alphabet;
24-
UserSettingSearchPrecision = settings.QuerySearchPrecision;
2522
_settings = settings;
23+
UserSettingSearchPrecision = _settings.QuerySearchPrecision;
2624
}
2725

2826
// This is a workaround to allow unit tests to set the instance
29-
public StringMatcher(IAlphabet alphabet)
27+
public StringMatcher(IAlphabet alphabet) : this(alphabet, new Settings())
3028
{
31-
_alphabet = alphabet;
32-
_settings = new Settings();
33-
UserSettingSearchPrecision = _settings.QuerySearchPrecision;
3429
}
3530

3631
public static MatchResult FuzzySearch(string query, string stringToCompare)
@@ -101,8 +96,7 @@ public MatchResult FuzzyMatch(string query, string stringToCompare, MatchOption
10196
queryToCompare = queryToCompare.ToLower();
10297
}
10398

104-
105-
var querySubstrings = queryToCompare.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
99+
var querySubstrings = queryToCompare.Split([' '], StringSplitOptions.RemoveEmptyEntries);
106100
int currentQuerySubstringIndex = 0;
107101
var currentQuerySubstring = querySubstrings[currentQuerySubstringIndex];
108102
var currentQuerySubstringCharacterIndex = 0;
@@ -180,8 +174,8 @@ public MatchResult FuzzyMatch(string query, string stringToCompare, MatchOption
180174
// in order to do so we need to verify all previous chars are part of the pattern
181175
var startIndexToVerify = compareStringIndex - currentQuerySubstringCharacterIndex;
182176

183-
if (AllPreviousCharsMatched(startIndexToVerify, currentQuerySubstringCharacterIndex,
184-
fullStringToCompare, currentQuerySubstring))
177+
if (AllPreviousCharsMatched(startIndexToVerify, currentQuerySubstringCharacterIndex,
178+
fullStringToCompare, currentQuerySubstring))
185179
{
186180
matchFoundInPreviousLoop = true;
187181

Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ private static string GetFileFromDialog(string title, string filter = "")
369369
[RelayCommand]
370370
private void RestartApp()
371371
=> App.API.RestartApp();
372+
372373
private void UpdateApp()
373374
{
374375
_ = _updater.UpdateAppAsync(false);

0 commit comments

Comments
 (0)