refresh decorations after new setDiagnosticsOptions have been applied. fixes Microsoft/monaco-editor#755

pull/2748/head
Martin Aeschlimann 7 years ago
parent 427abfc518
commit d806983671

@ -27,12 +27,16 @@ export function setupMode(defaults: LanguageServiceDefaultsImpl): void {
let languageId = defaults.languageId; let languageId = defaults.languageId;
let diagnostcsAdapter = new languageFeatures.DiagnostcsAdapter(languageId, worker);
defaults.onDidChange(c => diagnostcsAdapter.clearMarkers());
disposables.push(monaco.languages.registerCompletionItemProvider(languageId, new languageFeatures.CompletionAdapter(worker))); disposables.push(monaco.languages.registerCompletionItemProvider(languageId, new languageFeatures.CompletionAdapter(worker)));
disposables.push(monaco.languages.registerHoverProvider(languageId, new languageFeatures.HoverAdapter(worker))); disposables.push(monaco.languages.registerHoverProvider(languageId, new languageFeatures.HoverAdapter(worker)));
disposables.push(monaco.languages.registerDocumentSymbolProvider(languageId, new languageFeatures.DocumentSymbolAdapter(worker))); disposables.push(monaco.languages.registerDocumentSymbolProvider(languageId, new languageFeatures.DocumentSymbolAdapter(worker)));
disposables.push(monaco.languages.registerDocumentFormattingEditProvider(languageId, new languageFeatures.DocumentFormattingEditProvider(worker))); disposables.push(monaco.languages.registerDocumentFormattingEditProvider(languageId, new languageFeatures.DocumentFormattingEditProvider(worker)));
disposables.push(monaco.languages.registerDocumentRangeFormattingEditProvider(languageId, new languageFeatures.DocumentRangeFormattingEditProvider(worker))); disposables.push(monaco.languages.registerDocumentRangeFormattingEditProvider(languageId, new languageFeatures.DocumentRangeFormattingEditProvider(worker)));
disposables.push(new languageFeatures.DiagnostcsAdapter(languageId, worker)); disposables.push(diagnostcsAdapter);
disposables.push(monaco.languages.setTokensProvider(languageId, createTokenizationSupport(true))); disposables.push(monaco.languages.setTokensProvider(languageId, createTokenizationSupport(true)));
disposables.push(monaco.languages.setLanguageConfiguration(languageId, richEditConfiguration)); disposables.push(monaco.languages.setLanguageConfiguration(languageId, richEditConfiguration));
} }

@ -68,6 +68,7 @@ export class DiagnostcsAdapter {
this._disposables.push({ this._disposables.push({
dispose: () => { dispose: () => {
monaco.editor.getModels().forEach(onModelRemoved);
for (let key in this._listener) { for (let key in this._listener) {
this._listener[key].dispose(); this._listener[key].dispose();
} }
@ -82,6 +83,14 @@ export class DiagnostcsAdapter {
this._disposables = []; this._disposables = [];
} }
public clearMarkers() {
monaco.editor.getModels().forEach(model => {
if (model.getModeId() === this._languageId) {
monaco.editor.setModelMarkers(model, this._languageId, []);
}
});
}
private _resetSchema(resource: Uri): void { private _resetSchema(resource: Uri): void {
this._worker().then(worker => { this._worker().then(worker => {
worker.resetSchema(resource.toString()); worker.resetSchema(resource.toString());

Loading…
Cancel
Save