From 1d3d81e67d1afbd2667c616f28ce5680fd4e423e Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Mon, 3 Nov 2025 10:51:44 +0000 Subject: [PATCH] Allow enabling EditContext in CodeMirror (#29114) GitOrigin-RevId: 15d70fd2d5da68d43f441bb0c65ff0cd2d785306 --- services/web/cypress/support/component.ts | 1 - services/web/cypress/support/ct/codemirror.ts | 4 ---- .../source-editor/components/codemirror-editor.tsx | 8 ++++++-- 3 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 services/web/cypress/support/ct/codemirror.ts diff --git a/services/web/cypress/support/component.ts b/services/web/cypress/support/component.ts index f55a83d7f9..abac9c50c8 100644 --- a/services/web/cypress/support/component.ts +++ b/services/web/cypress/support/component.ts @@ -4,7 +4,6 @@ import localesPromise from '@/i18n' import './shared/commands' import './shared/exceptions' import './ct/commands' -import './ct/codemirror' import '../../test/frontend/helpers/bootstrap' beforeEach(function () { diff --git a/services/web/cypress/support/ct/codemirror.ts b/services/web/cypress/support/ct/codemirror.ts deleted file mode 100644 index ab7a692e2f..0000000000 --- a/services/web/cypress/support/ct/codemirror.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { EditorView } from '@codemirror/view' - -// @ts-ignore (disable EditContext-based editing until stable) -EditorView.EDIT_CONTEXT = false diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx index 062652c784..2031a03c2d 100644 --- a/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx +++ b/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx @@ -19,6 +19,7 @@ import { import MathPreviewTooltip from './math-preview-tooltip' import { useToolbarMenuBarEditorCommands } from '@/features/ide-redesign/hooks/use-toolbar-menu-editor-commands' import { useProjectContext } from '@/shared/context/project-context' +import { useFeatureFlag } from '@/shared/context/split-test-context' // TODO: remove this when definitely no longer used export * from './codemirror-context' @@ -34,12 +35,15 @@ function CodeMirrorEditor() { }) const isMounted = useIsMounted() + const editContextEnabled = useFeatureFlag('edit-context') // create the view using the initial state and intercept transactions const viewRef = useRef(null) if (viewRef.current === null) { - // @ts-ignore (disable EditContext-based editing until stable) - EditorView.EDIT_CONTEXT = false + if (!editContextEnabled) { + // @ts-expect-error (disable EditContext-based editing until stable) + EditorView.EDIT_CONTEXT = false + } const view = new EditorView({ state,