Merge pull request #2 from xWTF/main

Fix crashes when settings.json contains comments or trailing commas
taooceros · Nov 3, 2022 · e395d31 · e395d31
2 parents 527e210 + 9abfab8
commit e395d31
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Flow.Plugin.VSCodeWorkspaces.csproj b/Flow.Plugin.VSCodeWorkspaces.csproj
@@ -13,6 +13,7 @@
 		<LangVersion>latest</LangVersion>
 		<Nullable>warnings</Nullable>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 		<DebugSymbols>true</DebugSymbols>

diff --git a/RemoteMachinesHelper/VSCodeRemoteMachinesApi.cs b/RemoteMachinesHelper/VSCodeRemoteMachinesApi.cs
@@ -34,7 +34,11 @@ public List<VSCodeRemoteMachine> Machines
 
                         try
                         {
-                            JsonElement vscodeSettingsFile = JsonSerializer.Deserialize<JsonElement>(fileContent);
+                            JsonElement vscodeSettingsFile = JsonSerializer.Deserialize<JsonElement>(fileContent, new JsonSerializerOptions
+                            {
+                                AllowTrailingCommas = true,
+                                ReadCommentHandling = JsonCommentHandling.Skip,
+                            });
                             if (vscodeSettingsFile.TryGetProperty("remote.SSH.configFile", out var pathElement))
                             {
                                 var path = pathElement.GetString();

diff --git a/plugin.json b/plugin.json
@@ -4,7 +4,7 @@
   "ActionKeyword": "{",
   "Name": "VS Code Workspaces",
   "Author": "ricardosantos9521",
-  "Version": "1.1.1",
+  "Version": "1.1.2",
   "Language": "csharp",
   "Website": "https://github.com/ricardosantos9521/PowerToys/",
   "ExecuteFileName": "Flow.Plugin.VSCodeWorkspaces.dll",