Browse Source

[csilview] remove indentation from single-line C# code in C#-IL view.

pull/923/head
Siegfried Pammer 8 years ago
parent
commit
682ca234d5
  1. 9
      ILSpy/Languages/CSharpILMixedLanguage.cs

9
ILSpy/Languages/CSharpILMixedLanguage.cs

@ -92,7 +92,7 @@ namespace ICSharpCode.ILSpy
startColumn = info.StartColumn; startColumn = info.StartColumn;
if (line == info.EndLine) if (line == info.EndLine)
endColumn = info.EndColumn; endColumn = info.EndColumn;
WriteHighlightedCommentLine(highlightingOutput, text, startColumn - 1, endColumn - 1); WriteHighlightedCommentLine(highlightingOutput, text, startColumn - 1, endColumn - 1, info.StartLine == info.EndLine);
} else } else
WriteCommentLine(output, codeLines[line - 1]); WriteCommentLine(output, codeLines[line - 1]);
} }
@ -106,10 +106,13 @@ namespace ICSharpCode.ILSpy
HighlightingColor gray = new HighlightingColor { Foreground = new SimpleHighlightingBrush(Colors.DarkGray) }; HighlightingColor gray = new HighlightingColor { Foreground = new SimpleHighlightingBrush(Colors.DarkGray) };
HighlightingColor black = new HighlightingColor { Foreground = new SimpleHighlightingBrush(Colors.Black) }; HighlightingColor black = new HighlightingColor { Foreground = new SimpleHighlightingBrush(Colors.Black) };
void WriteHighlightedCommentLine(ISmartTextOutput output, string text, int startColumn, int endColumn) void WriteHighlightedCommentLine(ISmartTextOutput output, string text, int startColumn, int endColumn, bool isSingleLine)
{ {
output.BeginSpan(gray); output.BeginSpan(gray);
output.Write("// " + text.Substring(0, startColumn)); if (isSingleLine)
output.Write("// " + text.Substring(0, startColumn).TrimStart());
else
output.Write("// " + text.Substring(0, startColumn));
output.BeginSpan(black); output.BeginSpan(black);
output.Write(text.Substring(startColumn, endColumn - startColumn)); output.Write(text.Substring(startColumn, endColumn - startColumn));
output.EndSpan(); output.EndSpan();

Loading…
Cancel
Save