Skip to content

fix: total in namespace was wrong #12

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
magic5644 merged 1 commit into from
Nov 15, 2024
Merged

fix: total in namespace was wrong #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 54 additions & 17 deletions CodeLineCounter/Services/CodeAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.IO;
using System.Collections.Generic;
using System.Linq;
using Microsoft.CodeAnalysis;

namespace CodeLineCounter.Services
{
Expand All @@ -20,19 +21,25 @@ public static (List<NamespaceMetrics>, Dictionary<string, int>, int, int, List<D
int totalLines = 0;
int totalFilesAnalyzed = 0;

foreach (var projectFile in projectFiles)
{
AnalyzeProject(solutionDirectory, projectFile, ref totalFilesAnalyzed, ref totalLines, namespaceMetrics, projectTotals);
}

codeDuplicationChecker.DetectCodeDuplicationInFiles(FileUtils.GetAllCsFiles(solutionDirectory));
Parallel.Invoke(
() => AnalyzeAllProjects(solutionDirectory, projectFiles, namespaceMetrics, projectTotals, ref totalLines, ref totalFilesAnalyzed),
() => codeDuplicationChecker.DetectCodeDuplicationInFiles(FileUtils.GetAllCsFiles(solutionDirectory))
);

var duplicationMap = codeDuplicationChecker.GetCodeDuplicationMap();
var duplicationList = duplicationMap.Values.SelectMany(v => v).ToList();

return (namespaceMetrics, projectTotals, totalLines, totalFilesAnalyzed, duplicationList);
}

private static void AnalyzeAllProjects(string solutionDirectory, List<string> projectFiles, List<NamespaceMetrics> namespaceMetrics, Dictionary<string, int> projectTotals, ref int totalLines, ref int totalFilesAnalyzed)
{
foreach (var projectFile in projectFiles)
{
AnalyzeProject(solutionDirectory, projectFile, ref totalFilesAnalyzed, ref totalLines, namespaceMetrics, projectTotals);
}
}

private static void AnalyzeProject(string solutionDirectory, string projectFile, ref int totalFilesAnalyzed, ref int totalLines, List<NamespaceMetrics> namespaceMetrics, Dictionary<string, int> projectTotals)
{
string? projectDirectory = Path.GetDirectoryName(projectFile);
Expand All @@ -56,16 +63,21 @@ private static void AnalyzeProject(string solutionDirectory, string projectFile,

private static void AddProjectMetrics(string projectName, string relativeProjectPath, string? projectDirectory, Dictionary<string, int> projectNamespaceMetrics, List<NamespaceMetrics> namespaceMetrics, Dictionary<string, int> projectTotals, int projectLineCount)
{
foreach (var kvp in projectNamespaceMetrics)
var keys = projectNamespaceMetrics.Select(kvp => kvp.Key);

foreach (var key in keys)
{
int totalNamespaceLines = namespaceMetrics
.Where(nm => nm != null && !string.IsNullOrEmpty(nm.NamespaceName) && nm.NamespaceName.Equals(key))
.Sum(nm => nm != null ? nm.LineCount : 0);
namespaceMetrics.Add(new NamespaceMetrics
{
ProjectName = projectName,
ProjectPath = relativeProjectPath,
NamespaceName = kvp.Key,
NamespaceName = key,
FileName = "Total",
FilePath = projectDirectory,
LineCount = kvp.Value,
LineCount = totalNamespaceLines,
CyclomaticComplexity = 0
});
}
Expand Down Expand Up @@ -106,17 +118,12 @@ public static void AnalyzeSourceCode(Dictionary<string, int> projectNamespaceMet

foreach (var line in lines)
{
if (line.Trim().StartsWith("namespace"))
if (currentNamespace == null)
{
var parts = line.Trim().Split(' ');
if (parts.Length >= 2)
{
currentNamespace = parts[1];
projectNamespaceMetrics.TryAdd(currentNamespace, 0);
}
currentNamespace = ExtractNameSpace(projectNamespaceMetrics, currentNamespace, line);
}

if (!string.IsNullOrWhiteSpace(line) && !line.Trim().StartsWith("//"))
if (IsCodeLineUsingRoslyn(line))
{
fileLineCount++;
if (currentNamespace != null)
Expand All @@ -126,5 +133,35 @@ public static void AnalyzeSourceCode(Dictionary<string, int> projectNamespaceMet
}
}
}

private static bool IsNotAnEmptyLine(string line)
{
return !string.IsNullOrWhiteSpace(line.Trim());
}

private static bool IsCodeLineUsingRoslyn(string line)
{
var tree = CSharpSyntaxTree.ParseText(line);
var root = tree.GetRoot();
return !root.DescendantTrivia()
.Any(t => t.IsKind(SyntaxKind.SingleLineCommentTrivia) ||
t.IsKind(SyntaxKind.MultiLineCommentTrivia) ||
t.IsKind(SyntaxKind.SingleLineDocumentationCommentTrivia)) && IsNotAnEmptyLine(line);
}

private static string? ExtractNameSpace(Dictionary<string, int> projectNamespaceMetrics, string? currentNamespace, string line)
{
if (line.Trim().StartsWith("namespace"))
{
var parts = line.Trim().Split(' ');
if (parts.Length >= 2)
{
currentNamespace = parts[1];
projectNamespaceMetrics.TryAdd(currentNamespace, 0);
}
}

return currentNamespace;
}
}
}