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

add DiagnosticsOptions.comments and DiagnosticsOptions.trailingCommas

Browse source
This commit is contained in:
Martin Aeschlimann 2021-05-12 18:26:01 +02:00
parent 5bb24cf2ac
commit b80471a6bf
No known key found for this signature in database
GPG key ID: 2609A01E695523E3
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -31,8 +31,8 @@
"pretty-quick": "^3.1.0", "pretty-quick": "^3.1.0",
"requirejs": "^2.3.6", "requirejs": "^2.3.6",
"terser": "^5.6.0", "terser": "^5.6.0",
"typescript": "4.2.3", "typescript": "4.2.4",
"vscode-json-languageservice": "4.0.2", "vscode-json-languageservice": "4.1.4",
"vscode-uri": "3.0.2" "vscode-uri": "3.0.2"
}, },
"husky": { "husky": {

21
src/monaco.contribution.ts
View file

@ -10,11 +10,13 @@ import { Emitter, IEvent, languages } from './fillers/monaco-editor-core';
export interface DiagnosticsOptions { export interface DiagnosticsOptions {
/** /**
* If set, the validator will be enabled and perform syntax validation as well as schema based validation. * If set, the validator will be enabled and perform syntax and validation schema based validation,
* unless `DiagnosticsOptions.schemaValidation` is set to `ignore`.
*/ */
readonly validate?: boolean; readonly validate?: boolean;
/** /**
* If set, comments are tolerated. If set to false, syntax errors will be emitted for comments. * If set, comments are tolerated. If set to false, syntax errors will be emitted for comments.
* `DiagnosticsOptions.allowComments` will override this setting.
*/ */
readonly allowComments?: boolean; readonly allowComments?: boolean;
/** /**
@ -26,7 +28,10 @@ export interface DiagnosticsOptions {
*/ */
readonly uri: string; readonly uri: string;
/** /**
* A list of file names that are associated to the schema. The '*' wildcard can be used. For example '*.schema.json', 'package.json' * A list of glob patterns that describe for which file URIs the JSON schema will be used.
* '*' and '**' wildcards are supported. Exclusion patterns start with '!'.
* For example '*.schema.json', 'package.json', '!foo*.schema.json', 'foo/**\/BADRESP.json'.
* A match succeeds when there is at least one pattern matching and last matching pattern does not start with '!'.
*/ */
readonly fileMatch?: string[]; readonly fileMatch?: string[];
/** /**
@ -46,6 +51,14 @@ export interface DiagnosticsOptions {
* The severity of problems that occurred when resolving and loading schemas. If set to 'ignore', schema resolving problems are not reported. If not set, 'warning' is used. * The severity of problems that occurred when resolving and loading schemas. If set to 'ignore', schema resolving problems are not reported. If not set, 'warning' is used.
*/ */
readonly schemaRequest?: SeverityLevel; readonly schemaRequest?: SeverityLevel;
/**
* The severity of reported trailing commas. If not set, trailing commas will be reported as errors.
*/
readonly trailingCommas?: SeverityLevel;
/**
* The severity of reported comments. If not set, 'DiagnosticsOptions.allowComments' defines whether comments are ignored or reported as errors.
*/
readonly comments?: SeverityLevel;
} }
export declare type SeverityLevel = 'error' | 'warning' | 'ignore'; export declare type SeverityLevel = 'error' | 'warning' | 'ignore';
@ -160,7 +173,9 @@ const diagnosticDefault: Required<DiagnosticsOptions> = {
schemas: [], schemas: [],
enableSchemaRequest: false, enableSchemaRequest: false,
schemaRequest: 'warning', schemaRequest: 'warning',
schemaValidation: 'warning' schemaValidation: 'warning',
comments: 'error',
trailingCommas: 'error'
}; };
const modeConfigurationDefault: Required<ModeConfiguration> = { const modeConfigurationDefault: Required<ModeConfiguration> = {