From ddd4f437336951f4bb03052d0f9c1ff4c6ed0499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Wed, 16 Sep 2015 10:51:01 +0200 Subject: Fixed 'Bug 33979 - Show Parameter List popover not available when not on opening '. --- .../CSharpCompletionTextEditorExtension.cs | 19 ++- .../ParameterHinting/ParameterHintingEngine.cs | 2 - .../ParameterHinting/ParameterUtil.cs | 184 ++++----------------- 3 files changed, 44 insertions(+), 161 deletions(-) (limited to 'main') diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs index f8d9270649..3e168043c0 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs @@ -625,19 +625,26 @@ namespace MonoDevelop.CSharp.Completion // } // } // } - - public override async Task HandleParameterCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken)) + public override Task ParameterCompletionCommand (CodeCompletionContext completionContext) + { + char ch = completionContext.TriggerOffset > 0 ? Editor.GetCharAt (completionContext.TriggerOffset - 1) : '\0'; + return InternalHandleParameterCompletionCommand (completionContext, ch, true, default(CancellationToken)); + } + + public override Task HandleParameterCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default (CancellationToken)) + { + return InternalHandleParameterCompletionCommand (completionContext, completionChar, false, token); + } + + public async Task InternalHandleParameterCompletionCommand (CodeCompletionContext completionContext, char completionChar, bool force, CancellationToken token = default(CancellationToken)) { var data = Editor; - if (completionChar != '(' && completionChar != ',') + if (!force && completionChar != '(' && completionChar != ',') return null; if (Editor.EditMode != EditMode.Edit) return null; var offset = Editor.CaretOffset; - - if (completionChar != '(' && completionChar != ',') - return null; try { var analysisDocument = DocumentContext.AnalysisDocument; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterHintingEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterHintingEngine.cs index 2d1cc99506..cc995742df 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterHintingEngine.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterHintingEngine.cs @@ -54,8 +54,6 @@ namespace ICSharpCode.NRefactory6.CSharp.Completion public async Task GetParameterDataProviderAsync(Document document, SemanticModel semanticModel, int position, CancellationToken cancellationToken = default(CancellationToken)) { var tree = await document.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false); - if (tree.IsInNonUserCode(position, cancellationToken)) - return ParameterHintingResult.Empty; var tokenLeftOfPosition = tree.FindTokenOnLeftOfPosition (position, cancellationToken); if (tokenLeftOfPosition.IsKind (SyntaxKind.LessThanToken)) { diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterUtil.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterUtil.cs index 5e06ced545..8819453b88 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterUtil.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterUtil.cs @@ -24,12 +24,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; +using System.Linq; using System.Collections.Generic; using Microsoft.CodeAnalysis; using System.Text; using System.Threading; using System.Threading.Tasks; using MonoDevelop.Core.Text; +using Microsoft.CodeAnalysis.CSharp.Syntax; namespace ICSharpCode.NRefactory6.CSharp { @@ -53,164 +55,40 @@ namespace ICSharpCode.NRefactory6.CSharp { public static async Task GetCurrentParameterIndex (Document document, int startOffset, int caretOffset, CancellationToken cancellationToken = default(CancellationToken)) { - var usedNamedParameters =new List (); - var parameter = new Stack (); - var bracketStack = new Stack> (); - bool inSingleComment = false, inString = false, inVerbatimString = false, inChar = false, inMultiLineComment = false; - var word = new StringBuilder (); - bool foundCharAfterOpenBracket = false; - - var text = await document.GetTextAsync(cancellationToken); - for (int i = startOffset; i < caretOffset; i++) { - char ch = text[i]; - char nextCh = i + 1 < text.Length ? text[i + 1] : '\0'; - if (ch == ':') { - usedNamedParameters.Add (word.ToString ()); - word.Length = 0; - } else if (char.IsLetterOrDigit (ch) || ch =='_') { - word.Append (ch); - } else if (char.IsWhiteSpace (ch)) { + List usedNamedParameters = null; + var tree = await document.GetSyntaxTreeAsync (cancellationToken).ConfigureAwait (false); + var root = await tree.GetRootAsync (cancellationToken).ConfigureAwait (false); - } else { - word.Length = 0; + var token = root.FindToken (startOffset); + if (token.Parent == null) + return ParameterIndexResult.Invalid; + + var invocation = token.Parent.AncestorsAndSelf ().OfType ().FirstOrDefault (); + + if (invocation == null || invocation.ArgumentList == null) + return ParameterIndexResult.Invalid; + + int i = 0; + foreach (var child in invocation.ArgumentList.ChildNodesAndTokens ()) { + if (child.Span.End > caretOffset) { + if (i == 0 && caretOffset <= child.SpanStart) + return ParameterIndexResult.First; + return new ParameterIndexResult (usedNamedParameters != null ? usedNamedParameters.ToArray () : null, i + 1); } - if (!char.IsWhiteSpace(ch) && parameter.Count > 0) - foundCharAfterOpenBracket = true; - switch (ch) { - case '{': - if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) { - break; - } - bracketStack.Push (parameter); - parameter = new Stack (); - break; - case '[': - case '(': - if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) { - break; - } - parameter.Push (0); - break; - case '}': - if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) { - break; - } - if (bracketStack.Count > 0) { - parameter = bracketStack.Pop (); - } else { - return ParameterIndexResult.Invalid; - } - break; - case ']': - case ')': - if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) { - break; - } - if (parameter.Count > 0) { - parameter.Pop (); - } else { - return ParameterIndexResult.Invalid; - } - break; - case '<': - if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) { - break; - } - parameter.Push (0); - break; - case '=': - if (nextCh == '>') { - i++; - continue; - } - break; - case '>': - if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) { - break; - } - if (parameter.Count > 0) { - parameter.Pop (); - } - break; - case ',': - if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) { - break; - } - if (parameter.Count > 0) { - parameter.Push (parameter.Pop () + 1); - } - break; - case '/': - if (inString || inChar || inVerbatimString) { - break; - } - if (nextCh == '/') { - i++; - inSingleComment = true; - } - if (nextCh == '*') { - inMultiLineComment = true; - } - break; - case '*': - if (inString || inChar || inVerbatimString || inSingleComment) { - break; - } - if (nextCh == '/') { - i++; - inMultiLineComment = false; - } - break; - case '@': - if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) { - break; - } - if (nextCh == '"') { - i++; - inVerbatimString = true; - } - break; - case '\\': - if (inString || inChar) { - i++; - } - break; - case '"': - if (inSingleComment || inMultiLineComment || inChar) { - break; - } - if (inVerbatimString) { - if (nextCh == '"') { - i++; - break; - } - inVerbatimString = false; - break; - } - inString = !inString; - break; - case '\'': - if (inSingleComment || inMultiLineComment || inString || inVerbatimString) { - break; - } - inChar = !inChar; - break; - default: - if (NewLine.IsNewLine(ch)) { - inSingleComment = false; - inString = false; - inChar = false; - } - break; + if (child.IsToken) { + if (child.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.CommaToken)) + i++; + } else { + var node = child.AsNode () as ArgumentSyntax; + if (node != null && node.NameColon != null) { + if (usedNamedParameters == null) + usedNamedParameters = new List (); + usedNamedParameters.Add (node.NameColon.Name.Identifier.Text); + } } } - if (parameter.Count != 1 || bracketStack.Count > 0) { - return ParameterIndexResult.Invalid; - } - if (!foundCharAfterOpenBracket) - return ParameterIndexResult.First; - return new ParameterIndexResult (usedNamedParameters.ToArray(), parameter.Pop() + 1); + return ParameterIndexResult.Invalid; } } } -- cgit v1.2.3