Skip to content

[Fusion] Updated CodeWriter to avoid writing indented empty lines #8788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+1,486 −1,480
Open

[Fusion] Updated CodeWriter to avoid writing indented empty lines #8788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions ...otChocolate/Fusion-vnext/src/Fusion.Execution/Execution/Nodes/Serialization/CodeWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,25 @@ internal sealed class CodeWriter(StringBuilder sb)

public void WriteLine(string line)
{
for (var i = 0; i < _indent; i++)
if (line.Length != 0)
{
sb.Append(" ");
for (var i = 0; i < _indent; i++)
{
sb.Append(" ");
}
}

sb.AppendLine(line);
}

public void WriteLine(string format, params object[] args)
{
for (var i = 0; i < _indent; i++)
if (format.Length != 0)
{
sb.Append(" ");
for (var i = 0; i < _indent; i++)
{
sb.Append(" ");
}
}

sb.AppendFormat(format, args).AppendLine();
Expand Down
16 changes: 8 additions & 8 deletions ...ion-vnext/test/Fusion.AspNetCore.Tests/__snapshots__/AbstractTypeTests.Abstract_Type.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ sourceSchemas:
schema {
query: Query
}

interface SharedType {
id: Int!
}

type Author implements SharedType {
id: Int!
name: String!
}

type Discussion implements SharedType {
id: Int!
title: String!
}

"A connection to a list of items."
type InterfaceConnectionConnection {
"Information to aid in pagination."
Expand All @@ -52,15 +52,15 @@ sourceSchemas:
"A flattened list of the nodes."
nodes: [SharedType!]
}

"An edge in a connection."
type InterfaceConnectionEdge {
"A cursor for use in pagination."
cursor: String!
"The item at the end of the edge."
node: SharedType!
}

"Information about pagination in a connection."
type PageInfo {
"Indicates whether more edges exist following the set defined by the clients arguments."
Expand All @@ -72,11 +72,11 @@ sourceSchemas:
"When paginating forwards, the cursor to continue."
endCursor: String
}

type Product implements SharedType {
id: Int!
}

type Query {
abstractType: SharedType!
otherAbstractType: SharedType!
Expand Down
14 changes: 7 additions & 7 deletions ...etCore.Tests/__snapshots__/AbstractTypeTests.Abstract_Type_Direct_Source_Schema_Call.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ sourceSchemas:
schema {
query: Query
}

interface SharedType {
id: Int!
}

type Author implements SharedType {
id: Int!
name: String!
}

type Discussion implements SharedType {
id: Int!
title: String!
}

"A connection to a list of items."
type InterfaceConnectionConnection {
"Information to aid in pagination."
Expand All @@ -61,15 +61,15 @@ sourceSchemas:
"A flattened list of the nodes."
nodes: [SharedType!]
}

"An edge in a connection."
type InterfaceConnectionEdge {
"A cursor for use in pagination."
cursor: String!
"The item at the end of the edge."
node: SharedType!
}

"Information about pagination in a connection."
type PageInfo {
"Indicates whether more edges exist following the set defined by the clients arguments."
Expand All @@ -81,7 +81,7 @@ sourceSchemas:
"When paginating forwards, the cursor to continue."
endCursor: String
}

type Query {
abstractType: SharedType!
otherAbstractType: SharedType!
Expand Down
24 changes: 12 additions & 12 deletions ....AspNetCore.Tests/__snapshots__/AbstractTypeTests.Abstract_Type_With_Abstract_Lookup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ sourceSchemas:
schema {
query: Query
}

interface SharedType {
id: Int!
}

type Author implements SharedType {
id: Int!
name: String!
}

type Discussion implements SharedType {
id: Int!
title: String!
}

"A connection to a list of items."
type InterfaceConnectionConnection {
"Information to aid in pagination."
Expand All @@ -51,15 +51,15 @@ sourceSchemas:
"A flattened list of the nodes."
nodes: [SharedType!]
}

"An edge in a connection."
type InterfaceConnectionEdge {
"A cursor for use in pagination."
cursor: String!
"The item at the end of the edge."
node: SharedType!
}

"Information about pagination in a connection."
type PageInfo {
"Indicates whether more edges exist following the set defined by the clients arguments."
Expand All @@ -71,11 +71,11 @@ sourceSchemas:
"When paginating forwards, the cursor to continue."
endCursor: String
}

type Product implements SharedType {
id: Int!
}

type Query {
abstractType: SharedType!
otherAbstractType: SharedType!
Expand Down Expand Up @@ -113,21 +113,21 @@ sourceSchemas:
schema {
query: Query
}

interface OtherInterface {
id: Int!
}

type Author implements OtherInterface {
id: Int!
age: Int!
}

type Discussion {
id: Int!
commentCount: Int!
}

type Query {
otherInterface(id: Int!): OtherInterface! @lookup
discussionById(id: ID!): Discussion @lookup @internal
Expand Down
24 changes: 12 additions & 12 deletions ....AspNetCore.Tests/__snapshots__/AbstractTypeTests.Abstract_Type_With_Concrete_Lookup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ sourceSchemas:
schema {
query: Query
}

interface SharedType {
id: Int!
}

type Author implements SharedType {
id: Int!
name: String!
}

type Discussion implements SharedType {
id: Int!
title: String!
}

"A connection to a list of items."
type InterfaceConnectionConnection {
"Information to aid in pagination."
Expand All @@ -51,15 +51,15 @@ sourceSchemas:
"A flattened list of the nodes."
nodes: [SharedType!]
}

"An edge in a connection."
type InterfaceConnectionEdge {
"A cursor for use in pagination."
cursor: String!
"The item at the end of the edge."
node: SharedType!
}

"Information about pagination in a connection."
type PageInfo {
"Indicates whether more edges exist following the set defined by the clients arguments."
Expand All @@ -71,11 +71,11 @@ sourceSchemas:
"When paginating forwards, the cursor to continue."
endCursor: String
}

type Product implements SharedType {
id: Int!
}

type Query {
abstractType: SharedType!
otherAbstractType: SharedType!
Expand Down Expand Up @@ -113,21 +113,21 @@ sourceSchemas:
schema {
query: Query
}

interface OtherInterface {
id: Int!
}

type Author implements OtherInterface {
id: Int!
age: Int!
}

type Discussion {
id: Int!
commentCount: Int!
}

type Query {
otherInterface(id: Int!): OtherInterface! @lookup
discussionById(id: ID!): Discussion @lookup @internal
Expand Down
24 changes: 12 additions & 12 deletions ....AspNetCore.Tests/__snapshots__/AbstractTypeTests.Concrete_Type_With_Abstract_Lookup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@ sourceSchemas:
schema {
query: Query
}

interface SharedType {
id: Int!
}

type Author implements SharedType {
id: Int!
name: String!
}

type Discussion implements SharedType {
id: Int!
title: String!
}

"A connection to a list of items."
type InterfaceConnectionConnection {
"Information to aid in pagination."
Expand All @@ -47,15 +47,15 @@ sourceSchemas:
"A flattened list of the nodes."
nodes: [SharedType!]
}

"An edge in a connection."
type InterfaceConnectionEdge {
"A cursor for use in pagination."
cursor: String!
"The item at the end of the edge."
node: SharedType!
}

"Information about pagination in a connection."
type PageInfo {
"Indicates whether more edges exist following the set defined by the clients arguments."
Expand All @@ -67,11 +67,11 @@ sourceSchemas:
"When paginating forwards, the cursor to continue."
endCursor: String
}

type Product implements SharedType {
id: Int!
}

type Query {
abstractType: SharedType!
otherAbstractType: SharedType!
Expand Down Expand Up @@ -104,21 +104,21 @@ sourceSchemas:
schema {
query: Query
}

interface OtherInterface {
id: Int!
}

type Author implements OtherInterface {
id: Int!
age: Int!
}

type Discussion {
id: Int!
commentCount: Int!
}

type Query {
otherInterface(id: Int!): OtherInterface! @lookup
discussionById(id: ID!): Discussion @lookup @internal
Expand Down
Loading
Loading