@atlaskit/editor-plugin-code-block-advanced 7.1.13 → 7.1.14

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-code-block-advanced
 
+## 7.1.14
+
+### Patch Changes
+
+- [`0dc0791c6e745`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0dc0791c6e745) -
+  Fix additional CRLF issues with advanced codeblocks. Behind
+  platform_editor_fix_advanced_codeblocks_crlf_patch gate.
+- Updated dependencies
+
 ## 7.1.13
 
 ### Patch Changes

package/README.md

@@ -1 +1,53 @@
-# Editor plugin code block-advanced
+# Editor Plugin Code Block Advanced
+
+## Overview
+
+This package provides an advanced code block plugin for `@atlaskit/editor-core` that extends the basic code block functionality with a CodeMirror editor integration. It enables rich editing features for code blocks within Atlassian editors.
+
+## Key features
+
+- **CodeMirror integration**: Uses CodeMirror 6 for advanced code editing capabilities within the editor
+- **Syntax highlighting**: Supports syntax highlighting for multiple programming languages
+- **Extensible language support**: Includes support for various languages such as JavaScript, Python, Java, GraphQL, Elixir, Handlebars, ActionScript, and more
+- **Code folding**: Optional code folding functionality via the `allowCodeFolding` configuration option
+- **Custom extensions**: Ability to inject custom CodeMirror extensions through configuration
+- **Advanced editing features**: Includes features like autocomplete, bracket closing, line separation, and keyboard shortcuts
+
+## Install
+---
+- **Install** - *yarn add @atlaskit/editor-plugin-code-block-advanced*
+- **npm** - [@atlaskit/editor-plugin-code-block-advanced](https://www.npmjs.com/package/@atlaskit/editor-plugin-code-block-advanced)
+- **Source** - [Bitbucket](https://bitbucket.org/atlassian/atlassian-frontend/src/master/packages/editor/editor-plugin-code-block-advanced)
+- **Bundle** - [unpkg.com](https://unpkg.com/@atlaskit/editor-plugin-code-block-advanced/dist/)
+
+## Usage
+
+---
+**Internal use only**
+
+`@atlaskit/editor-plugin-code-block-advanced` is intended for internal use by the `@atlaskit/editor-core` and as a plugin dependency of the Editor within your product.
+
+Direct use of this component is not supported. Please see [Atlaskit - Editor plugin code block advanced](https://atlaskit.atlassian.com/packages/editor/editor-plugin-code-block-advanced) for documentation and examples for this package.
+
+### Configuration options
+
+- `allowCodeFolding` (optional, boolean): Enable code folding in code blocks. Defaults to `false`.
+- `extensions` (optional, Extension[]): Array of custom CodeMirror extensions to inject into the code editor.
+
+### Dependencies
+
+This plugin requires the following peer dependencies:
+
+- `@atlaskit/editor-common`
+- `react` (^18.2.0)
+- `react-intl-next`
+
+It also depends on the `@atlaskit/editor-plugin-code-block` plugin.
+
+## Support
+
+For Atlassian internal users, visit the Slack channel [#help-editor](https://atlassian.slack.com/archives/CFG3PSQ9E) for support or visit [go/editor-help](https://go/editor-help) to submit a bug.
+
+## License
+
+Please see [Atlassian Frontend - License](https://hello.atlassian.net/wiki/spaces/AF/pages/2589099144/Documentation#License) for more licensing information.

package/dist/cjs/nodeviews/codeBlockAdvanced.js

@@ -129,7 +129,9 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
         getNode: function getNode() {
           return _this.node;
         }
-      })] : [], (0, _lineSeparator.lineSeparatorExtension)()])
+      })] : [],
+      // With platform_editor_fix_advanced_codeblocks_crlf_patch the lineSeparatorExtension is not needed
+      (0, _expValEquals.expValEquals)('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true) ? [] : [(0, _lineSeparator.lineSeparatorExtension)()]])
     });
     if (contentFormatSharedState) {
       this.unsubscribeContentFormat = contentFormatSharedState.onChange(function (_ref) {

package/dist/cjs/nodeviews/codemirrorSync/syncCMWithPM.js

@@ -5,6 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.syncCMWithPM = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+/**
+ * Returns the extra offset to add when mapping a CodeMirror position to ProseMirror
+ * when the content may contain \r\n (CRLF). Each \r\n in the text before the given
+ * position counts as one extra character in PM.
+ */
+function crlfAdjustment(text, cmPos) {
+  var cmIdx = 0;
+  var pmIdx = 0;
+  while (pmIdx < text.length && cmIdx < cmPos) {
+    if (text[pmIdx] === '\r' && text[pmIdx + 1] === '\n') {
+      pmIdx++;
+    }
+    pmIdx++;
+    cmIdx++;
+  }
+  return pmIdx - cmIdx;
+}
+
 /**
  *
  * Synchronises the CodeMirror update changes with the Prosemirror editor
@@ -14,9 +33,11 @@ var _state = require("@atlaskit/editor-prosemirror/state");
  * @param props.offset number - position where the code block starts in prosemirror
  */
 var syncCMWithPM = exports.syncCMWithPM = function syncCMWithPM(_ref) {
+  var _view$state$doc$nodeA, _view$state$doc$nodeA2;
   var view = _ref.view,
     update = _ref.update,
     offset = _ref.offset;
+  var codeBlockText = (_view$state$doc$nodeA = (_view$state$doc$nodeA2 = view.state.doc.nodeAt(offset)) === null || _view$state$doc$nodeA2 === void 0 ? void 0 : _view$state$doc$nodeA2.textContent) !== null && _view$state$doc$nodeA !== void 0 ? _view$state$doc$nodeA : '';
   var main = update.state.selection.main;
   var selFrom = offset + main.from;
   var selTo = offset + main.to;
@@ -24,10 +45,23 @@ var syncCMWithPM = exports.syncCMWithPM = function syncCMWithPM(_ref) {
   if (update.docChanged || pmSel.from !== selFrom || pmSel.to !== selTo) {
     var tr = view.state.tr;
     update.changes.iterChanges(function (fromA, toA, fromB, toB, text) {
-      if (text.length) {
-        tr.replaceWith(offset + fromA, offset + toA, view.state.schema.text(text.toString()));
+      if ((0, _expValEquals.expValEquals)('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true)) {
+        var adjFrom = crlfAdjustment(codeBlockText, fromA);
+        // If the from and to are the same, we don't need to run adjustment again
+        var adjTo = fromA === toA ? adjFrom : crlfAdjustment(codeBlockText, toA);
+        var pmFrom = offset + fromA + adjFrom;
+        var pmTo = offset + toA + adjTo;
+        if (text.length) {
+          tr.replaceWith(pmFrom, pmTo, view.state.schema.text(text.toString()));
+        } else {
+          tr.delete(pmFrom, pmTo);
+        }
       } else {
-        tr.delete(offset + fromA, offset + toA);
+        if (text.length) {
+          tr.replaceWith(offset + fromA, offset + toA, view.state.schema.text(text.toString()));
+        } else {
+          tr.delete(offset + fromA, offset + toA);
+        }
       }
       offset += toB - fromB - (toA - fromA);
     });

package/dist/cjs/nodeviews/codemirrorSync/updateCMSelection.js

@@ -4,31 +4,65 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getCMSelectionChanges = void 0;
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 /**
  *
  * Compares the updated text with the current to determine the transaction to fire
  * in the CodeMirror editor.
  *
  * @param curText string - the current CodeMirror text
- * @param newText string - the new CodeMirror text
+ * @param newText string - the new ProseMirror text
  * @returns The changes or undefined if no change
  */
+
+var N_LINE_FEED = '\n'.charCodeAt(0);
+var R_LINE_FEED = '\r'.charCodeAt(0);
+
+/**
+ * Example of CRLF differences:
+ * newText: 'abc\r\ndef\r\nghi'
+ * curText: 'abc\ndef\nghi'
+ */
 var getCMSelectionChanges = exports.getCMSelectionChanges = function getCMSelectionChanges(curText, newText) {
   if (newText !== curText) {
+    var curStart = 0,
+      newStart = 0;
     var start = 0,
       curEnd = curText.length,
       newEnd = newText.length;
-    while (start < curEnd && curText.charCodeAt(start) === newText.charCodeAt(start)) {
-      ++start;
-    }
-    while (curEnd > start && newEnd > start && curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1)) {
-      curEnd--;
-      newEnd--;
+    if ((0, _expValEquals.expValEquals)('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true)) {
+      while (curStart < curEnd && (curText.charCodeAt(curStart) === newText.charCodeAt(newStart) || newText.charCodeAt(newStart) === R_LINE_FEED && curText.charCodeAt(curStart) === N_LINE_FEED)) {
+        if (newText.charCodeAt(newStart) === R_LINE_FEED && curText.charCodeAt(curStart) === N_LINE_FEED && newText.charCodeAt(newStart + 1) === N_LINE_FEED) {
+          newStart++;
+        }
+        curStart++;
+        newStart++;
+      }
+      while (curEnd > curStart && newEnd > newStart && (curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1) || newText.charCodeAt(newEnd - 1) === N_LINE_FEED && curText.charCodeAt(curEnd - 1) === N_LINE_FEED)) {
+        if (newText.charCodeAt(newEnd - 1) === N_LINE_FEED && curText.charCodeAt(curEnd - 1) === N_LINE_FEED && newText.charCodeAt(newEnd - 2) === R_LINE_FEED) {
+          newEnd--;
+        }
+        curEnd--;
+        newEnd--;
+      }
+      return {
+        from: curStart,
+        to: curEnd,
+        insert: newText.slice(newStart, newEnd)
+      };
+    } else {
+      while (start < curEnd && curText.charCodeAt(start) === newText.charCodeAt(start)) {
+        ++start;
+      }
+      while (curEnd > start && newEnd > start && curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1)) {
+        curEnd--;
+        newEnd--;
+      }
+      return {
+        from: start,
+        to: curEnd,
+        insert: newText.slice(start, newEnd)
+      };
     }
-    return {
-      from: start,
-      to: curEnd,
-      insert: newText.slice(start, newEnd)
-    };
   }
 };

package/dist/es2019/nodeviews/codeBlockAdvanced.js

@@ -101,7 +101,9 @@ class CodeBlockAdvancedNodeView {
       }), config.allowCodeFolding ? [foldGutterExtension({
         selectNode,
         getNode: () => this.node
-      })] : [], lineSeparatorExtension()]
+      })] : [],
+      // With platform_editor_fix_advanced_codeblocks_crlf_patch the lineSeparatorExtension is not needed
+      expValEquals('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true) ? [] : [lineSeparatorExtension()]]
     });
     if (contentFormatSharedState) {
       this.unsubscribeContentFormat = contentFormatSharedState.onChange(({

package/dist/es2019/nodeviews/codemirrorSync/syncCMWithPM.js

@@ -1,4 +1,23 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+/**
+ * Returns the extra offset to add when mapping a CodeMirror position to ProseMirror
+ * when the content may contain \r\n (CRLF). Each \r\n in the text before the given
+ * position counts as one extra character in PM.
+ */
+function crlfAdjustment(text, cmPos) {
+  let cmIdx = 0;
+  let pmIdx = 0;
+  while (pmIdx < text.length && cmIdx < cmPos) {
+    if (text[pmIdx] === '\r' && text[pmIdx + 1] === '\n') {
+      pmIdx++;
+    }
+    pmIdx++;
+    cmIdx++;
+  }
+  return pmIdx - cmIdx;
+}
+
 /**
  *
  * Synchronises the CodeMirror update changes with the Prosemirror editor
@@ -12,6 +31,8 @@ export const syncCMWithPM = ({
   update,
   offset
 }) => {
+  var _view$state$doc$nodeA, _view$state$doc$nodeA2;
+  const codeBlockText = (_view$state$doc$nodeA = (_view$state$doc$nodeA2 = view.state.doc.nodeAt(offset)) === null || _view$state$doc$nodeA2 === void 0 ? void 0 : _view$state$doc$nodeA2.textContent) !== null && _view$state$doc$nodeA !== void 0 ? _view$state$doc$nodeA : '';
   const {
     main
   } = update.state.selection;
@@ -21,10 +42,23 @@ export const syncCMWithPM = ({
   if (update.docChanged || pmSel.from !== selFrom || pmSel.to !== selTo) {
     const tr = view.state.tr;
     update.changes.iterChanges((fromA, toA, fromB, toB, text) => {
-      if (text.length) {
-        tr.replaceWith(offset + fromA, offset + toA, view.state.schema.text(text.toString()));
+      if (expValEquals('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true)) {
+        const adjFrom = crlfAdjustment(codeBlockText, fromA);
+        // If the from and to are the same, we don't need to run adjustment again
+        const adjTo = fromA === toA ? adjFrom : crlfAdjustment(codeBlockText, toA);
+        const pmFrom = offset + fromA + adjFrom;
+        const pmTo = offset + toA + adjTo;
+        if (text.length) {
+          tr.replaceWith(pmFrom, pmTo, view.state.schema.text(text.toString()));
+        } else {
+          tr.delete(pmFrom, pmTo);
+        }
       } else {
-        tr.delete(offset + fromA, offset + toA);
+        if (text.length) {
+          tr.replaceWith(offset + fromA, offset + toA, view.state.schema.text(text.toString()));
+        } else {
+          tr.delete(offset + fromA, offset + toA);
+        }
       }
       offset += toB - fromB - (toA - fromA);
     });

package/dist/es2019/nodeviews/codemirrorSync/updateCMSelection.js

@@ -1,28 +1,62 @@
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 /**
  *
  * Compares the updated text with the current to determine the transaction to fire
  * in the CodeMirror editor.
  *
  * @param curText string - the current CodeMirror text
- * @param newText string - the new CodeMirror text
+ * @param newText string - the new ProseMirror text
  * @returns The changes or undefined if no change
  */
+
+const N_LINE_FEED = '\n'.charCodeAt(0);
+const R_LINE_FEED = '\r'.charCodeAt(0);
+
+/**
+ * Example of CRLF differences:
+ * newText: 'abc\r\ndef\r\nghi'
+ * curText: 'abc\ndef\nghi'
+ */
 export const getCMSelectionChanges = (curText, newText) => {
   if (newText !== curText) {
+    let curStart = 0,
+      newStart = 0;
     let start = 0,
       curEnd = curText.length,
       newEnd = newText.length;
-    while (start < curEnd && curText.charCodeAt(start) === newText.charCodeAt(start)) {
-      ++start;
-    }
-    while (curEnd > start && newEnd > start && curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1)) {
-      curEnd--;
-      newEnd--;
+    if (expValEquals('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true)) {
+      while (curStart < curEnd && (curText.charCodeAt(curStart) === newText.charCodeAt(newStart) || newText.charCodeAt(newStart) === R_LINE_FEED && curText.charCodeAt(curStart) === N_LINE_FEED)) {
+        if (newText.charCodeAt(newStart) === R_LINE_FEED && curText.charCodeAt(curStart) === N_LINE_FEED && newText.charCodeAt(newStart + 1) === N_LINE_FEED) {
+          newStart++;
+        }
+        curStart++;
+        newStart++;
+      }
+      while (curEnd > curStart && newEnd > newStart && (curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1) || newText.charCodeAt(newEnd - 1) === N_LINE_FEED && curText.charCodeAt(curEnd - 1) === N_LINE_FEED)) {
+        if (newText.charCodeAt(newEnd - 1) === N_LINE_FEED && curText.charCodeAt(curEnd - 1) === N_LINE_FEED && newText.charCodeAt(newEnd - 2) === R_LINE_FEED) {
+          newEnd--;
+        }
+        curEnd--;
+        newEnd--;
+      }
+      return {
+        from: curStart,
+        to: curEnd,
+        insert: newText.slice(newStart, newEnd)
+      };
+    } else {
+      while (start < curEnd && curText.charCodeAt(start) === newText.charCodeAt(start)) {
+        ++start;
+      }
+      while (curEnd > start && newEnd > start && curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1)) {
+        curEnd--;
+        newEnd--;
+      }
+      return {
+        from: start,
+        to: curEnd,
+        insert: newText.slice(start, newEnd)
+      };
     }
-    return {
-      from: start,
-      to: curEnd,
-      insert: newText.slice(start, newEnd)
-    };
   }
 };

package/dist/esm/nodeviews/codeBlockAdvanced.js

@@ -123,7 +123,9 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
         getNode: function getNode() {
           return _this.node;
         }
-      })] : [], lineSeparatorExtension()])
+      })] : [],
+      // With platform_editor_fix_advanced_codeblocks_crlf_patch the lineSeparatorExtension is not needed
+      expValEquals('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true) ? [] : [lineSeparatorExtension()]])
     });
     if (contentFormatSharedState) {
       this.unsubscribeContentFormat = contentFormatSharedState.onChange(function (_ref) {

package/dist/esm/nodeviews/codemirrorSync/syncCMWithPM.js

@@ -1,4 +1,23 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+/**
+ * Returns the extra offset to add when mapping a CodeMirror position to ProseMirror
+ * when the content may contain \r\n (CRLF). Each \r\n in the text before the given
+ * position counts as one extra character in PM.
+ */
+function crlfAdjustment(text, cmPos) {
+  var cmIdx = 0;
+  var pmIdx = 0;
+  while (pmIdx < text.length && cmIdx < cmPos) {
+    if (text[pmIdx] === '\r' && text[pmIdx + 1] === '\n') {
+      pmIdx++;
+    }
+    pmIdx++;
+    cmIdx++;
+  }
+  return pmIdx - cmIdx;
+}
+
 /**
  *
  * Synchronises the CodeMirror update changes with the Prosemirror editor
@@ -8,9 +27,11 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
  * @param props.offset number - position where the code block starts in prosemirror
  */
 export var syncCMWithPM = function syncCMWithPM(_ref) {
+  var _view$state$doc$nodeA, _view$state$doc$nodeA2;
   var view = _ref.view,
     update = _ref.update,
     offset = _ref.offset;
+  var codeBlockText = (_view$state$doc$nodeA = (_view$state$doc$nodeA2 = view.state.doc.nodeAt(offset)) === null || _view$state$doc$nodeA2 === void 0 ? void 0 : _view$state$doc$nodeA2.textContent) !== null && _view$state$doc$nodeA !== void 0 ? _view$state$doc$nodeA : '';
   var main = update.state.selection.main;
   var selFrom = offset + main.from;
   var selTo = offset + main.to;
@@ -18,10 +39,23 @@ export var syncCMWithPM = function syncCMWithPM(_ref) {
   if (update.docChanged || pmSel.from !== selFrom || pmSel.to !== selTo) {
     var tr = view.state.tr;
     update.changes.iterChanges(function (fromA, toA, fromB, toB, text) {
-      if (text.length) {
-        tr.replaceWith(offset + fromA, offset + toA, view.state.schema.text(text.toString()));
+      if (expValEquals('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true)) {
+        var adjFrom = crlfAdjustment(codeBlockText, fromA);
+        // If the from and to are the same, we don't need to run adjustment again
+        var adjTo = fromA === toA ? adjFrom : crlfAdjustment(codeBlockText, toA);
+        var pmFrom = offset + fromA + adjFrom;
+        var pmTo = offset + toA + adjTo;
+        if (text.length) {
+          tr.replaceWith(pmFrom, pmTo, view.state.schema.text(text.toString()));
+        } else {
+          tr.delete(pmFrom, pmTo);
+        }
       } else {
-        tr.delete(offset + fromA, offset + toA);
+        if (text.length) {
+          tr.replaceWith(offset + fromA, offset + toA, view.state.schema.text(text.toString()));
+        } else {
+          tr.delete(offset + fromA, offset + toA);
+        }
       }
       offset += toB - fromB - (toA - fromA);
     });

package/dist/esm/nodeviews/codemirrorSync/updateCMSelection.js

@@ -1,28 +1,62 @@
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 /**
  *
  * Compares the updated text with the current to determine the transaction to fire
  * in the CodeMirror editor.
  *
  * @param curText string - the current CodeMirror text
- * @param newText string - the new CodeMirror text
+ * @param newText string - the new ProseMirror text
  * @returns The changes or undefined if no change
  */
+
+var N_LINE_FEED = '\n'.charCodeAt(0);
+var R_LINE_FEED = '\r'.charCodeAt(0);
+
+/**
+ * Example of CRLF differences:
+ * newText: 'abc\r\ndef\r\nghi'
+ * curText: 'abc\ndef\nghi'
+ */
 export var getCMSelectionChanges = function getCMSelectionChanges(curText, newText) {
   if (newText !== curText) {
+    var curStart = 0,
+      newStart = 0;
     var start = 0,
       curEnd = curText.length,
       newEnd = newText.length;
-    while (start < curEnd && curText.charCodeAt(start) === newText.charCodeAt(start)) {
-      ++start;
-    }
-    while (curEnd > start && newEnd > start && curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1)) {
-      curEnd--;
-      newEnd--;
+    if (expValEquals('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true)) {
+      while (curStart < curEnd && (curText.charCodeAt(curStart) === newText.charCodeAt(newStart) || newText.charCodeAt(newStart) === R_LINE_FEED && curText.charCodeAt(curStart) === N_LINE_FEED)) {
+        if (newText.charCodeAt(newStart) === R_LINE_FEED && curText.charCodeAt(curStart) === N_LINE_FEED && newText.charCodeAt(newStart + 1) === N_LINE_FEED) {
+          newStart++;
+        }
+        curStart++;
+        newStart++;
+      }
+      while (curEnd > curStart && newEnd > newStart && (curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1) || newText.charCodeAt(newEnd - 1) === N_LINE_FEED && curText.charCodeAt(curEnd - 1) === N_LINE_FEED)) {
+        if (newText.charCodeAt(newEnd - 1) === N_LINE_FEED && curText.charCodeAt(curEnd - 1) === N_LINE_FEED && newText.charCodeAt(newEnd - 2) === R_LINE_FEED) {
+          newEnd--;
+        }
+        curEnd--;
+        newEnd--;
+      }
+      return {
+        from: curStart,
+        to: curEnd,
+        insert: newText.slice(newStart, newEnd)
+      };
+    } else {
+      while (start < curEnd && curText.charCodeAt(start) === newText.charCodeAt(start)) {
+        ++start;
+      }
+      while (curEnd > start && newEnd > start && curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1)) {
+        curEnd--;
+        newEnd--;
+      }
+      return {
+        from: start,
+        to: curEnd,
+        insert: newText.slice(start, newEnd)
+      };
     }
-    return {
-      from: start,
-      to: curEnd,
-      insert: newText.slice(start, newEnd)
-    };
   }
 };

package/dist/types/nodeviews/codemirrorSync/updateCMSelection.d.ts

@@ -1,11 +1,7 @@
 import type { ChangeSpec } from '@codemirror/state';
 /**
- *
- * Compares the updated text with the current to determine the transaction to fire
- * in the CodeMirror editor.
- *
- * @param curText string - the current CodeMirror text
- * @param newText string - the new CodeMirror text
- * @returns The changes or undefined if no change
+ * Example of CRLF differences:
+ * newText: 'abc\r\ndef\r\nghi'
+ * curText: 'abc\ndef\nghi'
  */
 export declare const getCMSelectionChanges: (curText: string, newText: string) => ChangeSpec | undefined;

package/dist/types-ts4.5/nodeviews/codemirrorSync/updateCMSelection.d.ts

@@ -1,11 +1,7 @@
 import type { ChangeSpec } from '@codemirror/state';
 /**
- *
- * Compares the updated text with the current to determine the transaction to fire
- * in the CodeMirror editor.
- *
- * @param curText string - the current CodeMirror text
- * @param newText string - the new CodeMirror text
- * @returns The changes or undefined if no change
+ * Example of CRLF differences:
+ * newText: 'abc\r\ndef\r\nghi'
+ * curText: 'abc\ndef\nghi'
  */
 export declare const getCMSelectionChanges: (curText: string, newText: string) => ChangeSpec | undefined;

package/docs/0-intro.tsx

@@ -33,17 +33,25 @@ The \`dependencies\`, \`configuration\`, \`state\`, \`actions\`, and \`commands\
 below:
 
 ${code`
-type CodeBlockAdvancedPlugin = NextEditorPlugin<
+export type CodeBlockAdvancedPlugin = NextEditorPlugin<
 	'codeBlockAdvanced',
 	{
-		dependencies: [CodeBlockPlugin];
-		pluginConfiguration:
-			| {
-					extensions?: Extension[];
-			  }
-			| undefined;
+		dependencies: [
+			OptionalPlugin<CodeBlockPlugin>,
+			SelectionPlugin,
+			OptionalPlugin<EditorDisabledPlugin>,
+			OptionalPlugin<SelectionMarkerPlugin>,
+			OptionalPlugin<FindReplacePlugin>,
+			OptionalPlugin<ContentFormatPlugin>,
+		];
+		pluginConfiguration: CodeBlockAdvancedPluginOptions | undefined;
 	}
 >;
+
+export type CodeBlockAdvancedPluginOptions = {
+	allowCodeFolding?: boolean;
+	extensions?: Extension[];
+};
 `}
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block-advanced",
-	"version": "7.1.13",
+	"version": "7.1.14",
 	"description": "CodeBlockAdvanced plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^25.0.0",
+		"@atlaskit/tmp-editor-statsig": "^25.6.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@codemirror/autocomplete": "6.18.4",
@@ -54,7 +54,7 @@
 		"codemirror-lang-elixir": "4.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.12.0",
+		"@atlaskit/editor-common": "^111.15.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},

package/src/nodeviews/codeBlockAdvanced.ts

@@ -183,7 +183,10 @@ class CodeBlockAdvancedNodeView implements NodeView {
 				config.allowCodeFolding
 					? [foldGutterExtension({ selectNode, getNode: () => this.node })]
 					: [],
-				lineSeparatorExtension(),
+				// With platform_editor_fix_advanced_codeblocks_crlf_patch the lineSeparatorExtension is not needed
+				expValEquals('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true)
+					? []
+					: [lineSeparatorExtension()],
 			],
 		});
 

package/src/nodeviews/codemirrorSync/syncCMWithPM.ts

@@ -2,6 +2,7 @@ import { type ViewUpdate } from '@codemirror/view';
 
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { type EditorView } from '@atlaskit/editor-prosemirror/view';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 interface Props {
 	offset: number;
@@ -9,6 +10,24 @@ interface Props {
 	view: EditorView;
 }
 
+/**
+ * Returns the extra offset to add when mapping a CodeMirror position to ProseMirror
+ * when the content may contain \r\n (CRLF). Each \r\n in the text before the given
+ * position counts as one extra character in PM.
+ */
+function crlfAdjustment(text: string, cmPos: number): number {
+	let cmIdx = 0;
+	let pmIdx = 0;
+	while (pmIdx < text.length && cmIdx < cmPos) {
+		if (text[pmIdx] === '\r' && text[pmIdx + 1] === '\n') {
+			pmIdx++;
+		}
+		pmIdx++;
+		cmIdx++;
+	}
+	return pmIdx - cmIdx;
+}
+
 /**
  *
  * Synchronises the CodeMirror update changes with the Prosemirror editor
@@ -18,6 +37,7 @@ interface Props {
  * @param props.offset number - position where the code block starts in prosemirror
  */
 export const syncCMWithPM = ({ view, update, offset }: Props): void => {
+	const codeBlockText = view.state.doc.nodeAt(offset)?.textContent ?? '';
 	const { main } = update.state.selection;
 	const selFrom = offset + main.from;
 	const selTo = offset + main.to;
@@ -26,10 +46,23 @@ export const syncCMWithPM = ({ view, update, offset }: Props): void => {
 	if (update.docChanged || pmSel.from !== selFrom || pmSel.to !== selTo) {
 		const tr = view.state.tr;
 		update.changes.iterChanges((fromA, toA, fromB, toB, text) => {
-			if (text.length) {
-				tr.replaceWith(offset + fromA, offset + toA, view.state.schema.text(text.toString()));
+			if (expValEquals('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true)) {
+				const adjFrom = crlfAdjustment(codeBlockText, fromA);
+				// If the from and to are the same, we don't need to run adjustment again
+				const adjTo = fromA === toA ? adjFrom : crlfAdjustment(codeBlockText, toA);
+				const pmFrom = offset + fromA + adjFrom;
+				const pmTo = offset + toA + adjTo;
+				if (text.length) {
+					tr.replaceWith(pmFrom, pmTo, view.state.schema.text(text.toString()));
+				} else {
+					tr.delete(pmFrom, pmTo);
+				}
 			} else {
-				tr.delete(offset + fromA, offset + toA);
+				if (text.length) {
+					tr.replaceWith(offset + fromA, offset + toA, view.state.schema.text(text.toString()));
+				} else {
+					tr.delete(offset + fromA, offset + toA);
+				}
 			}
 			offset += toB - fromB - (toA - fromA);
 		});

package/src/nodeviews/codemirrorSync/updateCMSelection.ts

@@ -1,34 +1,88 @@
 import type { ChangeSpec } from '@codemirror/state';
 
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 /**
  *
  * Compares the updated text with the current to determine the transaction to fire
  * in the CodeMirror editor.
  *
  * @param curText string - the current CodeMirror text
- * @param newText string - the new CodeMirror text
+ * @param newText string - the new ProseMirror text
  * @returns The changes or undefined if no change
  */
+
+const N_LINE_FEED = '\n'.charCodeAt(0);
+const R_LINE_FEED = '\r'.charCodeAt(0);
+
+/**
+ * Example of CRLF differences:
+ * newText: 'abc\r\ndef\r\nghi'
+ * curText: 'abc\ndef\nghi'
+ */
 export const getCMSelectionChanges = (curText: string, newText: string): ChangeSpec | undefined => {
 	if (newText !== curText) {
+		let curStart = 0,
+			newStart = 0;
 		let start = 0,
 			curEnd = curText.length,
 			newEnd = newText.length;
-		while (start < curEnd && curText.charCodeAt(start) === newText.charCodeAt(start)) {
-			++start;
-		}
-		while (
-			curEnd > start &&
-			newEnd > start &&
-			curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1)
-		) {
-			curEnd--;
-			newEnd--;
+
+		if (expValEquals('platform_editor_fix_advanced_codeblocks_crlf_patch', 'isEnabled', true)) {
+			while (
+				curStart < curEnd &&
+				(curText.charCodeAt(curStart) === newText.charCodeAt(newStart) ||
+					(newText.charCodeAt(newStart) === R_LINE_FEED &&
+						curText.charCodeAt(curStart) === N_LINE_FEED))
+			) {
+				if (
+					newText.charCodeAt(newStart) === R_LINE_FEED &&
+					curText.charCodeAt(curStart) === N_LINE_FEED &&
+					newText.charCodeAt(newStart + 1) === N_LINE_FEED
+				) {
+					newStart++;
+				}
+				curStart++;
+				newStart++;
+			}
+			while (
+				curEnd > curStart &&
+				newEnd > newStart &&
+				(curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1) ||
+					(newText.charCodeAt(newEnd - 1) === N_LINE_FEED &&
+						curText.charCodeAt(curEnd - 1) === N_LINE_FEED))
+			) {
+				if (
+					newText.charCodeAt(newEnd - 1) === N_LINE_FEED &&
+					curText.charCodeAt(curEnd - 1) === N_LINE_FEED &&
+					newText.charCodeAt(newEnd - 2) === R_LINE_FEED
+				) {
+					newEnd--;
+				}
+				curEnd--;
+				newEnd--;
+			}
+			return {
+				from: curStart,
+				to: curEnd,
+				insert: newText.slice(newStart, newEnd),
+			};
+		} else {
+			while (start < curEnd && curText.charCodeAt(start) === newText.charCodeAt(start)) {
+				++start;
+			}
+			while (
+				curEnd > start &&
+				newEnd > start &&
+				curText.charCodeAt(curEnd - 1) === newText.charCodeAt(newEnd - 1)
+			) {
+				curEnd--;
+				newEnd--;
+			}
+			return {
+				from: start,
+				to: curEnd,
+				insert: newText.slice(start, newEnd),
+			};
 		}
-		return {
-			from: start,
-			to: curEnd,
-			insert: newText.slice(start, newEnd),
-		};
 	}
 };

package/tsconfig.json

@@ -3,7 +3,5 @@
 	"include": [
 		"src/**/*.ts",
 		"src/**/*.tsx"
-	],
-	"compilerOptions": {
-	}
+	]
 }