Skip to content

Commit d6fe7ce

Browse files
committed
refactor: simplify AnalyzeSourceCode method by removing unnecessary file parameter
1 parent 923701a commit d6fe7ce

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

CodeLineCounter.Tests/CodeAnalyzerTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void AnalyzeSourceCode_Should_Set_CurrentNamespace()
3939
};
4040

4141
// Act
42-
CodeAnalyzer.AnalyzeSourceCode(projectNamespaceMetrics, file, lines, out string? currentNamespace, out _, out _);
42+
CodeAnalyzer.AnalyzeSourceCode(projectNamespaceMetrics, lines, out string? currentNamespace, out _, out _);
4343

4444
// Assert
4545
Assert.Equal("MyNamespace", currentNamespace);
@@ -61,7 +61,7 @@ public void AnalyzeSourceCode_Should_Set_FileLineCount()
6161
};
6262

6363
// Act
64-
CodeAnalyzer.AnalyzeSourceCode(projectNamespaceMetrics, file, lines, out _, out int fileLineCount, out _);
64+
CodeAnalyzer.AnalyzeSourceCode(projectNamespaceMetrics, lines, out _, out int fileLineCount, out _);
6565

6666
// Assert - 3 lines only because comment lines are ignored
6767
Assert.Equal(3, fileLineCount);
@@ -83,7 +83,7 @@ public void AnalyzeSourceCode_Should_Set_FileCyclomaticComplexity()
8383
};
8484

8585
// Act
86-
CodeAnalyzer.AnalyzeSourceCode(projectNamespaceMetrics, file, lines, out _, out _, out int fileCyclomaticComplexity);
86+
CodeAnalyzer.AnalyzeSourceCode(projectNamespaceMetrics, lines, out _, out _, out int fileCyclomaticComplexity);
8787

8888
// Assert
8989
Assert.Equal(1, fileCyclomaticComplexity);

CodeLineCounter/Services/CodeAnalyzer.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private static void AddProjectMetrics(string projectName, string relativeProject
8888
public static int AnalyzeSourceFile(string? solutionDirectory, List<NamespaceMetrics> namespaceMetrics, string projectName, string relativeProjectPath, int projectLineCount, Dictionary<string, int> projectNamespaceMetrics, string file)
8989
{
9090
var lines = File.ReadAllLines(file);
91-
AnalyzeSourceCode(projectNamespaceMetrics, file, lines, out string? currentNamespace, out int fileLineCount, out int fileCyclomaticComplexity);
91+
AnalyzeSourceCode(projectNamespaceMetrics, lines, out string? currentNamespace, out int fileLineCount, out int fileCyclomaticComplexity);
9292

9393
namespaceMetrics.Add(new NamespaceMetrics
9494
{
@@ -104,7 +104,7 @@ public static int AnalyzeSourceFile(string? solutionDirectory, List<NamespaceMet
104104
return projectLineCount + fileLineCount;
105105
}
106106

107-
public static void AnalyzeSourceCode(Dictionary<string, int> projectNamespaceMetrics, string file, string[] lines, out string? currentNamespace, out int fileLineCount, out int fileCyclomaticComplexity)
107+
public static void AnalyzeSourceCode(Dictionary<string, int> projectNamespaceMetrics, string[] lines, out string? currentNamespace, out int fileLineCount, out int fileCyclomaticComplexity)
108108
{
109109
currentNamespace = null;
110110
fileLineCount = 0;
@@ -118,10 +118,7 @@ public static void AnalyzeSourceCode(Dictionary<string, int> projectNamespaceMet
118118

119119
foreach (var line in lines)
120120
{
121-
if (currentNamespace == null)
122-
{
123-
currentNamespace = ExtractNameSpace(projectNamespaceMetrics, currentNamespace, line);
124-
}
121+
currentNamespace ??= ExtractNameSpace(projectNamespaceMetrics, currentNamespace, line);
125122

126123
if (IsCodeLineUsingRoslyn(line))
127124
{

0 commit comments

Comments
 (0)