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

Merge branch 'main' into ts-4.9

Browse source
This commit is contained in:
Jake Bailey 2023-03-16 12:49:35 -07:00
commit d793f4d6fd
13 changed files with 146 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

2
website/package.json
View file

@ -51,7 +51,7 @@
"ts-loader": "^9.3.1",
"ts-node": "^10.9.1",
"typescript": "^4.9.5",
"webpack": "^5.74.0",
"webpack": "^5.76.0",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.3"

27
website/src/website/data/playground-samples/interacting-with-the-editor/line-and-inline-decorations/sample.js
View file

@ -15,19 +15,16 @@ var editor = monaco.editor.create(document.getElementById("container"), {
language: "javascript",
});
var decorations = editor.deltaDecorations(
[],
[
{
range: new monaco.Range(3, 1, 5, 1),
options: {
isWholeLine: true,
linesDecorationsClassName: "myLineDecoration",
},
var decorations = editor.createDecorationsCollection([
{
range: new monaco.Range(3, 1, 5, 1),
options: {
isWholeLine: true,
linesDecorationsClassName: "myLineDecoration",
},
{
range: new monaco.Range(7, 1, 7, 24),
options: { inlineClassName: "myInlineDecoration" },
},
]
);
},
{
range: new monaco.Range(7, 1, 7, 24),
options: { inlineClassName: "myInlineDecoration" },
},
]);

21
website/src/website/data/playground-samples/interacting-with-the-editor/listening-to-mouse-events/sample.js
View file

@ -17,19 +17,16 @@ var editor = monaco.editor.create(document.getElementById("container"), {
contextmenu: false,
});
var decorations = editor.deltaDecorations(
[],
[
{
range: new monaco.Range(3, 1, 3, 1),
options: {
isWholeLine: true,
className: "myContentClass",
glyphMarginClassName: "myGlyphMarginClass",
},
var decorations = editor.createDecorationsCollection([
{
range: new monaco.Range(3, 1, 3, 1),
options: {
isWholeLine: true,
className: "myContentClass",
glyphMarginClassName: "myGlyphMarginClass",
},
]
);
},
]);
// Add a zone to make hit testing more interesting
var viewZoneId = null;

21
website/src/website/data/playground-samples/interacting-with-the-editor/rendering-glyphs-in-the-margin/sample.js
View file

@ -16,18 +16,15 @@ var editor = monaco.editor.create(document.getElementById("container"), {
glyphMargin: true,
});
var decorations = editor.deltaDecorations(
[],
[
{
range: new monaco.Range(3, 1, 3, 1),
options: {
isWholeLine: true,
className: "myContentClass",
glyphMarginClassName: "myGlyphMarginClass",
},
var decorations = editor.createDecorationsCollection([
{
range: new monaco.Range(3, 1, 3, 1),
options: {
isWholeLine: true,
className: "myContentClass",
glyphMarginClassName: "myGlyphMarginClass",
},
]
);
},
]);
// You can now use `decorations` to change or remove the decoration

8
website/yarn.lock
View file

@ -3367,10 +3367,10 @@ webpack-sources@^3.2.3:
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
webpack@^5.74.0:
version "5.74.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
webpack@^5.76.0:
version "5.76.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.0.tgz#f9fb9fb8c4a7dbdcd0d56a98e56b8a942ee2692c"
integrity sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==
dependencies:
"@types/eslint-scope" "^3.7.3"
"@types/estree" "^0.0.51"