Skip to content

Commit d3c9b2c

Browse files
small logging update for textdocumentmatcher
1 parent b94f484 commit d3c9b2c

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/Server/Matchers/TextDocumentMatcher.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public IEnumerable<ILspHandlerDescriptor> FindHandler(object parameters, IEnumer
2525
{
2626
case ITextDocumentIdentifierParams textDocumentIdentifierParams:
2727
{
28-
var attributes = GetTextDocumentAttributes(descriptors, textDocumentIdentifierParams.TextDocument.Uri);
28+
var attributes = GetTextDocumentAttributes(textDocumentIdentifierParams.TextDocument.Uri);
2929

3030
_logger.LogTrace("Found attributes {Count}, {Attributes}", attributes.Count, attributes.Select(x => $"{x.LanguageId}:{x.Scheme}:{x.Uri}"));
3131

@@ -42,7 +42,7 @@ public IEnumerable<ILspHandlerDescriptor> FindHandler(object parameters, IEnumer
4242
case DidChangeTextDocumentParams didChangeDocumentParams:
4343
{
4444
// TODO: Do something with document version here?
45-
var attributes = GetTextDocumentAttributes(descriptors, didChangeDocumentParams.TextDocument.Uri);
45+
var attributes = GetTextDocumentAttributes(didChangeDocumentParams.TextDocument.Uri);
4646

4747
_logger.LogTrace("Found attributes {Count}, {Attributes}", attributes.Count, attributes.Select(x => $"{x.LanguageId}:{x.Scheme}:{x.Uri}"));
4848

@@ -53,7 +53,7 @@ public IEnumerable<ILspHandlerDescriptor> FindHandler(object parameters, IEnumer
5353
return Enumerable.Empty<ILspHandlerDescriptor>();
5454
}
5555

56-
private List<TextDocumentAttributes> GetTextDocumentAttributes(IEnumerable<ILspHandlerDescriptor> method, Uri uri)
56+
private List<TextDocumentAttributes> GetTextDocumentAttributes(Uri uri)
5757
{
5858
return _getSyncHandlers()
5959
.Select(x => x.GetTextDocumentAttributes(uri))
@@ -62,16 +62,17 @@ private List<TextDocumentAttributes> GetTextDocumentAttributes(IEnumerable<ILspH
6262
.ToList();
6363
}
6464

65-
private IEnumerable<ILspHandlerDescriptor> GetHandler(IEnumerable<ILspHandlerDescriptor> method, IEnumerable<TextDocumentAttributes> attributes)
65+
private IEnumerable<ILspHandlerDescriptor> GetHandler(IEnumerable<ILspHandlerDescriptor> descriptors, IEnumerable<TextDocumentAttributes> attributes)
6666
{
6767
return attributes
68-
.SelectMany(x => GetHandler(method, x));
68+
.SelectMany(x => GetHandler(descriptors, x));
6969
}
7070

71-
private IEnumerable<ILspHandlerDescriptor> GetHandler(IEnumerable<ILspHandlerDescriptor> method, TextDocumentAttributes attributes)
71+
private IEnumerable<ILspHandlerDescriptor> GetHandler(IEnumerable<ILspHandlerDescriptor> descriptors, TextDocumentAttributes attributes)
7272
{
73-
_logger.LogTrace("Looking for handler for method {Method}", method);
74-
foreach (var handler in method)
73+
var method = descriptors.FirstOrDefault()?.Method;
74+
_logger.LogTrace("Looking for handler for descriptors {Method}", method);
75+
foreach (var handler in descriptors)
7576
{
7677
_logger.LogTrace("Checking handler {Method}:{Handler}", method, handler.Handler.GetType().FullName);
7778
var registrationOptions = handler.Registration.RegisterOptions as ITextDocumentRegistrationOptions;

0 commit comments

Comments
 (0)