huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix serialization of SourceSpan 

I noticed this while debugging something else in VS. It looks like the
service hub is using camelCase, which wasn't covered with a diagnostic
in our tests. As a result we would fail to read the data from the OOP
host, and fall back to in-process tag helper discovery.
\n\nCommit migrated from 63b25dbd2d
This commit is contained in:
Ryan Nowak 2019-07-19 10:09:07 -07:00 committed by Ryan Nowak
parent 09b2c7d81a
commit d30eb2f58e
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Shared/RazorShared/RazorDiagnosticJsonConverter.cs
View File

@ -27,15 +27,16 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
}
var diagnostic = JObject.Load(reader);
var id = diagnostic[nameof(RazorDiagnostic.Id)].Value<string>();
var severity = diagnostic[nameof(RazorDiagnostic.Severity)].Value<int>();
var message = diagnostic[RazorDiagnosticMessageKey].Value<string>();
var span = diagnostic[nameof(RazorDiagnostic.Span)].Value<JObject>();
var filePath = span[nameof(SourceSpan.FilePath)].Value<string>();
var absoluteIndex = span[nameof(SourceSpan.AbsoluteIndex)].Value<int>();
var lineIndex = span[nameof(SourceSpan.LineIndex)].Value<int>();
var characterIndex = span[nameof(SourceSpan.CharacterIndex)].Value<int>();
var length = span[nameof(SourceSpan.Length)].Value<int>();
var filePath = span[nameof(SourceSpan.FilePath)].Value<string>();
var message = diagnostic[RazorDiagnosticMessageKey].Value<string>();
var id = diagnostic[nameof(RazorDiagnostic.Id)].Value<string>();
var severity = diagnostic[nameof(RazorDiagnostic.Severity)].Value<int>();
var descriptor = new RazorDiagnosticDescriptor(id, () => message, (RazorDiagnosticSeverity)severity);
var sourceSpan = new SourceSpan(filePath, absoluteIndex, lineIndex, characterIndex, length);
@ -53,7 +54,13 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Serialization
WriteProperty(writer, RazorDiagnosticMessageKey, diagnostic.GetMessage(CultureInfo.CurrentCulture));
writer.WritePropertyName(nameof(RazorDiagnostic.Span));
serializer.Serialize(writer, diagnostic.Span);
writer.WriteStartObject();
WriteProperty(writer, nameof(SourceSpan.FilePath), diagnostic.Span.FilePath);
WriteProperty(writer, nameof(SourceSpan.AbsoluteIndex), diagnostic.Span.AbsoluteIndex);
WriteProperty(writer, nameof(SourceSpan.LineIndex), diagnostic.Span.LineIndex);
WriteProperty(writer, nameof(SourceSpan.CharacterIndex), diagnostic.Span.CharacterIndex);
WriteProperty(writer, nameof(SourceSpan.Length), diagnostic.Span.Length);
writer.WriteEndObject();
writer.WriteEndObject();
}