Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

JSON: filter schema error diagnostics (#207577)

Browse Source
This commit is contained in:
Martin Aeschlimann
2024-03-13 13:57:08 +01:00
committed by GitHub
parent a5973ef922
commit 45db12eeb2
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
extensions/json-language-features/client/src/jsonClient.ts
View File

@@ -11,7 +11,7 @@ import {
ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n
} from 'vscode';
import {
LanguageClientOptions, RequestType, NotificationType, FormattingOptions as LSPFormattingOptions,
LanguageClientOptions, RequestType, NotificationType, FormattingOptions as LSPFormattingOptions, DocumentDiagnosticReportKind,
DidChangeConfigurationNotification, HandleDiagnosticsSignature, ResponseError, DocumentRangeFormattingParams,
DocumentRangeFormattingRequest, ProvideCompletionItemsSignature, ProvideHoverSignature, BaseLanguageClient, ProvideFoldingRangeSignature, ProvideDocumentSymbolsSignature, ProvideDocumentColorsSignature
} from 'vscode-languageclient';
@@ -230,6 +230,21 @@ async function startClientWithParticipants(context: ExtensionContext, languagePa
}
}));
function filterSchemaErrorDiagnostics(uri: Uri, diagnostics: Diagnostic[]): Diagnostic[] {
const schemaErrorIndex = diagnostics.findIndex(isSchemaResolveError);
if (schemaErrorIndex !== -1) {
const schemaResolveDiagnostic = diagnostics[schemaErrorIndex];
fileSchemaErrors.set(uri.toString(), schemaResolveDiagnostic.message);
if (!schemaDownloadEnabled) {
diagnostics = diagnostics.filter(d => !isSchemaResolveError(d));
}
if (window.activeTextEditor && window.activeTextEditor.document.uri.toString() === uri.toString()) {
schemaResolutionErrorStatusBarItem.show();
}
}
return diagnostics;
}
// Options to control the language client
const clientOptions: LanguageClientOptions = {
// Register the server for json documents
@@ -248,25 +263,17 @@ async function startClientWithParticipants(context: ExtensionContext, languagePa
workspace: {
didChangeConfiguration: () => client.sendNotification(DidChangeConfigurationNotification.type, { settings: getSettings() })
},
provideDiagnostics: async (uriOrDoc, previousResolutId, token, next) => {
const diagnostics = await next(uriOrDoc, previousResolutId, token);
console.log('provideDiagnostics', diagnostics, uriOrDoc);
if (diagnostics && diagnostics.kind === DocumentDiagnosticReportKind.Full) {
const uri = uriOrDoc instanceof Uri ? uriOrDoc : uriOrDoc.uri;
diagnostics.items = filterSchemaErrorDiagnostics(uri, diagnostics.items);
}
return diagnostics;
},
handleDiagnostics: (uri: Uri, diagnostics: Diagnostic[], next: HandleDiagnosticsSignature) => {
const schemaErrorIndex = diagnostics.findIndex(isSchemaResolveError);
if (schemaErrorIndex === -1) {
fileSchemaErrors.delete(uri.toString());
return next(uri, diagnostics);
}
const schemaResolveDiagnostic = diagnostics[schemaErrorIndex];
fileSchemaErrors.set(uri.toString(), schemaResolveDiagnostic.message);
if (!schemaDownloadEnabled) {
diagnostics = diagnostics.filter(d => !isSchemaResolveError(d));
}
if (window.activeTextEditor && window.activeTextEditor.document.uri.toString() === uri.toString()) {
schemaResolutionErrorStatusBarItem.show();
}
diagnostics = filterSchemaErrorDiagnostics(uri, diagnostics);
next(uri, diagnostics);
},
// testing the replace / insert mode