fixup! PR comments

deansheather · deansheather · commit 9bda625932c3 · 2025-02-17T06:45:18.000+11:00
diff --git a/App/ViewModels/TrayWindowViewModel.cs b/App/ViewModels/TrayWindowViewModel.cs
@@ -144,7 +144,8 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
 
         // For every stopped workspace that doesn't have any agents, add a
         // dummy agent row.
-        foreach (var workspace in rpcModel.Workspaces.Where(w => w.Status == Workspace.Types.Status.Stopped && !workspacesWithAgents.Contains(w.Id)))
+        foreach (var workspace in rpcModel.Workspaces.Where(w =>
+                     w.Status == Workspace.Types.Status.Stopped && !workspacesWithAgents.Contains(w.Id)))
             agents.Add(new AgentViewModel
             {
                 // We just assume that it's a single-agent workspace.
diff --git a/App/Views/Pages/TrayWindowMainPage.xaml b/App/Views/Pages/TrayWindowMainPage.xaml
@@ -15,7 +15,8 @@
         <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
         <converters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter" />
 
-        <converters:VpnLifecycleToBoolConverter x:Key="ConnectingBoolConverter" Unknown="true" Starting="true" Stopping="true" />
+        <converters:VpnLifecycleToBoolConverter x:Key="ConnectingBoolConverter" Unknown="true" Starting="true"
+                                                Stopping="true" />
         <converters:VpnLifecycleToBoolConverter x:Key="NotConnectingBoolConverter" Started="true" Stopped="true" />
         <converters:VpnLifecycleToBoolConverter x:Key="StoppedBoolConverter" Stopped="true" />
         <converters:VpnLifecycleToVisibilityConverter x:Key="StartedVisibilityConverter" Started="true" />
diff --git a/App/Views/SignInWindow.xaml.cs b/App/Views/SignInWindow.xaml.cs
@@ -3,7 +3,6 @@
 using Coder.Desktop.App.Views.Pages;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
-using WinRT.Interop;
 
 namespace Coder.Desktop.App.Views;
 
diff --git a/CoderSdk/CoderApiClient.cs b/CoderSdk/CoderApiClient.cs
@@ -60,8 +60,12 @@ public void SetSessionToken(string token)
         _httpClient.DefaultRequestHeaders.Remove("Coder-Session-Token");
         _httpClient.DefaultRequestHeaders.Add("Coder-Session-Token", token);
     }
-    private async Task<TResponse> SendRequestNoBodyAsync<TResponse>(HttpMethod method, string path, CancellationToken ct = default) =>
-        await SendRequestAsync<object, TResponse>(method, path, null, ct);
+
+    private async Task<TResponse> SendRequestNoBodyAsync<TResponse>(HttpMethod method, string path,
+        CancellationToken ct = default)
+    {
+        return await SendRequestAsync<object, TResponse>(method, path, null, ct);
+    }
 
     private async Task<TResponse> SendRequestAsync<TRequest, TResponse>(HttpMethod method, string path,
         TRequest? payload, CancellationToken ct = default)
diff --git a/Vpn.Service/Manager.cs b/Vpn.Service/Manager.cs
@@ -138,7 +138,8 @@ private async ValueTask<StartResponse> HandleClientMessageStart(ClientMessage me
         {
             try
             {
-                var serverVersion = await CheckServerVersionAndCredentials(message.Start.CoderUrl, message.Start.ApiToken, ct);
+                var serverVersion =
+                    await CheckServerVersionAndCredentials(message.Start.CoderUrl, message.Start.ApiToken, ct);
                 if (_status == TunnelStatus.Started && _lastStartRequest != null &&
                     _lastStartRequest.Equals(message.Start) && _lastServerVersion?.String == serverVersion.String)
                 {
diff --git a/Vpn.Service/Program.cs b/Vpn.Service/Program.cs
@@ -16,6 +16,7 @@ public static class Program
 
     private const string ConsoleOutputTemplate =
         "[{Timestamp:HH:mm:ss} {Level:u3}] {SourceContext} - {Message:lj}{NewLine}{Exception}";
+
     private const string FileOutputTemplate =
         "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {SourceContext} - {Message:lj}{NewLine}{Exception}";
 

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,8 @@ private void UpdateFromRpcModel(RpcModel rpcModel)`
`144`	`144`
`145`	`145`	`// For every stopped workspace that doesn't have any agents, add a`
`146`	`146`	`// dummy agent row.`
`147`		`- foreach (var workspace in rpcModel.Workspaces.Where(w => w.Status == Workspace.Types.Status.Stopped && !workspacesWithAgents.Contains(w.Id)))`
	`147`	`+ foreach (var workspace in rpcModel.Workspaces.Where(w =>`
	`148`	`+ w.Status == Workspace.Types.Status.Stopped && !workspacesWithAgents.Contains(w.Id)))`
`148`	`149`	`agents.Add(new AgentViewModel`
`149`	`150`	`{`
`150`	`151`	`// We just assume that it's a single-agent workspace.`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,8 @@ private async ValueTask<StartResponse> HandleClientMessageStart(ClientMessage me`
`138`	`138`	`{`
`139`	`139`	`try`
`140`	`140`	`{`
`141`		`- var serverVersion = await CheckServerVersionAndCredentials(message.Start.CoderUrl, message.Start.ApiToken, ct);`
	`141`	`+ var serverVersion =`
	`142`	`+ await CheckServerVersionAndCredentials(message.Start.CoderUrl, message.Start.ApiToken, ct);`
`142`	`143`	`if (_status == TunnelStatus.Started && _lastStartRequest != null &&`
`143`	`144`	`_lastStartRequest.Equals(message.Start) && _lastServerVersion?.String == serverVersion.String)`
`144`	`145`	`{`