Skip to content

Commit 5878cda

Browse files
committed
fix: New Analysis Errors found after NET10 update
1 parent 6365e91 commit 5878cda

7 files changed

Lines changed: 16 additions & 22 deletions

File tree

src/PowerShellEditorServices/Services/CodeLens/ReferencesCodeLensProvider.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ internal class ReferencesCodeLensProvider : ICodeLensProvider
2525
/// </summary>
2626
private readonly IDocumentSymbolProvider _symbolProvider;
2727
private readonly SymbolsService _symbolsService;
28-
private readonly WorkspaceService _workspaceService;
2928

3029
public static string Id => nameof(ReferencesCodeLensProvider);
3130

@@ -38,11 +37,9 @@ internal class ReferencesCodeLensProvider : ICodeLensProvider
3837
/// <summary>
3938
/// Construct a new ReferencesCodeLensProvider for a given EditorSession.
4039
/// </summary>
41-
/// <param name="workspaceService"></param>
4240
/// <param name="symbolsService"></param>
43-
public ReferencesCodeLensProvider(WorkspaceService workspaceService, SymbolsService symbolsService)
41+
public ReferencesCodeLensProvider(SymbolsService symbolsService)
4442
{
45-
_workspaceService = workspaceService;
4643
_symbolsService = symbolsService;
4744
// TODO: Pull this from components
4845
_symbolProvider = new ScriptDocumentSymbolProvider();

src/PowerShellEditorServices/Services/PowerShell/Debugging/IPowerShellDebugContext.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ internal interface IPowerShellDebugContext
1313

1414
DebuggerStopEventArgs LastStopEventArgs { get; }
1515

16-
public bool IsDebuggingRemoteRunspace { get; set; }
16+
bool IsDebuggingRemoteRunspace { get; set; }
1717

18-
public event Action<object, DebuggerStopEventArgs> DebuggerStopped;
18+
event Action<object, DebuggerStopEventArgs> DebuggerStopped;
1919

20-
public event Action<object, DebuggerResumingEventArgs> DebuggerResuming;
20+
event Action<object, DebuggerResumingEventArgs> DebuggerResuming;
2121

22-
public event Action<object, BreakpointUpdatedEventArgs> BreakpointUpdated;
22+
event Action<object, BreakpointUpdatedEventArgs> BreakpointUpdated;
2323

2424
void Continue();
2525

src/PowerShellEditorServices/Services/PowerShell/Debugging/PowerShellDebugContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ public void SetDebugResuming(DebuggerResumeAction debuggerResumeAction)
114114
// then this came over LSP and we need to set it.
115115
_psesHost.SetExit();
116116

117-
if (LastStopEventArgs is not null)
117+
if (LastStopEventArgs is { } lastStopEventArgs)
118118
{
119-
LastStopEventArgs.ResumeAction = debuggerResumeAction;
119+
lastStopEventArgs.ResumeAction = debuggerResumeAction;
120120
}
121121

122122
// We need to tell whatever is happening right now in the debug prompt to wrap up so we

src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousTask.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ internal interface ISynchronousTask
2020

2121
internal abstract class SynchronousTask<TResult> : ISynchronousTask
2222
{
23-
private readonly TaskCompletionSource<TResult> _taskCompletionSource;
23+
private TaskCompletionSource<TResult> _taskCompletionSource { get; }
2424

25-
private readonly CancellationToken _taskRequesterCancellationToken;
25+
private CancellationToken _taskRequesterCancellationToken { get; }
2626

27-
private bool _executionCanceled;
27+
private bool _executionCanceled { get; set; }
2828

29-
private TResult _result;
29+
private TResult _result { get; set; }
3030

31-
private ExceptionDispatchInfo _exceptionInfo;
31+
private ExceptionDispatchInfo _exceptionInfo { get; set; }
3232

3333
protected SynchronousTask(
3434
ILogger logger,

src/PowerShellEditorServices/Services/Symbols/ReferenceTable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal sealed class ReferenceTable
2222

2323
private readonly ConcurrentDictionary<string, ConcurrentBag<SymbolReference>> _symbolReferences = new(StringComparer.OrdinalIgnoreCase);
2424

25-
private bool _isInited;
25+
private bool _isInited { get; set; }
2626

2727
public ReferenceTable(ScriptFile parent) => _parent = parent;
2828

src/PowerShellEditorServices/Services/Symbols/SymbolsService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public SymbolsService(
7070
_codeLensProviders = new ConcurrentDictionary<string, ICodeLensProvider>();
7171
if (configurationService.CurrentSettings.EnableReferencesCodeLens)
7272
{
73-
ReferencesCodeLensProvider referencesProvider = new(_workspaceService, this);
73+
ReferencesCodeLensProvider referencesProvider = new(this);
7474
_ = _codeLensProviders.TryAdd(referencesProvider.ProviderId, referencesProvider);
7575
}
7676

@@ -495,7 +495,7 @@ void CloseUnopenedFiles()
495495
return;
496496
}
497497

498-
TryRegisterCodeLensProvider(new ReferencesCodeLensProvider(_workspaceService, this));
498+
TryRegisterCodeLensProvider(new ReferencesCodeLensProvider(this));
499499
return;
500500
}
501501

src/PowerShellEditorServices/Services/Workspace/RemoteFileManagerService.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -691,10 +691,7 @@ private void RemovePSEditFunction(IRunspaceInfo runspaceInfo)
691691
}
692692
try
693693
{
694-
if (runspaceInfo.Runspace.Events != null)
695-
{
696-
runspaceInfo.Runspace.Events.ReceivedEvents.PSEventReceived -= HandlePSEventReceivedAsync;
697-
}
694+
runspaceInfo.Runspace.Events.ReceivedEvents.PSEventReceived -= HandlePSEventReceivedAsync;
698695

699696
if (runspaceInfo.Runspace.RunspaceStateInfo.State == RunspaceState.Opened)
700697
{

0 commit comments

Comments
 (0)