Merge pull request #7786 from mono/jstedfast-async-competion-data-api-fixup

[Debugger] Fix the async GetCodeCompletionData API to have an Async m…

4 files changed, 8 insertions, 8 deletions

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.IDebuggerCompletionProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.IDebuggerCompletionProvider.cs
index 9db791513a..2387899d95 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.IDebuggerCompletionProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.IDebuggerCompletionProvider.cs
@@ -80,7 +80,7 @@ namespace MonoDevelop.CSharp.Completion
 			return token.FullSpan.End;
 		}
 
-		public async Task<Mono.Debugging.Client.CompletionData> GetExpressionCompletionData (string exp, Mono.Debugging.Client.StackFrame frame, CancellationToken token)
+		public async Task<Mono.Debugging.Client.CompletionData> GetExpressionCompletionDataAsync (string exp, Mono.Debugging.Client.StackFrame frame, CancellationToken token)
 		{
 			var location = frame.SourceLocation;
 			var document = DocumentContext.AnalysisDocument;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/DebuggerCompletionController.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/DebuggerCompletionController.cs
index 1e6921b6cd..410df066e8 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/DebuggerCompletionController.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Debugger/DebuggerCompletionController.cs
@@ -91,7 +91,7 @@ namespace MonoDevelop.CSharp.Debugger
 			this.textBuffer = textBuffer;
 		}
 
-		static async Task<int> GetAdjustedContextPoint (int contextPoint, Document document, CancellationToken cancellationToken)
+		static async Task<int> GetAdjustedContextPointAsync (int contextPoint, Document document, CancellationToken cancellationToken)
 		{
 			var tree = await document.GetSyntaxTreeAsync (cancellationToken).ConfigureAwait(false);
 
@@ -116,7 +116,7 @@ namespace MonoDevelop.CSharp.Debugger
 			return token.FullSpan.End;
 		}
 
-		public async Task<CompletionData> GetExpressionCompletionData (string exp, StackFrame frame, CancellationToken token)
+		public async Task<CompletionData> GetExpressionCompletionDataAsync (string exp, StackFrame frame, CancellationToken token)
 		{
 			var location = frame.SourceLocation;
 			if (document == null)
@@ -124,7 +124,7 @@ namespace MonoDevelop.CSharp.Debugger
 			var solution = document.Project.Solution;
 			var textSnapshot = textBuffer.CurrentSnapshot;
 			var text = textSnapshot.GetText (new Span (0, textSnapshot.Length));
-			var insertOffset = await GetAdjustedContextPoint (textSnapshot.GetLineFromLineNumber (location.EndLine - 1).Start.Position + location.EndColumn - 1, document, token).ConfigureAwait(false);
+			var insertOffset = await GetAdjustedContextPointAsync (textSnapshot.GetLineFromLineNumber (location.EndLine - 1).Start.Position + location.EndColumn - 1, document, token).ConfigureAwait(false);
 			text = text.Insert (insertOffset, ";" + exp + ";");
 			insertOffset++;//advance for 1 which represents `;` before expression
 			var newTextBuffer = PlatformCatalog.Instance.TextBufferFactoryService.CreateTextBuffer (text, textBuffer.ContentType);
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
index 0bb071737d..950385ee18 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -1464,7 +1464,7 @@ namespace MonoDevelop.Debugger
 			return info != null ? info.Evaluator : null;
 		}
 
-		static Task<CompletionData> GetExpressionCompletionData (string exp, StackFrame frame, CancellationToken token)
+		static Task<CompletionData> GetExpressionCompletionDataAsync (string exp, StackFrame frame, CancellationToken token)
 		{
 			Document doc = IdeApp.Workbench.GetDocument (frame.SourceLocation.FileName);
 			if (doc == null)
@@ -1472,12 +1472,12 @@ namespace MonoDevelop.Debugger
 			var completionProvider = doc.GetContent<IDebuggerCompletionProvider> (true);
 			if (completionProvider == null)
 				return null;
-			return completionProvider.GetExpressionCompletionData (exp, frame, token);
+			return completionProvider.GetExpressionCompletionDataAsync (exp, frame, token);
 		}
 
 		public static async Task<CompletionData> GetCompletionDataAsync (StackFrame frame, string exp, CancellationToken token = default (CancellationToken))
 		{
-			var result = await GetExpressionCompletionData (exp, frame, token);
+			var result = await GetExpressionCompletionDataAsync (exp, frame, token);
 			if (result != null)
 				return result;
 			return frame.GetExpressionCompletionData (exp);
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerCompletionProvider.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerCompletionProvider.cs
index a98f391b87..56a5e013db 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerCompletionProvider.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerCompletionProvider.cs
@@ -32,6 +32,6 @@ namespace MonoDevelop.Debugger
 {
 	public interface IDebuggerCompletionProvider
 	{
-		Task<CompletionData> GetExpressionCompletionData (string exp, StackFrame frame, CancellationToken token);
+		Task<CompletionData> GetExpressionCompletionDataAsync (string exp, StackFrame frame, CancellationToken token);
 	}
 }