May 12, 2025 · May 11, 2025 · May 11, 2025 · May 11, 2025
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
                    nestedModulesToFilterOut = new(currentModule.NestedModules);
                }

                var completedModules = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
                foreach (PSObject item in psObjects)
                {
                    var moduleInfo = (PSModuleInfo)item.BaseObject;
                    var completionText = moduleInfo.Name;
                    var listItemText = completionText;
                    if (!completedModules.Add(completionText))
                    {
                        continue;
                    }

                    if (shortNameSearch
                        && completionText.Contains('.')
                        && !shortNamePattern.IsMatch(completionText.Substring(completionText.LastIndexOf('.') + 1))
                                  + moduleInfo.ModuleType.ToString() + "\r\nPath: "
                                  + moduleInfo.Path;

                    string listItemText = completionText;
                    completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);

                    result.Add(new CompletionResult(completionText, listItemText, CompletionResultType.ParameterValue, toolTip));
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
    It 'Should not include duplicate command results' {
        $OldModulePath = $env:PSModulePath
        $tempDir = Join-Path -Path $TestDrive -ChildPath "TempPsModuleDir"
        $ModuleDirs = @(
            Join-Path $tempDir "TestModule1\1.0"
            Join-Path $tempDir "TestModule1\1.1"
            Join-Path $tempDir "TestModule2\1.0"
        )
        try
        {
            $ModuleDirs = @(
                Join-Path $tempDir "TestModule1\1.0"
                Join-Path $tempDir "TestModule1\1.1"
                Join-Path $tempDir "TestModule2\1.0"
            )
            foreach ($Dir in $ModuleDirs)
            {
                $NewDir = New-Item -Path $Dir -ItemType Directory -Force
        finally
        {
            $env:PSModulePath = $OldModulePath
            Remove-Item -LiteralPath $ModuleDirs -Recurse -Force
        }
    }

    It 'Should not include duplicate module results' {
        $OldModulePath = $env:PSModulePath
        $tempDir = Join-Path -Path $TestDrive -ChildPath "TempPsModuleDir"
        try
        {
            $ModuleDirs = @(
                Join-Path $tempDir "TestModule1\1.0"
                Join-Path $tempDir "TestModule1\1.1"
            )
            foreach ($Dir in $ModuleDirs)
            {
                $NewDir = New-Item -Path $Dir -ItemType Directory -Force
                $ModuleName = $NewDir.Parent.Name
                Set-Content -Value 'MyTestFunction{}' -LiteralPath "$($NewDir.FullName)\$ModuleName.psm1"
                New-ModuleManifest -Path "$($NewDir.FullName)\$ModuleName.psd1" -RootModule "$ModuleName.psm1" -FunctionsToExport "MyTestFunction" -ModuleVersion $NewDir.Name
            }

            $env:PSModulePath += [System.IO.Path]::PathSeparator + $tempDir
            $Res = TabExpansion2 -inputScript 'Import-Module -Name TestModule'
            $Res.CompletionMatches.Count | Should -Be 1
            $Res.CompletionMatches[0].CompletionText | Should -Be TestModule1
        }
        finally
        {
            $env:PSModulePath = $OldModulePath
            Remove-Item -LiteralPath $ModuleDirs -Recurse -Force
        }

    It 'Should complete dotnet method' {
        $res = TabExpansion2 -inputScript '(1).ToSt' -cursorColumn '(1).ToSt'.Length
        $res.CompletionMatches[0].CompletionText | Should -BeExactly 'ToString('
Original file line number	Diff line number	Diff line change
Expand Up		@@ -499,11 +499,16 @@ internal static List<CompletionResult> CompleteModuleName(CompletionContext cont
		nestedModulesToFilterOut = new(currentModule.NestedModules);
		}

		var completedModules = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
		foreach (PSObject item in psObjects)
		{
		var moduleInfo = (PSModuleInfo)item.BaseObject;
		var completionText = moduleInfo.Name;
		var listItemText = completionText;
		if (!completedModules.Add(completionText))
		{
		continue;
		}

		if (shortNameSearch
		&& completionText.Contains('.')
		&& !shortNamePattern.IsMatch(completionText.Substring(completionText.LastIndexOf('.') + 1))
Expand All		@@ -524,6 +529,7 @@ internal static List<CompletionResult> CompleteModuleName(CompletionContext cont
		+ moduleInfo.ModuleType.ToString() + "\r\nPath: "
		+ moduleInfo.Path;

		string listItemText = completionText;
MartinGC94 marked this conversation as resolved. OutdatedShow resolvedHide resolved
		completionText = CompletionHelpers.QuoteCompletionText(completionText, quote);

		result.Add(new CompletionResult(completionText, listItemText, CompletionResultType.ParameterValue, toolTip));
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,13 +36,13 @@ Describe "TabCompletion" -Tags CI {
		It 'Should not include duplicate command results' {
		$OldModulePath = $env:PSModulePath
		$tempDir = Join-Path -Path $TestDrive -ChildPath "TempPsModuleDir"
		$ModuleDirs = @(
		Join-Path $tempDir "TestModule1\1.0"
		Join-Path $tempDir "TestModule1\1.1"
		Join-Path $tempDir "TestModule2\1.0"
		)
		try
		{
		$ModuleDirs = @(
		Join-Path $tempDir "TestModule1\1.0"
		Join-Path $tempDir "TestModule1\1.1"
		Join-Path $tempDir "TestModule2\1.0"
		)
		foreach ($Dir in $ModuleDirs)
		{
		$NewDir = New-Item -Path $Dir -ItemType Directory -Force
Expand All		@@ -61,9 +61,38 @@ Describe "TabCompletion" -Tags CI {
		finally
		{
		$env:PSModulePath = $OldModulePath
		Remove-Item -LiteralPath $ModuleDirs -Recurse -Force
		}
		}

		It 'Should not include duplicate module results' {
		$OldModulePath = $env:PSModulePath
		$tempDir = Join-Path -Path $TestDrive -ChildPath "TempPsModuleDir"
		try
		{
		$ModuleDirs = @(
		Join-Path $tempDir "TestModule1\1.0"
		Join-Path $tempDir "TestModule1\1.1"
		)
		foreach ($Dir in $ModuleDirs)
		{
		$NewDir = New-Item -Path $Dir -ItemType Directory -Force
		$ModuleName = $NewDir.Parent.Name
		Set-Content -Value 'MyTestFunction{}' -LiteralPath "$($NewDir.FullName)\$ModuleName.psm1"
		New-ModuleManifest -Path "$($NewDir.FullName)\$ModuleName.psd1" -RootModule "$ModuleName.psm1" -FunctionsToExport "MyTestFunction" -ModuleVersion $NewDir.Name
		}

		$env:PSModulePath += [System.IO.Path]::PathSeparator + $tempDir
		$Res = TabExpansion2 -inputScript 'Import-Module -Name TestModule'
		$Res.CompletionMatches.Count \| Should -Be 1
		$Res.CompletionMatches[0].CompletionText \| Should -Be TestModule1
		}
		finally
		{
		$env:PSModulePath = $OldModulePath
		Remove-Item -LiteralPath $ModuleDirs -Recurse -Force
		}

		It 'Should complete dotnet method' {
		$res = TabExpansion2 -inputScript '(1).ToSt' -cursorColumn '(1).ToSt'.Length
		$res.CompletionMatches[0].CompletionText \| Should -BeExactly 'ToString('
Expand Down