From 2f6e2e784a84bbabdc2623a69f2517b2818f2b86 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Fri, 28 Sep 2018 12:42:03 -0700 Subject: [PATCH 1/2] Fix signature handler regression --- .../Server/LanguageServer.cs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs index 885f0ce1f..9b9969ebd 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs @@ -842,23 +842,24 @@ await editorSession.LanguageService.FindParameterSetsInFile( if (parameterSets != null) { - var sigs = new List(); - foreach (ParameterSetSignature sig in parameterSets.Signatures) + signatures = new SignatureInformation[parameterSets.Signatures.Length]; + for (int i = 0; i < signatures.Length; i++) { - var parameters = new List(); - foreach (ParameterInfo paramInfo in sig.Parameters) + var parameters = new ParameterInformation[signatures[i].Parameters.Count()]; + int j = 0; + foreach (ParameterInfo param in parameterSets.Signatures[i].Parameters) { - parameters.Add(CreateParameterInfo(paramInfo)); + parameters[j] = CreateParameterInfo(param); + j++; } var signature = new SignatureInformation { - Label = parameterSets.CommandName + " " + sig.SignatureText, + Label = parameterSets.CommandName + " " + parameterSets.Signatures[i].SignatureText, Documentation = null, - Parameters = parameters.ToArray(), + Parameters = parameters, }; } - signatures = sigs.ToArray(); } await requestContext.SendResult( From 7cfcbc530901c75256989b317dcb2b2c0fd10f20 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Fri, 28 Sep 2018 13:00:19 -0700 Subject: [PATCH 2/2] Fix bad variable usage --- .../Server/LanguageServer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs index 9b9969ebd..ab3e7a040 100644 --- a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs +++ b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs @@ -845,7 +845,7 @@ await editorSession.LanguageService.FindParameterSetsInFile( signatures = new SignatureInformation[parameterSets.Signatures.Length]; for (int i = 0; i < signatures.Length; i++) { - var parameters = new ParameterInformation[signatures[i].Parameters.Count()]; + var parameters = new ParameterInformation[parameterSets.Signatures[i].Parameters.Count()]; int j = 0; foreach (ParameterInfo param in parameterSets.Signatures[i].Parameters) { @@ -853,7 +853,7 @@ await editorSession.LanguageService.FindParameterSetsInFile( j++; } - var signature = new SignatureInformation + signatures[i] = new SignatureInformation { Label = parameterSets.CommandName + " " + parameterSets.Signatures[i].SignatureText, Documentation = null,