Skip to content

Commit ffdc923

Browse files
committed
Fix paths
1 parent 373971e commit ffdc923

File tree

3 files changed

+25
-29
lines changed

3 files changed

+25
-29
lines changed

packages/app/src/app/vscode/metadata.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const METADATA = {
3030
modulePrefix: 'vs/language/css',
3131
paths: {
3232
src: process.env.VSCODE
33-
? '/monaco-css/release/dev'
33+
? '/vscode-editor/node_modules/monaco-css/release/dev'
3434
: '/public/vscode1/vs/language/css',
3535
'npm/dev': 'node_modules/monaco-css/release/dev',
3636
'npm/min': '/public/vscode1/vs/language/css',
@@ -43,7 +43,7 @@ const METADATA = {
4343
modulePrefix: 'vs/language/json',
4444
paths: {
4545
src: process.env.VSCODE
46-
? '/monaco-json/release/dev'
46+
? '/vscode-editor/node_modules/monaco-json/release/dev'
4747
: '/public/vscode1/vs/language/json',
4848
'npm/dev': 'node_modules/monaco-json/release/dev',
4949
'npm/min': '/public/vscode1/vs/language/json',
@@ -57,7 +57,7 @@ const METADATA = {
5757
thirdPartyNotices: 'node_modules/monaco-html/ThirdPartyNotices.txt',
5858
paths: {
5959
src: process.env.VSCODE
60-
? '/monaco-html/release/dev'
60+
? '/vscode-editor/node_modules/monaco-html/release/dev'
6161
: '/public/vscode1/vs/language/html',
6262
'npm/dev': 'node_modules/monaco-html/release/dev',
6363
'npm/min': '/public/vscode1/vs/language/html',
@@ -72,9 +72,9 @@ const METADATA = {
7272
paths: {
7373
src: process.env.VSCODE
7474
? '/monaco-languages/release/dev'
75-
: '/public/vscode1/vs/language/basic-languages',
75+
: '/public/vscode1/vs/basic-languages',
7676
'npm/dev': '../monaco-languages/release/dev',
77-
'npm/min': '/public/vscode1/vs/language/basic-languages',
77+
'npm/min': '/public/vscode1/vs/basic-languages',
7878
esm: 'node_modules/monaco-languages/release/esm',
7979
},
8080
},

standalone-packages/monaco-editor/test/playground.generated/extending-language-services-configure-json-defaults.html

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,53 +38,49 @@
3838

3939
// Configures two JSON schemas, with references.
4040

41-
var id = "foo.json";
41+
var jsonCode = [
42+
'{',
43+
' "p1": "v3",',
44+
' "p2": false',
45+
"}"
46+
].join('\n');
47+
var modelUri = monaco.Uri.parse("a://b/foo.json"); // a made up unique URI for our model
48+
var model = monaco.editor.createModel(jsonCode, "json", modelUri);
4249

50+
// configure the JSON language support with schemas and schema associations
4351
monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
44-
validate: true,
45-
schemas: [{
46-
uri: "http://myserver/foo-schema.json",
47-
fileMatch: [id],
52+
validate: true,
53+
schemas: [{
54+
uri: "http://myserver/foo-schema.json", // id of the first schema
55+
fileMatch: [modelUri.toString()], // associate with our model
4856
schema: {
4957
type: "object",
5058
properties: {
5159
p1: {
52-
enum: [ "v1", "v2"]
60+
enum: ["v1", "v2"]
5361
},
5462
p2: {
55-
$ref: "http://myserver/bar-schema.json"
63+
$ref: "http://myserver/bar-schema.json" // reference the second schema
5664
}
5765
}
5866
}
59-
},{
60-
uri: "http://myserver/bar-schema.json",
61-
fileMatch: [id],
67+
}, {
68+
uri: "http://myserver/bar-schema.json", // id of the first schema
6269
schema: {
6370
type: "object",
6471
properties: {
6572
q1: {
66-
enum: [ "x1", "x2"]
73+
enum: ["x1", "x2"]
6774
}
6875
}
6976
}
7077
}]
7178
});
7279

73-
74-
var jsonCode = [
75-
'{',
76-
' "p1": "v3",',
77-
' "p2": false',
78-
"}"
79-
].join('\n');
80-
81-
var model = monaco.editor.createModel(jsonCode, "json", id);
82-
8380
monaco.editor.create(document.getElementById("container"), {
84-
model: model
81+
model: model
8582
});
8683

87-
8884
/*----------------------------------------SAMPLE CSS END*/
8985
});
9086
</script>

standalone-packages/monaco-editor/test/samples-all.generated.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)