Merge pull request #731 from apalm/patch-1

Fix `Configure JSON defaults` sample
microsoft · Mar 13, 2018 · b900ebb · b900ebb
2 parents 8f28c11 + 00b7668
commit b900ebb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/test/playground.generated/extending-language-services-configure-json-defaults.html b/test/playground.generated/extending-language-services-configure-json-defaults.html
@@ -38,9 +38,13 @@
 
 // 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 @@
         }
     },{
         uri: "http://myserver/bar-schema.json",
+        fileMatch: [id],
         schema: {
             type: "object",
             properties: {
@@ -68,15 +73,18 @@
 
 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>

diff --git a/website/playground/new-samples/extending-language-services/configure-json-defaults/sample.js b/website/playground/new-samples/extending-language-services/configure-json-defaults/sample.js
@@ -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
+});