From 45af59d08494798eec00dc904ca3782abadacf80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20K=C5=82osko?= Date: Thu, 9 Feb 2023 14:08:24 +0100 Subject: [PATCH] Bump Monaco Editor (#1700) --- .../hooks/cell_editor/live_editor/monaco.js | 22 +++++++++++++++---- assets/package-lock.json | 14 ++++++------ assets/package.json | 2 +- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/assets/js/hooks/cell_editor/live_editor/monaco.js b/assets/js/hooks/cell_editor/live_editor/monaco.js index 811272812..c7806cbf0 100644 --- a/assets/js/hooks/cell_editor/live_editor/monaco.js +++ b/assets/js/hooks/cell_editor/live_editor/monaco.js @@ -3,7 +3,7 @@ import { CommandsRegistry } from "monaco-editor/esm/vs/platform/commands/common/ import ElixirOnTypeFormattingEditProvider from "./elixir/on_type_formatting_edit_provider"; import { theme, highContrast } from "./theme"; -import { PieceTreeTextBufferFactory } from "monaco-editor/esm/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder"; +import { PieceTreeTextBufferBuilder } from "monaco-editor/esm/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder"; // Force LF for line ending. // @@ -25,9 +25,23 @@ import { PieceTreeTextBufferFactory } from "monaco-editor/esm/vs/editor/common/m // // [1]: https://github.com/microsoft/vscode/blob/34f184263de048a6283af1d9eb9faab84da4547d/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts#L27-L40 // [2]: https://github.com/microsoft/vscode/issues/127 -if (PieceTreeTextBufferFactory.prototype._getEOL) { - PieceTreeTextBufferFactory.prototype._getEOL = function (defaultEOL) { - return "\n"; +if (PieceTreeTextBufferBuilder.prototype.finish) { + const original = PieceTreeTextBufferBuilder.prototype.finish; + + // We don't have access to the factory class directly, so we override + // the builder, such that we modify the factory object once created + PieceTreeTextBufferBuilder.prototype.finish = function (...args) { + const factory = original.apply(this, args); + + if (factory._getEOL) { + factory._getEOL = function (defaultEOL) { + return "\n"; + }; + } else { + throw new Error("failed to override line endings to LF"); + } + + return factory; }; } else { throw new Error("failed to override line endings to LF"); diff --git a/assets/package-lock.json b/assets/package-lock.json index eac9a9a91..6884bb2ac 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -16,7 +16,7 @@ "hyperlist": "^1.0.0", "jest": "^29.1.2", "mermaid": "^9.1.3", - "monaco-editor": "0.33.0", + "monaco-editor": "^0.35.0", "morphdom": "^2.6.1", "phoenix": "file:../deps/phoenix", "phoenix_html": "file:../deps/phoenix_html", @@ -8261,9 +8261,9 @@ "integrity": "sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ==" }, "node_modules/monaco-editor": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz", - "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==" + "version": "0.35.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.35.0.tgz", + "integrity": "sha512-BJfkAZ0EJ7JgrgWzqjfBNP9hPSS8NlfECEDMEIIiozV2UaPq22yeuOjgbd3TwMh3anH0krWZirXZfn8KUSxiOA==" }, "node_modules/monaco-editor-webpack-plugin": { "version": "7.0.1", @@ -16706,9 +16706,9 @@ "integrity": "sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ==" }, "monaco-editor": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz", - "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==" + "version": "0.35.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.35.0.tgz", + "integrity": "sha512-BJfkAZ0EJ7JgrgWzqjfBNP9hPSS8NlfECEDMEIIiozV2UaPq22yeuOjgbd3TwMh3anH0krWZirXZfn8KUSxiOA==" }, "monaco-editor-webpack-plugin": { "version": "7.0.1", diff --git a/assets/package.json b/assets/package.json index 493fd4edd..40be491be 100644 --- a/assets/package.json +++ b/assets/package.json @@ -20,7 +20,7 @@ "hyperlist": "^1.0.0", "jest": "^29.1.2", "mermaid": "^9.1.3", - "monaco-editor": "0.33.0", + "monaco-editor": "^0.35.0", "morphdom": "^2.6.1", "phoenix": "file:../deps/phoenix", "phoenix_html": "file:../deps/phoenix_html",