Skip to content

Replace custom method with File.ReadAllText() in ScriptAnalysis.cs #26060

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
iSazonov merged 5 commits into from
Oct 15, 2025
Merged

Replace custom method with File.ReadAllText() in ScriptAnalysis.cs #26060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d2bc26
Remove: unused SafeFileHandle in src\System.Management.Automation\en…
amritanand-py Sep 16, 2025
2c3763e
Merge branch 'PowerShell:master' into master
amritanand-py Sep 17, 2025
adb970f
Remove ReadScript method and use File.ReadAllText directly
amritanand-py Sep 17, 2025
6b13fd6
Merge branch 'master' into master
iSazonov Oct 7, 2025
79f29c4
Empty commit
amritanand-py Oct 7, 2025
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
15 changes: 1 addition & 14 deletions src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ internal static ScriptAnalysis Analyze(string path, ExecutionContext context)
// So eat the invalid operation
}

string scriptContent = ReadScript(path);
string scriptContent = File.ReadAllText(path, Encoding.Default);

ParseError[] errors;
var moduleAst = (new Parser()).Parse(path, scriptContent, null, out errors, ParseMode.ModuleAnalysis);
Expand Down Expand Up @@ -89,19 +89,6 @@ internal static ScriptAnalysis Analyze(string path, ExecutionContext context)
return result;
}

internal static string ReadScript(string path)
Copy link
Copy Markdown
Collaborator

@iSazonov iSazonov Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MartinGC94 Do you think it is good to remove the method? Won't this code be less readable?

Copy link
Copy Markdown
Contributor

@MartinGC94 MartinGC94 Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's perfectly fine. If anything it's arguably easier to understand when it's just File.ReadAllText because you don't have to check if ReadScript does anything weird.

{
using (FileStream readerStream = new FileStream(path, FileMode.Open, FileAccess.Read))
{
Microsoft.Win32.SafeHandles.SafeFileHandle safeFileHandle = readerStream.SafeFileHandle;

using (StreamReader scriptReader = new StreamReader(readerStream, Encoding.Default))
{
return scriptReader.ReadToEnd();
}
}
}

internal List<string> DiscoveredExports { get; set; }

internal Dictionary<string, string> DiscoveredAliases { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/utils/PsUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ internal static Hashtable EvaluatePowerShellDataFile(

internal static Hashtable GetModuleManifestProperties(string psDataFilePath, string[] keys)
{
string dataFileContents = ScriptAnalysis.ReadScript(psDataFilePath);
string dataFileContents = File.ReadAllText(psDataFilePath, Encoding.Default);
ParseError[] parseErrors;
var ast = (new Parser()).Parse(psDataFilePath, dataFileContents, null, out parseErrors, ParseMode.ModuleAnalysis);
if (parseErrors.Length > 0)
Expand Down
Loading