From 8bd97b6e2ec1beed7431a64bfacd55018cb6d6ca Mon Sep 17 00:00:00 2001
From: Bill Avery <billav@microsoft.com>
Date: Mon, 16 Sep 2024 00:08:28 -0700
Subject: [PATCH] fix(fmt): cleanup extra blank line in client module
 interfaces

---
 samples/client/benchmark/BenchmarkClient.ixx     |  1 -
 .../client/multiple/MultipleQueriesClient.ixx    |  1 -
 samples/client/mutate/MutateClient.ixx           |  1 -
 samples/client/nestedinput/NestedInputClient.ixx |  1 -
 samples/client/query/QueryClient.ixx             |  1 -
 samples/client/subscribe/SubscribeClient.ixx     |  1 -
 samples/proxy/query/ProxyClient.ixx              |  1 -
 src/ClientGenerator.cpp                          | 16 ++++++----------
 8 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/samples/client/benchmark/BenchmarkClient.ixx b/samples/client/benchmark/BenchmarkClient.ixx
index 64b88c5b..0400cf83 100644
--- a/samples/client/benchmark/BenchmarkClient.ixx
+++ b/samples/client/benchmark/BenchmarkClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.Benchmark.BenchmarkClient;
 
 export namespace graphql::client {
 
-
 namespace benchmark {
 
 using benchmark::GetRequestText;
diff --git a/samples/client/multiple/MultipleQueriesClient.ixx b/samples/client/multiple/MultipleQueriesClient.ixx
index f2b5ce2d..a12ea9b4 100644
--- a/samples/client/multiple/MultipleQueriesClient.ixx
+++ b/samples/client/multiple/MultipleQueriesClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.MultipleQueries.MultipleQueriesClient;
 
 export namespace graphql::client {
 
-
 namespace multiple {
 
 using multiple::GetRequestText;
diff --git a/samples/client/mutate/MutateClient.ixx b/samples/client/mutate/MutateClient.ixx
index 9c4579ee..67b20b6d 100644
--- a/samples/client/mutate/MutateClient.ixx
+++ b/samples/client/mutate/MutateClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.Mutate.MutateClient;
 
 export namespace graphql::client {
 
-
 namespace mutate {
 
 using mutate::GetRequestText;
diff --git a/samples/client/nestedinput/NestedInputClient.ixx b/samples/client/nestedinput/NestedInputClient.ixx
index fe02a9a8..c7f1253b 100644
--- a/samples/client/nestedinput/NestedInputClient.ixx
+++ b/samples/client/nestedinput/NestedInputClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.NestedInput.NestedInputClient;
 
 export namespace graphql::client {
 
-
 namespace nestedinput {
 
 using nestedinput::GetRequestText;
diff --git a/samples/client/query/QueryClient.ixx b/samples/client/query/QueryClient.ixx
index f4d077ef..97f91145 100644
--- a/samples/client/query/QueryClient.ixx
+++ b/samples/client/query/QueryClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.Query.QueryClient;
 
 export namespace graphql::client {
 
-
 namespace query {
 
 using query::GetRequestText;
diff --git a/samples/client/subscribe/SubscribeClient.ixx b/samples/client/subscribe/SubscribeClient.ixx
index adeae8ed..cf92a734 100644
--- a/samples/client/subscribe/SubscribeClient.ixx
+++ b/samples/client/subscribe/SubscribeClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.Subscribe.SubscribeClient;
 
 export namespace graphql::client {
 
-
 namespace subscribe {
 
 using subscribe::GetRequestText;
diff --git a/samples/proxy/query/ProxyClient.ixx b/samples/proxy/query/ProxyClient.ixx
index 65b38f32..e74294c1 100644
--- a/samples/proxy/query/ProxyClient.ixx
+++ b/samples/proxy/query/ProxyClient.ixx
@@ -11,7 +11,6 @@ export module GraphQL.Proxy.ProxyClient;
 
 export namespace graphql::client {
 
-
 namespace proxy {
 
 using proxy::GetRequestText;
diff --git a/src/ClientGenerator.cpp b/src/ClientGenerator.cpp
index e3bca07d..ad01d3a1 100644
--- a/src/ClientGenerator.cpp
+++ b/src/ClientGenerator.cpp
@@ -643,20 +643,15 @@ export )cpp";
 
 	moduleFile << std::endl;
 
-	NamespaceScope schemaNamespace { moduleFile, _schemaLoader.getSchemaNamespace(), true };
+	NamespaceScope schemaNamespace { moduleFile, _schemaLoader.getSchemaNamespace() };
 	PendingBlankLine pendingSeparator { moduleFile };
 
-	pendingSeparator.reset();
-	if (schemaNamespace.enter())
-	{
-		moduleFile << R"cpp(
+	moduleFile << R"cpp(
 using )cpp" << _schemaLoader.getSchemaNamespace()
-				   << R"cpp(::GetRequestText;
+			   << R"cpp(::GetRequestText;
 using )cpp" << _schemaLoader.getSchemaNamespace()
-				   << R"cpp(::GetRequestObject;
+			   << R"cpp(::GetRequestObject;
 )cpp";
-		pendingSeparator.add();
-	}
 
 	const auto& operations = _requestLoader.getOperations();
 	std::unordered_set<std::string_view> declaredEnum;
@@ -1065,7 +1060,8 @@ response::Value Variable<)cpp"
 
 				sourceFile << R"cpp(template <>
 response::Value Variable<)cpp"
-						   << cppType << R"cpp(>::serialize()cpp" << cppType << R"cpp(&& inputValue)
+						   << cppType << R"cpp(>::serialize()cpp" << cppType
+						   << R"cpp(&& inputValue)
 {
 	response::Value result { response::Type::Map };