Skip to content

Fix code analysis messages in command-line parser #45638

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
merged 4 commits into from
Jul 14, 2020
Merged

Fix code analysis messages in command-line parser #45638

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd1f4ca
Remove unneeded assignments
davkean Jul 3, 2020
68c0e90
Make local function static
davkean Jul 3, 2020
9c42365
Inline variables
davkean Jul 3, 2020
103f7be
Simplify using
davkean Jul 3, 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
38 changes: 11 additions & 27 deletions src/Compilers/Core/Portable/CommandLine/CommandLineParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,8 @@ internal void ParseOutputFile(
out string? outputFileName,
out string? outputDirectory)
{
outputFileName = null;
outputDirectory = null;
string? invalidPath = null;

string unquoted = RemoveQuotesAndSlashes(value);
ParseAndNormalizeFile(unquoted, baseDirectory, out outputFileName, out outputDirectory, out invalidPath);
ParseAndNormalizeFile(unquoted, baseDirectory, out outputFileName, out outputDirectory, out string? invalidPath);
if (outputFileName == null ||
!MetadataHelpers.IsValidAssemblyOrModuleName(outputFileName))
{
Expand All @@ -370,13 +366,10 @@ internal void ParseOutputFile(
IList<Diagnostic> errors,
string? baseDirectory)
{
string? outputFileName = null;
string? outputDirectory = null;
string? pdbPath = null;
string? invalidPath = null;

string unquoted = RemoveQuotesAndSlashes(value);
ParseAndNormalizeFile(unquoted, baseDirectory, out outputFileName, out outputDirectory, out invalidPath);
ParseAndNormalizeFile(unquoted, baseDirectory, out string? outputFileName, out string? outputDirectory, out string? invalidPath);
if (outputFileName == null ||
PathUtilities.ChangeExtension(outputFileName, extension: null).Length == 0)
{
Expand All @@ -398,12 +391,9 @@ internal void ParseOutputFile(
string? baseDirectory,
bool generateDiagnostic = true)
{
string? outputFileName = null;
string? outputDirectory = null;
string? genericPath = null;
string? invalidPath = null;

ParseAndNormalizeFile(unquoted, baseDirectory, out outputFileName, out outputDirectory, out invalidPath);
ParseAndNormalizeFile(unquoted, baseDirectory, out string? outputFileName, out string? outputDirectory, out string? invalidPath);
if (string.IsNullOrWhiteSpace(outputFileName))
{
if (generateDiagnostic)
Expand Down Expand Up @@ -559,18 +549,15 @@ internal static bool TryParseClientArgs(
var newArgs = new List<string>();
foreach (var arg in args)
{
bool hasValue;
string? value;
if (isClientArgsOption(arg, "keepalive", out hasValue, out value))
if (isClientArgsOption(arg, "keepalive", out bool hasValue, out string? value))
{
if (string.IsNullOrEmpty(value))
{
errorMessage = CodeAnalysisResources.MissingKeepAlive;
return false;
}

int intValue;
if (int.TryParse(value, out intValue))
if (int.TryParse(value, out int intValue))
{
if (intValue < -1)
{
Expand Down Expand Up @@ -618,7 +605,7 @@ internal static bool TryParseClientArgs(
return true;
}

bool isClientArgsOption(string arg, string optionName, out bool hasValue, out string? optionValue)
static bool isClientArgsOption(string arg, string optionName, out bool hasValue, out string? optionValue)
{
hasValue = false;
optionValue = null;
Expand Down Expand Up @@ -660,13 +647,11 @@ internal IEnumerable<string> ParseResponseFile(string fullPath, IList<Diagnostic
try
{
Debug.Assert(PathUtilities.IsAbsolute(fullPath));
using (TextReader reader = CreateTextFileReader(fullPath))
using TextReader reader = CreateTextFileReader(fullPath);
string? str;
while ((str = reader.ReadLine()) != null)
{
string? str;
while ((str = reader.ReadLine()) != null)
{
lines.Add(str);
}
lines.Add(str);
}
}
catch (Exception)
Expand Down Expand Up @@ -1000,9 +985,8 @@ internal IEnumerable<CommandLineSourceFile> ParseRecurseArgument(string arg, str

internal static Encoding? TryParseEncodingName(string arg)
{
long codepage;
if (!string.IsNullOrWhiteSpace(arg)
&& long.TryParse(arg, NumberStyles.None, CultureInfo.InvariantCulture, out codepage)
&& long.TryParse(arg, NumberStyles.None, CultureInfo.InvariantCulture, out long codepage)
&& (codepage > 0))
{
try
Expand Down