Skip to content

Commit

Permalink
Merge pull request #7916 from dotnet/v3
Browse files Browse the repository at this point in the history
πŸš€πŸš€πŸš€
  • Loading branch information
AngryBerryMS authored Mar 8, 2022
2 parents 6809f8e + b06fe09 commit c662f58
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
11 changes: 11 additions & 0 deletions docs/specs/lsp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,3 +227,14 @@ languageServer:
.openpublishing.publish.config.json: "{}"
- expectDiagnostics:
.openpublishing.publish.config.json: [{"code": "config-not-found"}]
---
# Info-level errors will be filtered out.
inputs:
docfx.yml:
a.md:
languageServer:
- openFiles:
a.md: |
<br2/>
- expectDiagnostics:
a.md: []
4 changes: 2 additions & 2 deletions src/docfx/docfx.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.4.1" />
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.2.0" />
<PackageReference Include="docs.validation" Version="1.0.1-rc-00134-de38ac5" />
<PackageReference Include="docs.validation" Version="1.0.1-rc-00140-f8d62d5" />
<PackageReference Include="DotLiquid" Version="2.2.595" />
<PackageReference Include="Glob" Version="1.1.9" />
<PackageReference Include="HtmlReaderWriter" Version="1.0.0-preview-0001-gcf3636c5d9" />
Expand Down Expand Up @@ -43,7 +43,7 @@
<!-- This package was transitively referenced by OmniSharp server, stop propagating it to other projects by explicitly marking it as private assets -->
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.0.64" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="all" />
<PackageReference Include="docs.validation.analyzer" Version="1.0.1-rc-00134-de38ac5" PrivateAssets="all" />
<PackageReference Include="docs.validation.analyzer" Version="1.0.1-rc-00140-f8d62d5" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/docfx/serve/LanguageServerBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ private void PublishDiagnosticsParams(ErrorList errors, IEnumerable<PathString>
{
List<PathString> filesWithDiagnostics = new();
var diagnosticsGroupByFile = from error in errors.ToArray()
where error.Level != ErrorLevel.Info
let source = error.Source ?? new SourceInfo(new FilePath(".openpublishing.publish.config.json"), 0, 0)
let diagnostic = ConvertToDiagnostics(error, source)
group diagnostic by source.File;
Expand Down

0 comments on commit c662f58

Please sign in to comment.