Skip to content

Commit db77155

Browse files
committed
Fix build warnings about obsolete methods being used
MonoDevelop 7.4 made the following obsolete: 1. ParameterHintingData constructor that took an ISymbol. 2. CompletionTextEditorExtension.HandleParameterCompletionAsync method that used an char for the completion character. Replaced with a method that takes a SignatureHelpTriggerInfo. 3. ParameterHintingResult constructor that took an integer for the offset. Replaced with an ApplicableSpan property.
1 parent cecdc7d commit db77155

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/MonoDevelop.LanguageServer.Client/MonoDevelop.LanguageServer.Client/LanguageClientParameterHintingData.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class LanguageClientParameterHintingData : ParameterHintingData
3939
SignatureInformation signature;
4040

4141
public LanguageClientParameterHintingData (SignatureInformation signature)
42-
: base (null)
4342
{
4443
this.signature = signature;
4544
}

src/MonoDevelop.LanguageServer.Client/MonoDevelop.LanguageServer.Client/LanguageClientTextEditorExtension.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,26 +278,30 @@ bool IsWordAtCurrentCaretPosition ()
278278

279279
public override Task<ParameterHintingResult> HandleParameterCompletionAsync (
280280
CodeCompletionContext completionContext,
281-
char completionChar,
281+
SignatureHelpTriggerInfo triggerInfo,
282282
CancellationToken token = default (CancellationToken))
283283
{
284-
if (ShouldTriggerParameterCompletion (completionChar)) {
284+
if (ShouldTriggerParameterCompletion (triggerInfo)) {
285285
try {
286286
return GetParameterCompletionAsync (completionContext, token);
287287
} catch (Exception ex) {
288288
LanguageClientLoggingService.LogError ("HandleParameterCompletionAsync error.", ex);
289289
}
290290
}
291-
return base.HandleParameterCompletionAsync (completionContext, completionChar, token);
291+
return base.HandleParameterCompletionAsync (completionContext, triggerInfo, token);
292292
}
293293

294-
bool ShouldTriggerParameterCompletion (char completionChar)
294+
bool ShouldTriggerParameterCompletion (SignatureHelpTriggerInfo triggerInfo)
295295
{
296+
if (!triggerInfo.TriggerCharacter.HasValue) {
297+
return false;
298+
}
299+
296300
if (!session.IsSignatureHelpProvider) {
297301
return false;
298302
}
299303

300-
return session.IsSignatureHelpTriggerCharacter (completionChar);
304+
return session.IsSignatureHelpTriggerCharacter (triggerInfo.TriggerCharacter.Value);
301305
}
302306

303307
async Task<ParameterHintingResult> GetParameterCompletionAsync (
@@ -315,7 +319,9 @@ async Task<ParameterHintingResult> GetParameterCompletionAsync (
315319
.Select (signature => new LanguageClientParameterHintingData (signature) as ParameterHintingData)
316320
.ToList ();
317321

318-
return new ParameterHintingResult (parameterDataItems, completionContext.TriggerOffset);
322+
return new ParameterHintingResult (parameterDataItems) {
323+
ApplicableSpan = new Microsoft.CodeAnalysis.Text.TextSpan (completionContext.TriggerOffset, 0)
324+
};
319325
}
320326

321327
[CommandUpdateHandler (CodeFormattingCommands.FormatBuffer)]

0 commit comments

Comments
 (0)