Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Onokaev committed Jan 20, 2025
1 parent 0f84d3b commit 2380019
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/Kiota.Builder/Settings/SettingsFileManagementService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public Task WriteSettingsFileAsync(string directoryPath, OpenApiDocument openApi
private static SettingsFile GenerateSettingsFile(OpenApiDocument openApiDocument)
{
var settings = new SettingsFile();
if(openApiDocument.Servers?.Count > 0)
if (openApiDocument.Servers?.Count > 0)
{
settings.EnvironmentVariables.Development.HostAddress = openApiDocument.Servers[0].Url;
settings.EnvironmentVariables.Remote.HostAddress = openApiDocument.Servers[0].Url;
Expand All @@ -51,6 +51,6 @@ private async Task WriteSettingsFileInternalAsync(string directoryPath, Settings
var vscodeDirectoryPath = GetDirectoryContainingSettingsFile(parentDirectoryPath!);
var settingsObjectString = JsonSerializer.Serialize(settings, SettingsFileGenerationContext.Default.SettingsFile);
var fileUpdatePath = Path.Combine(vscodeDirectoryPath, SettingsFileName);
await VsCodeSettingsManager.UpdateFileAsync(settingsObjectString, EnvironmentVariablesKey, fileUpdatePath, cancellationToken).ConfigureAwait(false);
await VsCodeSettingsManager.UpdateFileAsync(settingsObjectString, fileUpdatePath, cancellationToken).ConfigureAwait(false);
}
}
24 changes: 9 additions & 15 deletions src/Kiota.Builder/Settings/VsCodeFileManagement.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Text.Json;
Expand All @@ -15,33 +15,27 @@ public static class VsCodeSettingsManager
WriteIndented = true,
};
private static readonly SettingsFileGenerationContext context = new(options);
public static async Task UpdateFileAsync(string fileUpdate, string fileUpdateKey, string fileUpdatePath, CancellationToken cancellationToken)
public static async Task UpdateFileAsync(string fileUpdate, string fileUpdatePath, CancellationToken cancellationToken)
{
ArgumentException.ThrowIfNullOrEmpty(fileUpdate);
Dictionary<string, object> settings;

// Read existing settings or create new if file doesn't exist
if (File.Exists(fileUpdatePath))
{
string jsonContent = await File.ReadAllTextAsync(fileUpdatePath, cancellationToken).ConfigureAwait(false);
try
{
settings = JsonSerializer.Deserialize(
jsonContent,
context.DictionaryStringObject)
?? [];
}
catch (JsonException)
{
settings = [];
}
using var stream = File.OpenRead(fileUpdatePath);
settings = await JsonSerializer.DeserializeAsync(
stream,
context.DictionaryStringObject,
cancellationToken
).ConfigureAwait(false) ?? [];
}
else
{
settings = [];
}

var fileUpdateDictionary = JsonSerializer.Deserialize<Dictionary<string, object>>(fileUpdate, context.DictionaryStringObject);
var fileUpdateDictionary = JsonSerializer.Deserialize(fileUpdate, context.DictionaryStringObject);
if (fileUpdateDictionary is not null)
{
foreach (var kvp in fileUpdateDictionary)
Expand Down

0 comments on commit 2380019

Please sign in to comment.