Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-03 09:46:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

CmdPal: Keep TimeDateExtensionPage simple and update every time (#46396)

Browse Source 
## Summary of the Pull Request

This PR updates Time & Date extension page to calculate current results
every time. This breaks possible infinite loop.

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [x] Closes: #46329
<!-- - [ ] Closes: #yyy (add separate lines for additional resolved
issues) -->
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
This commit is contained in:
Jiří Polášek
2026-03-24 20:51:04 +01:00
committed by GitHub
parent e2f611a7fc
commit 79d9b0e667
2 changed files with 37 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/QueryTests.cs
View File

@@ -68,7 +68,7 @@ public class QueryTests : CommandPaletteUnitTestBase
{
var settings = new Settings();
var page = new TimeDateExtensionPage(settings);
page.UpdateSearchText(string.Empty, input);
page.SearchText = input;
var resultLists = page.GetItems();
var result = Query(input, resultLists);
@@ -117,7 +117,7 @@ public class QueryTests : CommandPaletteUnitTestBase
{
var settings = new Settings();
var page = new TimeDateExtensionPage(settings);
page.UpdateSearchText(string.Empty, input);
page.SearchText = input;
var resultLists = page.GetItems();
var firstItem = resultLists.FirstOrDefault();
@@ -158,7 +158,7 @@ public class QueryTests : CommandPaletteUnitTestBase
{
var settings = new Settings();
var page = new TimeDateExtensionPage(settings);
page.UpdateSearchText(string.Empty, query);
page.SearchText = query;
var results = page.GetItems();
// Assert
@@ -176,7 +176,8 @@ public class QueryTests : CommandPaletteUnitTestBase
{
var settings = new Settings();
var page = new TimeDateExtensionPage(settings);
page.UpdateSearchText("abc", input);
page.SearchText = "abc";
page.SearchText = input;
var results = page.GetItems();
// Assert
@@ -193,7 +194,7 @@ public class QueryTests : CommandPaletteUnitTestBase
{
var settings = new Settings();
var page = new TimeDateExtensionPage(settings);
page.UpdateSearchText(string.Empty, query);
page.SearchText = query;
var resultsList = page.GetItems();
var results = Query(query, resultsList);
@@ -211,7 +212,7 @@ public class QueryTests : CommandPaletteUnitTestBase
{
var settings = new Settings();
var page = new TimeDateExtensionPage(settings);
page.UpdateSearchText(string.Empty, query);
page.SearchText = query;
var resultsList = page.GetItems();
// Assert
@@ -219,4 +220,28 @@ public class QueryTests : CommandPaletteUnitTestBase
var firstResult = resultsList.FirstOrDefault();
Assert.IsTrue(firstResult.Title.Contains(expectedResult, StringComparison.CurrentCulture), $"Delimiter query '{query}' result not match {expectedResult} current result {firstResult.Title}");
}
[TestMethod]
public void UpdateSearchTextMatchesSearchTextSetter()
{
var settings = new Settings();
var pageUsingSetter = new TimeDateExtensionPage(settings);
var pageUsingMethod = new TimeDateExtensionPage(settings);
const string query = "time::12:30:45";
pageUsingSetter.SearchText = query;
pageUsingMethod.UpdateSearchText(string.Empty, query);
var setterResults = pageUsingSetter.GetItems();
var methodResults = pageUsingMethod.GetItems();
Assert.AreEqual(setterResults.Length, methodResults.Length, "UpdateSearchText should produce the same number of results as setting SearchText.");
var setterFirstItem = setterResults.FirstOrDefault();
var methodFirstItem = methodResults.FirstOrDefault();
Assert.IsNotNull(setterFirstItem);
Assert.IsNotNull(methodFirstItem);
Assert.AreEqual(setterFirstItem.Title, methodFirstItem.Title, "UpdateSearchText should keep the stored query in sync with SearchText.");
Assert.AreEqual(setterFirstItem.Subtitle, methodFirstItem.Subtitle, "UpdateSearchText should keep the stored query in sync with SearchText.");
}
}

59
src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Pages/TimeDateExtensionPage.cs
View File

@@ -3,9 +3,6 @@
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Microsoft.CmdPal.Ext.TimeDate.Helpers;
using Microsoft.CommandPalette.Extensions;
using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -14,12 +11,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate.Pages;
internal sealed partial class TimeDateExtensionPage : DynamicListPage
{
private readonly Lock _resultsLock = new();
private IList<ListItem> _results = new List<ListItem>();
private bool _dataLoaded;
private ISettingsInterface _settingsManager;
private readonly ISettingsInterface _settingsManager;
public TimeDateExtensionPage(ISettingsInterface settingsManager)
{
@@ -33,39 +25,10 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage
}
public override IListItem[] GetItems()
{
ListItem[] results;
lock (_resultsLock)
{
if (_dataLoaded)
{
results = _results.ToArray();
_dataLoaded = false;
return results;
}
}
DoExecuteSearch(string.Empty);
lock (_resultsLock)
{
results = _results.ToArray();
_dataLoaded = false;
return results;
}
}
public override void UpdateSearchText(string oldSearch, string newSearch)
{
DoExecuteSearch(newSearch);
}
private void DoExecuteSearch(string query)
{
try
{
var result = TimeDateCalculator.ExecuteSearch(_settingsManager, query);
UpdateResult(result);
return [.. TimeDateCalculator.ExecuteSearch(_settingsManager, SearchText)];
}
catch (Exception)
{
@@ -74,23 +37,13 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage
// So, we need to clean the result.
// But in that time, empty result may cause exception.
// So, we need to add at least on item to user.
var items = new List<ListItem>
{
ResultHelper.CreateInvalidInputErrorResult(),
};
UpdateResult(items);
return [ResultHelper.CreateInvalidInputErrorResult()];
}
}
private void UpdateResult(IList<ListItem> result)
public override void UpdateSearchText(string oldSearch, string newSearch)
{
lock (_resultsLock)
{
this._results = result;
_dataLoaded = true;
}
RaiseItemsChanged(this._results.Count);
SetSearchNoUpdate(newSearch);
RaiseItemsChanged(-2);
}
}