mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-11-24 04:12:32 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[PTRun][Folder]Expand environment variables(#19791)

Browse Source 
* Fix for issue 19428
Expand the environmental variables before path combine

* Adding unit test
This commit is contained in:
sosssego 2022-08-10 06:26:27 -03:00 committed by GitHub
parent 3753642f23
commit 5d6160cf7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/spell-check/expect.txt vendored
View File

@ -736,6 +736,7 @@ hmonitor
HOLDENTER
HOLDESC
homepage
HOMEPATH
homljgmgpmcbpjbnjpfijnhipfkiclkd
HOOKPROC
Hostbackdropbrush

32
src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/Sources/Path/FolderHelperTests.cs Normal file
View File

@ -0,0 +1,32 @@
// Copyright (c) Microsoft Corporation
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.IO;
using Microsoft.Plugin.Folder.Sources;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Microsoft.Plugin.Folder.Sources.Tests
{
[TestClass]
public class FolderHelperTests
{
[DataTestMethod]
[DataRow(@"%SYSTEMDRIVE%", true)]
[DataRow(@"%O%S", false)]
[DataRow(@"abcd", false)]
[DataRow(@"%ProgramData%", true)]
[DataRow(@"%USERPROFILE%", true)]
[DataRow(@"powertoys", false)]
// can't test %HOMEPATH% on CI, so using \User as ExpandEnvironmentVariables was moved up
[DataRow(@"\Users", true)]
[DataRow(@"Users", false)]
public void ExpandsToRootedPath(string query, bool expected)
{
var expandedQuery = FolderHelper.Expand(query);
var result = Path.IsPathRooted(expandedQuery);
Assert.AreEqual(expected, result);
}
}
}

4
src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Path/FolderHelper.cs
View File

@ -84,6 +84,8 @@ namespace Microsoft.Plugin.Folder.Sources
throw new ArgumentNullException(nameof(search));
}
search = Environment.ExpandEnvironmentVariables(search);
var validRoots = new char[] { '\\', '/' };
if (validRoots.Contains(search[0]) && (search.Length == 1 || !validRoots.Contains(search[1])))
@ -98,7 +100,7 @@ namespace Microsoft.Plugin.Folder.Sources
search = search.Length > 1 ? Path.Combine(home, search.Substring(2)) : home;
}
return Environment.ExpandEnvironmentVariables(search);
return search;
}
}
}