Skip to content

Pass query without trimming whitespace #1121

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

Merged
merged 6 commits into from
Jul 21, 2022
Merged

Pass query without trimming whitespace #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
89bceec
Remove whitespace trim
Garulf Apr 10, 2022
84cb555
Remove formatting
Garulf Apr 10, 2022
807ff70
Update tests
Garulf Apr 10, 2022
a3630e4
Trim leading whitespace
Garulf Apr 10, 2022
e8fba28
Update test
Garulf Apr 10, 2022
0406a8d
Merge branch 'dev' into Remove-trim-from-query
taooceros May 31, 2022
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
6 changes: 3 additions & 3 deletions Flow.Launcher.Core/Plugin/QueryBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalP
return null;
}

var rawQuery = string.Join(Query.TermSeparator, terms);
var rawQuery = text;
string actionKeyword, search;
string possibleActionKeyword = terms[0];
string[] searchTerms;

if (nonGlobalPlugins.TryGetValue(possibleActionKeyword, out var pluginPair) && !pluginPair.Metadata.Disabled)
{ // use non global plugin for query
actionKeyword = possibleActionKeyword;
search = terms.Length > 1 ? rawQuery[(actionKeyword.Length + 1)..] : string.Empty;
search = terms.Length > 1 ? rawQuery[(actionKeyword.Length + 1)..].TrimStart() : string.Empty;
searchTerms = terms[1..];
}
else
{ // non action keyword
actionKeyword = string.Empty;
search = rawQuery;
search = rawQuery.TrimStart();
searchTerms = terms;
}

Expand Down
4 changes: 2 additions & 2 deletions Flow.Launcher.Test/QueryBuilderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public void ExclusivePluginQueryTest()

Query q = QueryBuilder.Build("> file.txt file2 file3", nonGlobalPlugins);

Assert.AreEqual("file.txt file2 file3", q.Search);
Assert.AreEqual("file.txt file2 file3", q.Search);
Assert.AreEqual(">", q.ActionKeyword);
}

Expand All @@ -31,7 +31,7 @@ public void ExclusivePluginQueryIgnoreDisabledTest()

Query q = QueryBuilder.Build("> file.txt file2 file3", nonGlobalPlugins);

Assert.AreEqual("> file.txt file2 file3", q.Search);
Assert.AreEqual("> file.txt file2 file3", q.Search);
}

[Test]
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/ViewModel/MainViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ private async void QueryResults()
if (currentCancellationToken.IsCancellationRequested)
return;

var query = QueryBuilder.Build(QueryText.Trim(), PluginManager.NonGlobalPlugins);
var query = QueryBuilder.Build(QueryText, PluginManager.NonGlobalPlugins);

// handle the exclusiveness of plugin using action keyword
RemoveOldQueryResults(query);
Expand Down