Skip to content

IndentedTextWriter doesn't use indentation on the first line #92791

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

Merged
buyaa-n merged 2 commits into from
Oct 4, 2023
Merged

IndentedTextWriter doesn't use indentation on the first line #92791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf04d1c
IndentedTextWriter doesn't use indentation on the first line
pedrobsaila Sep 28, 2023
1975a7c
fix build 1
pedrobsaila Sep 28, 2023
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
6 changes: 3 additions & 3 deletions src/libraries/System.CodeDom/tests/System/CodeDom/Compiler/CodeGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3286,7 +3286,7 @@ public static IEnumerable<object[]> OutputParameter_TestData()
yield return new object[] { new CodeParameterDeclarationExpression[] { new CodeParameterDeclarationExpression("type1", "name1"), new CodeParameterDeclarationExpression("type2", "name2") }, "Type name1, Type name2" };
yield return new object[]
{
new CodeParameterDeclarationExpression[]
new CodeParameterDeclarationExpression[]
{
new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(),
new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(),
Expand All @@ -3297,14 +3297,14 @@ public static IEnumerable<object[]> OutputParameter_TestData()
};
yield return new object[]
{
new CodeParameterDeclarationExpression[]
new CodeParameterDeclarationExpression[]
{
new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(),
new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(),
new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(),
new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression(), new CodeParameterDeclarationExpression()
},
$"{Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type "
string.Concat(PlatformDetection.IsNetFramework ? string.Empty : $" ", $"{Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type , {Environment.NewLine}Type ")
};
}

Expand Down
30 changes: 15 additions & 15 deletions src/libraries/System.IO/tests/IndentedTextWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ public static void Indent_RoundtripsAndAffectsOutput(int indent)

string expectedTab = string.Concat(Enumerable.Repeat(TabString, itw.Indent));
Assert.Equal(
"first" + Environment.NewLine +
expectedTab + "first" + Environment.NewLine +
expectedTab + "second" + Environment.NewLine +
expectedTab + "third" + Environment.NewLine,
sb.ToString());
Expand All @@ -382,7 +382,7 @@ public static void TabString_UsesProvidedString(string tabString)
itw.WriteLine("Should be indented");
itw.Flush();

Assert.Equal(itw.NewLine + tabString + "Should be indented" + itw.NewLine, sb.ToString());
Assert.Equal(tabString + itw.NewLine + tabString + "Should be indented" + itw.NewLine, sb.ToString());
itw.Close();
}
}
Expand Down Expand Up @@ -449,7 +449,7 @@ public static async Task Writes_ProducesExpectedOutput(string newline)
itw.WriteLineNoTabs("notabs");

Assert.Equal(
"" + newline +
"t" + newline +
"tTrueabcde45.66.789101112131415 1615 16 1715 16 17 18True" + newline +
"ta" + newline +
"tbc" + newline +
Expand Down Expand Up @@ -596,7 +596,7 @@ public async Task WriteAsync_WithIndents_WritesTabsAfterWriteLineAsync(Func<Inde
await callWriteAsync(itw);

Assert.Equal(nameof(IndentedTextWriter.WriteAsync), indicator.LastCalledMethod);
Assert.Equal($"{prefix}{NewLine}{TabString}{expected}", indicator.GetStringBuilder().ToString());
Assert.Equal($"{TabString}{prefix}{NewLine}{TabString}{expected}", indicator.GetStringBuilder().ToString());
}

[Theory]
Expand All @@ -613,7 +613,7 @@ public async Task WriteAsync_WithIndents_OmitsTabsAfterWriteAsync(Func<IndentedT
await callWriteAsync(itw);

Assert.Equal(nameof(IndentedTextWriter.WriteAsync), indicator.LastCalledMethod);
Assert.Equal($"{prefix}{expected}", indicator.GetStringBuilder().ToString());
Assert.Equal($"{TabString}{prefix}{expected}", indicator.GetStringBuilder().ToString());
}

[Theory]
Expand All @@ -631,7 +631,7 @@ public async Task WriteLineAsync_WithoutIndents_CallsInnerWriteLineAsync(Func<In

[Theory]
[MemberData(nameof(WriteLineAsync_MemberData))]
public async Task WriteLineAsync_WithIndents_FirstLine_IsNotIndented(Func<IndentedTextWriter, Task> callWriteLineAsync, string expected)
public async Task WriteLineAsync_WithIndents(Func<IndentedTextWriter, Task> callWriteLineAsync, string expected)
{
var indicator = new IndicatingTextWriter();
var itw = new IndentedTextWriter(indicator, TabString);
Expand All @@ -640,7 +640,7 @@ public async Task WriteLineAsync_WithIndents_FirstLine_IsNotIndented(Func<Indent
await callWriteLineAsync(itw);

Assert.Equal(nameof(IndentedTextWriter.WriteLineAsync), indicator.LastCalledMethod);
Assert.Equal(expected, indicator.GetStringBuilder().ToString());
Assert.Equal($"{TabString}{expected}", indicator.GetStringBuilder().ToString());
}

[Theory]
Expand All @@ -657,7 +657,7 @@ public async Task WriteLineAsync_WithIndents_SubsequentLines_AreIndented(Func<In
await callWriteLineAsync(itw);

Assert.Equal(nameof(IndentedTextWriter.WriteLineAsync), indicator.LastCalledMethod);
Assert.Equal($"{prefix}{NewLine}{TabString}{expected}", indicator.GetStringBuilder().ToString());
Assert.Equal($"{TabString}{prefix}{NewLine}{TabString}{expected}", indicator.GetStringBuilder().ToString());
}

[Fact]
Expand Down Expand Up @@ -694,7 +694,7 @@ public void Write_WithoutIndents_CallsInnerWrite(Action<IndentedTextWriter> call

[Theory]
[MemberData(nameof(Write_MemberData))]
public void Write_WithIndents_FirstLine_IsNotIndented(Action<IndentedTextWriter> callWrite, string expected)
public void Write_WithIndents_FirstLine_IsIndented(Action<IndentedTextWriter> callWrite, string expected)
{
var indicator = new IndicatingTextWriter();
var itw = new IndentedTextWriter(indicator, TabString);
Expand All @@ -704,12 +704,12 @@ public void Write_WithIndents_FirstLine_IsNotIndented(Action<IndentedTextWriter>
callWrite(itw);

Assert.Equal(nameof(IndentedTextWriter.Write), indicator.LastCalledMethod);
Assert.Equal(expected, indicator.GetStringBuilder().ToString());
Assert.Equal($"{TabString}{expected}", indicator.GetStringBuilder().ToString());
}

[Theory]
[MemberData(nameof(Write_MemberData))]
public void Write_IsIndented_AfterWriteLine(Action<IndentedTextWriter> callWrite, string expected)
public void Write_IsIndented(Action<IndentedTextWriter> callWrite, string expected)
{
var indicator = new IndicatingTextWriter();
var itw = new IndentedTextWriter(indicator, TabString);
Expand All @@ -721,7 +721,7 @@ public void Write_IsIndented_AfterWriteLine(Action<IndentedTextWriter> callWrite
callWrite(itw);

Assert.Equal(nameof(IndentedTextWriter.Write), indicator.LastCalledMethod);
Assert.Equal($"{prefix}{NewLine}{TabString}{expected}", indicator.GetStringBuilder().ToString());
Assert.Equal($"{TabString}{prefix}{NewLine}{TabString}{expected}", indicator.GetStringBuilder().ToString());
}

[Theory]
Expand Down Expand Up @@ -750,12 +750,12 @@ public void WriteLine_FirstLine_IsNotIndented(Action<IndentedTextWriter> callWri
callWriteLine(itw);

Assert.Equal(nameof(IndentedTextWriter.WriteLine), indicator.LastCalledMethod);
Assert.Equal(expected, indicator.GetStringBuilder().ToString());
Assert.Equal($"{TabString}{expected}", indicator.GetStringBuilder().ToString());
}

[Theory]
[MemberData(nameof(WriteLine_MemberData))]
public void WriteLine_IsIndented_AfterWriteLine(Action<IndentedTextWriter> callWriteLine, string expected)
public void WriteLine_IsIndented(Action<IndentedTextWriter> callWriteLine, string expected)
{
var indicator = new IndicatingTextWriter();
var itw = new IndentedTextWriter(indicator, TabString);
Expand All @@ -767,7 +767,7 @@ public void WriteLine_IsIndented_AfterWriteLine(Action<IndentedTextWriter> callW
callWriteLine(itw);

Assert.Equal(nameof(IndentedTextWriter.WriteLine), indicator.LastCalledMethod);
Assert.Equal($"{prefix}{NewLine}{TabString}{expected}", indicator.GetStringBuilder().ToString());
Assert.Equal($"{TabString}{prefix}{NewLine}{TabString}{expected}", indicator.GetStringBuilder().ToString());
}

[Fact]
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Private.CoreLib/src/System/CodeDom/Compiler/IndentedTextWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public IndentedTextWriter(TextWriter writer, string tabString) : base(CultureInf

_writer = writer;
_tabString = tabString;
_tabsPending = true;
}

public override Encoding Encoding => _writer.Encoding;
Expand Down