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

Show JSON schema resolution issues in status bar, not notifications

Browse Source 
Note that this uses the status bar item only for that. After switching files,
the item is not shown until problems
are re-evaluated.
This commit is contained in:
Literallie
2018-10-10 16:15:06 +02:00
parent 01754ba288
commit 27ce1616ca
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/json-language-features/client/src/jsonMain.ts
View File

@@ -8,7 +8,7 @@ import * as fs from 'fs';
import * as nls from 'vscode-nls';
const localize = nls.loadMessageBundle();
import { workspace, window, languages, ExtensionContext, extensions, Uri, LanguageConfiguration, Diagnostic } from 'vscode';
import { workspace, window, languages, ExtensionContext, extensions, Uri, LanguageConfiguration, Diagnostic, StatusBarAlignment, TextEditor } from 'vscode';
import { LanguageClient, LanguageClientOptions, RequestType, ServerOptions, TransportKind, NotificationType, DidChangeConfigurationNotification, HandleDiagnosticsSignature } from 'vscode-languageclient';
import TelemetryReporter from 'vscode-extension-telemetry';
@@ -77,6 +77,10 @@ export function activate(context: ExtensionContext) {
let documentSelector = ['json', 'jsonc'];
let statusBarItem = window.createStatusBarItem(StatusBarAlignment.Right, 0);
statusBarItem.text = '$(alert) JSON';
toDispose.push(statusBarItem);
// Options to control the language client
let clientOptions: LanguageClientOptions = {
// Register the server for json documents
@@ -96,8 +100,11 @@ export function activate(context: ExtensionContext) {
if (schemaErrorIndex !== -1) {
// Show schema resolution errors in status bar only; ref: #51032
const schemaResolveDiagnostic = diagnostics[schemaErrorIndex];
window.showWarningMessage(schemaResolveDiagnostic.message);
statusBarItem.tooltip = schemaResolveDiagnostic.message;
statusBarItem.show();
diagnostics.splice(schemaErrorIndex, 1);
} else {
statusBarItem.hide();
}
next(uri, diagnostics);
}
@@ -132,8 +139,14 @@ export function activate(context: ExtensionContext) {
client.sendNotification(SchemaContentChangeNotification.type, uri.toString());
}
};
let handleActiveEditorChange = (_?: TextEditor) => {
statusBarItem.hide();
};
toDispose.push(workspace.onDidChangeTextDocument(e => handleContentChange(e.document.uri)));
toDispose.push(workspace.onDidCloseTextDocument(d => handleContentChange(d.uri)));
toDispose.push(window.onDidChangeActiveTextEditor(handleActiveEditorChange));
client.sendNotification(SchemaAssociationNotification.type, getSchemaAssociation(context));
});