Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 5 additions & 12 deletions CodeLineCounter.Tests/TestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace CodeLineCounter.Tests
{
public abstract class TestBase : IDisposable
{
private static readonly object _consoleLock = new object();
private static readonly Lock _consoleLock = new ();
private readonly ThreadLocal<StringWriter> _stringWriter = new ThreadLocal<StringWriter>(() => new StringWriter());
private readonly ThreadLocal<StringReader> _stringReader = new ThreadLocal<StringReader>(() => new StringReader(string.Empty));
private readonly ThreadLocal<TextWriter> _originalConsoleOut = new ThreadLocal<TextWriter>();
Expand All @@ -22,7 +22,7 @@ protected TestBase()

protected void initialization()
{
lock (_consoleLock)
using (_consoleLock.EnterScope())
{
_originalConsoleOut.Value = Console.Out;
_originalConsoleIn.Value = Console.In;
Expand All @@ -32,7 +32,7 @@ protected void initialization()

protected void RedirectConsoleInputOutput()
{
lock (_consoleLock)
using (_consoleLock.EnterScope())
{
if (_stringWriter.Value != null)
{
Expand All @@ -47,7 +47,7 @@ protected void RedirectConsoleInputOutput()

protected string GetConsoleOutput()
{
lock (_consoleLock)
using (_consoleLock.EnterScope())
{
if (_stringWriter.Value != null)
{
Expand All @@ -57,17 +57,10 @@ protected string GetConsoleOutput()
}
}

protected void SetConsoleInput(string input)
{
lock (_consoleLock)
{
_stringReader.Value = new StringReader(input);
}
}

protected void ResetConsoleInputOutput()
{
lock (_consoleLock)
using (_consoleLock.EnterScope())
{
if (_originalConsoleOut != null && _originalConsoleOut.Value != null)
{
Expand Down
4 changes: 2 additions & 2 deletions CodeLineCounter/Services/CodeDuplicationChecker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class CodeDuplicationChecker
{
private readonly ConcurrentDictionary<string, HashSet<DuplicationCode>> duplicationMap;
private readonly ConcurrentDictionary<string, HashSet<DuplicationCode>> hashMap;
private readonly object duplicationLock = new();
private readonly Lock duplicationLock = new();

public CodeDuplicationChecker()
{
Expand Down Expand Up @@ -81,7 +81,7 @@ public void DetectCodeDuplicationInSourceCode(string normalizedPath, string sour

public void UpdateDuplicationMap()
{
lock (duplicationLock)
using (duplicationLock.EnterScope())
{
// Clear previous results to avoid stale data.
duplicationMap.Clear();
Expand Down
4 changes: 2 additions & 2 deletions CodeLineCounter/Services/DependencyAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public static class DependencyAnalyzer
{
private static readonly ConcurrentDictionary<string, HashSet<DependencyRelation>> _dependencyMap = new();
private static readonly HashSet<string> _solutionClasses = new();
private static readonly object _dependencyLock = new();
private static readonly Lock _dependencyLock = new();

public static void AnalyzeSolution(string solutionFilePath)
{
Expand All @@ -39,7 +39,7 @@ private static void CollectAllClasses(IEnumerable<string> projectFiles)
.OfType<ClassDeclarationSyntax>()
.Select(c => GetFullTypeName(c));

lock (_dependencyLock)
using (_dependencyLock.EnterScope())
{
foreach (var className in classes)
{
Expand Down
Loading