Merge pull request #6809 from mono/master-vsts753551

Fixes VSTS Bug 753551: Using statement indenting

main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpIndentationTracker.cs

@@ -35,6 +35,9 @@
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using System.Threading;
 using MonoDevelop.Ide;
+using Microsoft.CodeAnalysis.LanguageServices;
+using MonoDevelop.Core.Text;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
 
 namespace MonoDevelop.CSharp.Formatting
 {
@@ -69,7 +72,22 @@ public override string GetIndentationString (int lineNumber)
 			if (indentation.HasValue && indentation.Value > 0) {
 				return CalculateIndentationString (indentation.Value);
 			}
-			return editor.GetLineIndent (lineNumber) + CalculateIndentationString (editor.Options.IndentationSize);
+
+			var line = editor.GetLine (lineNumber);
+			if (line == null)
+				return editor.GetLineIndent (lineNumber);
+			try {
+				if (line.Contains (editor.CaretOffset)) {
+					var syntaxRoot = doc.GetSyntaxRootSynchronously (default);
+					var token = syntaxRoot.FindTokenOnLeftOfPosition (editor.CaretOffset);
+					if (token.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.CommaToken))
+						return line.GetIndentation (editor) + CalculateIndentationString (editor.Options.IndentationSize);
+				}
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while calculating the indentation string.", e);
+			}
+
+			return line.GetIndentation (editor);
 		}
 
 		string CalculateIndentationString (int spaceCount)

main/tests/MonoDevelop.CSharpBinding.Tests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs

@@ -624,5 +624,22 @@ public class MyClass
 				Assert.AreEqual ("\t\t\t", indent);
 			}
 		}
+
+		/// <summary>
+		/// Bug 753551: Using statement indenting
+		/// </summary>
+		[Test]
+		public async Task TestVSTS753551 ()
+		{
+			using (var data = await Create (@"
+// Test
+using System;
+$
+	", createWithProject: true)) {
+				var tracker = new CSharpIndentationTracker (data.Document.Editor, data.Document);
+				var indent = tracker.GetIndentationString (data.Document.Editor.CaretLine);
+				Assert.AreEqual ("", indent);
+			}
+		}
 	}
 }