Merge branch 'master' of https://github.com/Andrew-Hanlon/roslyn

8c0a74f2 · Andrew Hanlon · f3f8a083 · 215ecb2a · 8c0a74f2
隐藏空白更改
内联并排

Showing with 4 addition and 1 deletion

src/Workspaces/CSharp/Portable/Utilities/FormattingRangeHelper.cs ...spaces/CSharp/Portable/Utilities/FormattingRangeHelper.cs +4 -1

未找到文件。
--- a/src/Workspaces/CSharp/Portable/Utilities/FormattingRangeHelper.cs
+++ b/src/Workspaces/CSharp/Portable/Utilities/FormattingRangeHelper.cs
@@ -288,7 +288,10 @@ private static SyntaxToken GetPreviousTokenIfNotFirstTokenInTree(SyntaxToken tok

        public static bool AreTwoTokensOnSameLine(SyntaxToken token1, SyntaxToken token2)
        {
-            if (token1 == token2) return true;
+            if (token1 == token2)
+            {
+                return true;
+            }

            var tree = token1.SyntaxTree;
            if (tree != null && tree.TryGetText(out var text))