SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 19:42:56 +01:00
Code Issues Projects Releases Packages Activity

Merge remote-tracking branch 'origin/master' into pr/spahnke/48

Browse source
This commit is contained in:
Alex Dima 2019-12-17 08:59:09 +01:00
commit fd244a1577
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/languageFeatures.ts
View file

@ -181,6 +181,7 @@ export class DiagnosticsAdapter extends Adapter {
}
const markers = diagnostics
.reduce((p, c) => c.concat(p), [])
.filter(d => (this._defaults.getDiagnosticsOptions().diagnosticCodesToIgnore || []).indexOf(d.code) === -1)
.map(d => this._convertDiagnostics(resource, d));
monaco.editor.setModelMarkers(monaco.editor.getModel(resource), this._selector, markers);
@ -201,7 +202,8 @@ export class DiagnosticsAdapter extends Adapter {
endColumn,
message: flattenDiagnosticMessageText(diag.messageText, '\n'),
code: diag.code.toString(),
relatedInformation: this._convertRelatedInformation(resource, diag.relatedInformation)
tags: diag.reportsUnnecessary ? [monaco.MarkerTag.Unnecessary] : [],
relatedInformation: this._convertRelatedInformation(resource, diag.relatedInformation),
};
}