daohualiuxiang
/
monaco-editor
mirror of https://github.com/microsoft/monaco-editor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #731 from apalm/patch-1 

Fix `Configure JSON defaults` sample
pull/577/head^2
Alexandru Dima 2018-03-13 18:27:12 +01:00 committed by GitHub
parent 8f28c119c0 00b766829b
commit b900ebbd75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/playground.generated/extending-language-services-configure-json-defaults.html
View File

@ -38,9 +38,13 @@ loadEditor(function() {
// Configures two JSON schemas, with references.
var id = "foo.json";
monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
validate: true,
schemas: [{
uri: "http://myserver/foo-schema.json",
fileMatch: [id],
schema: {
type: "object",
properties: {
@ -54,6 +58,7 @@ monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
}
},{
uri: "http://myserver/bar-schema.json",
fileMatch: [id],
schema: {
type: "object",
properties: {
@ -68,15 +73,18 @@ monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
var jsonCode = [
'{',
' "$schema": "http://myserver/foo-schema.json"',
' "p1": "v3",',
' "p2": false',
"}"
].join('\n');
var model = monaco.editor.createModel(jsonCode, "json", id);
monaco.editor.create(document.getElementById("container"), {
value: jsonCode,
language: "json"
model: model
});
/*----------------------------------------SAMPLE CSS END*/
});
</script>

15
website/playground/new-samples/extending-language-services/configure-json-defaults/sample.js
View File

@ -1,8 +1,12 @@
// Configures two JSON schemas, with references.
var id = "foo.json";
monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
validate: true,
schemas: [{
uri: "http://myserver/foo-schema.json",
fileMatch: [id],
schema: {
type: "object",
properties: {
@ -16,6 +20,7 @@ monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
}
},{
uri: "http://myserver/bar-schema.json",
fileMatch: [id],
schema: {
type: "object",
properties: {
@ -30,11 +35,13 @@ monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
var jsonCode = [
'{',
' "$schema": "http://myserver/foo-schema.json"',
' "p1": "v3",',
' "p2": false',
"}"
].join('\n');
var model = monaco.editor.createModel(jsonCode, "json", id);
monaco.editor.create(document.getElementById("container"), {
value: jsonCode,
language: "json"
});
model: model
});