Skip to content

Allow / in relative paths for using module (#7424) #12492

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
TravisEz13 merged 7 commits into from
Apr 30, 2020
Merged

Allow / in relative paths for using module (#7424) #12492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c4bd4d5
Close #7424. Allow / in relative paths for `using module`
jcotton42 Apr 25, 2020
3caf6ef
Move test to correct test file
jcotton42 Apr 26, 2020
e98bc31
Resolve feedback
jcotton42 Apr 26, 2020
06e38b3
Add regression test to ensure .\ still works for using module
jcotton42 Apr 27, 2020
e87ec6a
Use BeExactly in Pester tests
jcotton42 Apr 28, 2020
3c3e3e5
Refactor tests to use TestCases
jcotton42 Apr 29, 2020
e9d51cb
Update TestCases formatting
jcotton42 Apr 30, 2020
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
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/parser/SymbolResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,8 @@ private Collection<PSModuleInfo> GetModulesFromUsingModule(UsingStatementAst usi
return null;
}

// case 1: relative path. Relative for file in the same folder should include .\
bool isPath = fullyQualifiedNameStr.Contains(@"\");
// case 1: relative path. Relative for file in the same folder should include .\ or ./
bool isPath = fullyQualifiedNameStr.Contains('\\') || fullyQualifiedNameStr.Contains('/');
if (isPath && !LocationGlobber.IsAbsolutePath(fullyQualifiedNameStr))
{
string rootPath = Path.GetDirectoryName(_parser._fileName);
Expand Down
16 changes: 14 additions & 2 deletions test/powershell/Language/Classes/scripting.Classes.using.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ using module Foo
}
}

Context 'Side by side' {
Context 'Side by side' {
Comment thread
TravisEz13 marked this conversation as resolved.
BeforeAll {
# Add side-by-side module
$newVersion = '3.4.5'
Expand Down Expand Up @@ -523,6 +523,19 @@ using module FooForPaths
Pop-Location
}
}

It 'can be accessed by relative path with .<Separator>' -TestCases @(
@{ Separator = '\' },
@{ Separator = '/' }
) {
param([string]$Separator)
$name = 'relative-slash-paths'
'function Get-TestString { "Worked" }' | Set-Content "TestDrive:\modules\$name.psm1"

"using module .$Separator$name.psm1; Get-TestString" | Set-Content "TestDrive:\modules\$name.ps1"

& "TestDrive:\modules\$name.ps1" | Should -BeExactly "Worked"
}
}

Context "module has non-terminating error handled with 'SilentlyContinue'" {
Expand All @@ -547,4 +560,3 @@ using module $testFile
}
}
}