@atlaskit/editor-plugin-code-block 14.1.20 → 14.1.21

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-code-block
 
+## 14.1.21
+
+### Patch Changes
+
+- [`eea5a45d85ede`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/eea5a45d85ede) -
+  Clean up feature gate `platform_editor_code_block_dogfooding_patch`
+
 ## 14.1.20
 
 ### Patch Changes

package/dist/cjs/editor-commands/index.js

@@ -483,10 +483,7 @@ var toggleWordWrapStateForCodeBlockNode = exports.toggleWordWrapStateForCodeBloc
     if ((0, _expValEquals.expValEquals)('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
       tr.setNodeMarkup(codeBlock.pos, undefined, _objectSpread(_objectSpread({}, codeBlockNode.attrs), {}, {
         wrap: updatedToggleState
-      }));
-      if ((0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch')) {
-        tr.setMeta('scrollIntoView', false);
-      }
+      })).setMeta('scrollIntoView', false);
     } else {
       _codeBlock.codeBlockWrappedStates.set(codeBlockNode, updatedToggleState);
     }

package/dist/cjs/pm-plugins/toolbar.js

@@ -168,7 +168,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig() {
             filterOption: languageListFilter,
             formatMessage: formatMessage,
             languagePickerOptions: languagePickerOptions,
-            triggerSpacing: !areAnyNewToolbarFlagsEnabled && (0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch') ? 'compact' : 'default'
+            triggerSpacing: !areAnyNewToolbarFlagsEnabled ? 'compact' : 'default'
           });
         }
       };

package/dist/cjs/ui/CodeBlockLanguagePicker.js

@@ -37,25 +37,23 @@ var CodeBlockLanguagePicker = exports.CodeBlockLanguagePicker = function CodeBlo
     var isDetectLanguageSelected = option.value === _languagePickerOptions.DETECT_LANGUAGE_VALUE;
     var command = isDetectLanguageSelected && ((0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1') || (0, _platformFeatureFlags.fg)('platform_editor_code_block_language_detection_flow')) ? (0, _editorCommands.detectLanguage)() : (0, _editorCommands.changeLanguage)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(option.value, selectionSource);
     var commandSucceeded = command(editorView.state, editorView.dispatch);
-    if ((0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch')) {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1')) {
-        if (interactionMethod === 'mouse') {
-          requestAnimationFrame(function () {
-            // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
-            // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
-            api === null || api === void 0 || api.core.actions.focus({
-              scrollIntoView: false
-            });
-          });
-        }
-      } else {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1')) {
+      if (interactionMethod === 'mouse') {
         requestAnimationFrame(function () {
-          // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+          // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
+          // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
           api === null || api === void 0 || api.core.actions.focus({
             scrollIntoView: false
           });
         });
       }
+    } else {
+      requestAnimationFrame(function () {
+        // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+        api === null || api === void 0 || api.core.actions.focus({
+          scrollIntoView: false
+        });
+      });
     }
     if (commandSucceeded && (option.value !== _languagePickerOptions.DETECT_LANGUAGE_VALUE || (0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1'))) {
       (0, _recentLanguages.saveRecentLanguage)(option.value);

package/dist/cjs/ui/LanguagePicker.js

@@ -52,17 +52,6 @@ var popupSelectComponents = {
   Group: CustomGroup,
   Option: CustomOption
 };
-var menuPopperProps = {
-  modifiers: [{
-    name: 'offset',
-    options: {
-      offset: [0, 8]
-    }
-  }, {
-    name: 'preventOverflow',
-    enabled: false
-  }]
-};
 var focusWithoutScrolling = function focusWithoutScrolling(element) {
   element.focus({
     preventScroll: true
@@ -176,30 +165,24 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
     var isInputChange = !actionMeta || actionMeta.action === 'input-change';
     if (isInputChange) {
       inputValueRef.current = newInputValue;
-    }
-    if (isInputChange || !(0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch')) {
       setHasSearchQuery(newInputValue.trim().length > 0);
       return newInputValue;
     }
     return inputValueRef.current;
   }, []);
   var handleMenuOpen = (0, _react.useCallback)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch')) {
-      inputValueRef.current = '';
-      setHasSearchQuery(false);
-      setLockedPopperPlacement(undefined);
-    }
+    inputValueRef.current = '';
+    setHasSearchQuery(false);
+    setLockedPopperPlacement(undefined);
     onMenuOpen === null || onMenuOpen === void 0 || onMenuOpen();
   }, [onMenuOpen]);
   var handleTriggerMouseDown = (0, _react.useCallback)(function (event) {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch')) {
-      // PopupSelect's FocusLock returns focus to the element that was focused before the
-      // picker opened. If that is the editor/code block, closing the picker can scroll the
-      // whole code block into view. Focus the trigger first without scrolling so FocusLock
-      // returns to the trigger; see CodeBlockLanguagePicker's handleSelection for restoring
-      // editor focus.
-      focusWithoutScrolling(event.currentTarget);
-    }
+    // PopupSelect's FocusLock returns focus to the element that was focused before the
+    // picker opened. If that is the editor/code block, closing the picker can scroll the
+    // whole code block into view. Focus the trigger first without scrolling so FocusLock
+    // returns to the trigger; see CodeBlockLanguagePicker's handleSelection for restoring
+    // editor focus.
+    focusWithoutScrolling(event.currentTarget);
   }, []);
   var handleTriggerMouseUp = (0, _react.useCallback)(function (event) {
     if ((0, _platformFeatureFlags.fg)('platform_editor_code_block_ga_patch_1')) {
@@ -250,7 +233,7 @@ var LanguagePicker = exports.LanguagePicker = function LanguagePicker(_ref) {
     onInputChange: handleInputChange,
     onMenuOpen: handleMenuOpen,
     options: hasSearchQuery ? searchOptions : options,
-    popperProps: (0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch') ? stableMenuPopperProps : menuPopperProps,
+    popperProps: stableMenuPopperProps,
     searchThreshold: -1,
     target: renderTarget,
     testId: "code-block-language-picker",

package/dist/cjs/utils/auto-detect-view.js

@@ -8,7 +8,6 @@ exports.syncPendingDetectionTimers = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("../pm-plugins/actions");
 var _autoDetectState = require("../pm-plugins/auto-detect-state");
 var _autoDetectState2 = require("./auto-detect-state");
@@ -51,41 +50,34 @@ var runPendingDetection = function runPendingDetection(view, localId, api) {
     detectionResult: detectionResult,
     autoDetectedLanguage: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : entry.autoDetectedLanguage
   });
-
-  // If there is no confident detection, record the result without clearing user-visible language.
-  var shouldOnlyUpdateDetectionState = !detectedLanguage && (!found.node.attrs.language || shouldPreserveAutoDetectedLanguage);
   var hasDetectedLanguageChange = Boolean(detectedLanguage) && found.node.attrs.language !== detectedLanguage;
   var shouldClearStaleLanguage = !detectedLanguage && Boolean(found.node.attrs.language) && !shouldPreserveAutoDetectedLanguage;
-  var shouldUpdateNodeLanguage = (0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch') ? hasDetectedLanguageChange || shouldClearStaleLanguage : !shouldOnlyUpdateDetectionState;
+  var shouldUpdateNodeLanguage = hasDetectedLanguageChange || shouldClearStaleLanguage;
   api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref) {
     var tr = _ref.tr;
     if (shouldUpdateNodeLanguage) {
+      var _api$analytics;
       tr.setNodeMarkup(found.pos, undefined, _objectSpread(_objectSpread({}, found.node.attrs), {}, {
         language: detectedLanguage
       }), found.node.marks);
-    }
-    tr.setMeta(_autoDetectState.autoDetectPluginKey, {
-      type: _actions.ACTIONS.SET_AUTO_DETECT_ENTRY,
-      data: {
-        localId: localId,
-        entry: nextEntry
-      }
-    });
-    // When platform_editor_code_block_dogfooding_patch is cleaned up, merge this with the previous shouldUpdateNodeLanguage check.
-    if (!(0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch') || shouldUpdateNodeLanguage) {
-      var _api$analytics;
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
         action: _analytics.ACTION.LANGUAGE_AUTO_DETECTED,
         actionSubject: _analytics.ACTION_SUBJECT.CODE_BLOCK,
-        attributes: _objectSpread({
+        attributes: {
           language: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : 'none',
-          detectionResult: detectionResult
-        }, (0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch') ? {
+          detectionResult: detectionResult,
           detectionPhase: detectionPhase
-        } : {}),
+        },
         eventType: _analytics.EVENT_TYPE.TRACK
       })(tr);
     }
+    tr.setMeta(_autoDetectState.autoDetectPluginKey, {
+      type: _actions.ACTIONS.SET_AUTO_DETECT_ENTRY,
+      data: {
+        localId: localId,
+        entry: nextEntry
+      }
+    });
     // Language detection runs in the background and should not move the viewport.
     return tr.setMeta('scrollIntoView', false);
   });

package/dist/cjs/utils/language-detect.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.detectLanguage = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /* eslint-disable require-unicode-regexp */
 
 // Conservative weighted-regex heuristic for common high-confidence snippets, not a full classifier.
@@ -102,9 +101,6 @@ var scorePatterns = function scorePatterns(code, patterns) {
     return score + (hasPattern(code, pattern) ? value : 0);
   }, 0);
 };
-var scoreEnhancedTypeScriptPatterns = function scoreEnhancedTypeScriptPatterns(code) {
-  return (0, _platformFeatureFlags.fg)('platform_editor_code_block_dogfooding_patch') ? scorePatterns(code, [[TS_ACCESS_MODIFIER_REGEX, 5], [TS_TYPED_ARROW_PARAM_REGEX, 5]]) : 0;
-};
 var looksLikeHtmlTagPair = function looksLikeHtmlTagPair(code) {
   var openTags = new Set();
   // Ignored via go/ees019
@@ -156,7 +152,7 @@ var getLanguageScores = function getLanguageScores(code) {
     score: scorePatterns(code, [[SQL_SELECT_FROM_REGEX, 5], [SQL_DML_REGEX, 5], [SQL_CLAUSE_REGEX, 2]])
   }, {
     language: 'typescript',
-    score: scorePatterns(code, [[TS_INTERFACE_TYPE_REGEX, 5], [TS_IMPORT_EXPORT_TYPE_REGEX, 4], [TS_TYPED_VAR_REGEX, 4], [TS_RETURN_TYPE_REGEX, 3], [TS_ADVANCED_REGEX, 3]]) + scoreEnhancedTypeScriptPatterns(code)
+    score: scorePatterns(code, [[TS_INTERFACE_TYPE_REGEX, 5], [TS_IMPORT_EXPORT_TYPE_REGEX, 4], [TS_TYPED_VAR_REGEX, 4], [TS_RETURN_TYPE_REGEX, 3], [TS_ADVANCED_REGEX, 3], [TS_ACCESS_MODIFIER_REGEX, 5], [TS_TYPED_ARROW_PARAM_REGEX, 5]])
   }, {
     language: 'javascript',
     score: scorePatterns(code, [[JS_VAR_REGEX, 3], [JS_FUNCTION_REGEX, 3], [JS_ARROW_REGEX, 3], [JS_IMPORT_EXPORT_REGEX, 3], [JS_COMMON_API_REGEX, 3]])

package/dist/es2019/editor-commands/index.js

@@ -494,10 +494,7 @@ export const toggleWordWrapStateForCodeBlockNode = editorAnalyticsAPI => (state,
     tr.setNodeMarkup(codeBlock.pos, undefined, {
       ...codeBlockNode.attrs,
       wrap: updatedToggleState
-    });
-    if (fg('platform_editor_code_block_dogfooding_patch')) {
-      tr.setMeta('scrollIntoView', false);
-    }
+    }).setMeta('scrollIntoView', false);
   } else {
     codeBlockWrappedStates.set(codeBlockNode, updatedToggleState);
   }

package/dist/es2019/pm-plugins/toolbar.js

@@ -138,7 +138,7 @@ export const getToolbarConfig = (allowCopyToClipboard = false, api, overrideLang
             filterOption: languageListFilter,
             formatMessage: formatMessage,
             languagePickerOptions: languagePickerOptions,
-            triggerSpacing: !areAnyNewToolbarFlagsEnabled && fg('platform_editor_code_block_dogfooding_patch') ? 'compact' : 'default'
+            triggerSpacing: !areAnyNewToolbarFlagsEnabled ? 'compact' : 'default'
           });
         }
       };

package/dist/es2019/ui/CodeBlockLanguagePicker.js

@@ -23,25 +23,23 @@ export const CodeBlockLanguagePicker = ({
     const isDetectLanguageSelected = option.value === DETECT_LANGUAGE_VALUE;
     const command = isDetectLanguageSelected && (fg('platform_editor_code_block_ga_patch_1') || fg('platform_editor_code_block_language_detection_flow')) ? detectLanguage() : changeLanguage(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(option.value, selectionSource);
     const commandSucceeded = command(editorView.state, editorView.dispatch);
-    if (fg('platform_editor_code_block_dogfooding_patch')) {
-      if (fg('platform_editor_code_block_ga_patch_1')) {
-        if (interactionMethod === 'mouse') {
-          requestAnimationFrame(() => {
-            // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
-            // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
-            api === null || api === void 0 ? void 0 : api.core.actions.focus({
-              scrollIntoView: false
-            });
-          });
-        }
-      } else {
+    if (fg('platform_editor_code_block_ga_patch_1')) {
+      if (interactionMethod === 'mouse') {
         requestAnimationFrame(() => {
-          // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+          // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
+          // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
           api === null || api === void 0 ? void 0 : api.core.actions.focus({
             scrollIntoView: false
           });
         });
       }
+    } else {
+      requestAnimationFrame(() => {
+        // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+        api === null || api === void 0 ? void 0 : api.core.actions.focus({
+          scrollIntoView: false
+        });
+      });
     }
     if (commandSucceeded && (option.value !== DETECT_LANGUAGE_VALUE || fg('platform_editor_code_block_ga_patch_1'))) {
       saveRecentLanguage(option.value);

package/dist/es2019/ui/LanguagePicker.js

@@ -38,17 +38,6 @@ const popupSelectComponents = {
   Group: CustomGroup,
   Option: CustomOption
 };
-const menuPopperProps = {
-  modifiers: [{
-    name: 'offset',
-    options: {
-      offset: [0, 8]
-    }
-  }, {
-    name: 'preventOverflow',
-    enabled: false
-  }]
-};
 const focusWithoutScrolling = element => {
   element.focus({
     preventScroll: true
@@ -133,30 +122,24 @@ export const LanguagePicker = ({
     const isInputChange = !actionMeta || actionMeta.action === 'input-change';
     if (isInputChange) {
       inputValueRef.current = newInputValue;
-    }
-    if (isInputChange || !fg('platform_editor_code_block_dogfooding_patch')) {
       setHasSearchQuery(newInputValue.trim().length > 0);
       return newInputValue;
     }
     return inputValueRef.current;
   }, []);
   const handleMenuOpen = useCallback(() => {
-    if (fg('platform_editor_code_block_dogfooding_patch')) {
-      inputValueRef.current = '';
-      setHasSearchQuery(false);
-      setLockedPopperPlacement(undefined);
-    }
+    inputValueRef.current = '';
+    setHasSearchQuery(false);
+    setLockedPopperPlacement(undefined);
     onMenuOpen === null || onMenuOpen === void 0 ? void 0 : onMenuOpen();
   }, [onMenuOpen]);
   const handleTriggerMouseDown = useCallback(event => {
-    if (fg('platform_editor_code_block_dogfooding_patch')) {
-      // PopupSelect's FocusLock returns focus to the element that was focused before the
-      // picker opened. If that is the editor/code block, closing the picker can scroll the
-      // whole code block into view. Focus the trigger first without scrolling so FocusLock
-      // returns to the trigger; see CodeBlockLanguagePicker's handleSelection for restoring
-      // editor focus.
-      focusWithoutScrolling(event.currentTarget);
-    }
+    // PopupSelect's FocusLock returns focus to the element that was focused before the
+    // picker opened. If that is the editor/code block, closing the picker can scroll the
+    // whole code block into view. Focus the trigger first without scrolling so FocusLock
+    // returns to the trigger; see CodeBlockLanguagePicker's handleSelection for restoring
+    // editor focus.
+    focusWithoutScrolling(event.currentTarget);
   }, []);
   const handleTriggerMouseUp = useCallback(event => {
     if (fg('platform_editor_code_block_ga_patch_1')) {
@@ -206,7 +189,7 @@ export const LanguagePicker = ({
     onInputChange: handleInputChange,
     onMenuOpen: handleMenuOpen,
     options: hasSearchQuery ? searchOptions : options,
-    popperProps: fg('platform_editor_code_block_dogfooding_patch') ? stableMenuPopperProps : menuPopperProps,
+    popperProps: stableMenuPopperProps,
     searchThreshold: -1,
     target: renderTarget,
     testId: "code-block-language-picker",

package/dist/es2019/utils/auto-detect-view.js

@@ -1,5 +1,4 @@
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { ACTIONS } from '../pm-plugins/actions';
 import { autoDetectPluginKey } from '../pm-plugins/auto-detect-state';
 import { createAutoDetectEntry } from './auto-detect-state';
@@ -41,44 +40,36 @@ const runPendingDetection = (view, localId, api) => {
     detectionResult,
     autoDetectedLanguage: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : entry.autoDetectedLanguage
   };
-
-  // If there is no confident detection, record the result without clearing user-visible language.
-  const shouldOnlyUpdateDetectionState = !detectedLanguage && (!found.node.attrs.language || shouldPreserveAutoDetectedLanguage);
   const hasDetectedLanguageChange = Boolean(detectedLanguage) && found.node.attrs.language !== detectedLanguage;
   const shouldClearStaleLanguage = !detectedLanguage && Boolean(found.node.attrs.language) && !shouldPreserveAutoDetectedLanguage;
-  const shouldUpdateNodeLanguage = fg('platform_editor_code_block_dogfooding_patch') ? hasDetectedLanguageChange || shouldClearStaleLanguage : !shouldOnlyUpdateDetectionState;
+  const shouldUpdateNodeLanguage = hasDetectedLanguageChange || shouldClearStaleLanguage;
   api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
     tr
   }) => {
     if (shouldUpdateNodeLanguage) {
+      var _api$analytics;
       tr.setNodeMarkup(found.pos, undefined, {
         ...found.node.attrs,
         language: detectedLanguage
       }, found.node.marks);
-    }
-    tr.setMeta(autoDetectPluginKey, {
-      type: ACTIONS.SET_AUTO_DETECT_ENTRY,
-      data: {
-        localId,
-        entry: nextEntry
-      }
-    });
-    // When platform_editor_code_block_dogfooding_patch is cleaned up, merge this with the previous shouldUpdateNodeLanguage check.
-    if (!fg('platform_editor_code_block_dogfooding_patch') || shouldUpdateNodeLanguage) {
-      var _api$analytics;
       api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
         action: ACTION.LANGUAGE_AUTO_DETECTED,
         actionSubject: ACTION_SUBJECT.CODE_BLOCK,
         attributes: {
           language: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : 'none',
           detectionResult,
-          ...(fg('platform_editor_code_block_dogfooding_patch') ? {
-            detectionPhase
-          } : {})
+          detectionPhase
         },
         eventType: EVENT_TYPE.TRACK
       })(tr);
     }
+    tr.setMeta(autoDetectPluginKey, {
+      type: ACTIONS.SET_AUTO_DETECT_ENTRY,
+      data: {
+        localId,
+        entry: nextEntry
+      }
+    });
     // Language detection runs in the background and should not move the viewport.
     return tr.setMeta('scrollIntoView', false);
   });

package/dist/es2019/utils/language-detect.js

@@ -1,5 +1,5 @@
 /* eslint-disable require-unicode-regexp */
-import { fg } from '@atlaskit/platform-feature-flags';
+
 // Conservative weighted-regex heuristic for common high-confidence snippets, not a full classifier.
 // Ambiguous snippets intentionally return null so users can select the language manually.
 const MAX_DETECTION_CHARS = 10_000;
@@ -85,7 +85,6 @@ const hasPattern = (code, pattern) => {
   return pattern.test(code);
 };
 const scorePatterns = (code, patterns) => patterns.reduce((score, [pattern, value]) => score + (hasPattern(code, pattern) ? value : 0), 0);
-const scoreEnhancedTypeScriptPatterns = code => fg('platform_editor_code_block_dogfooding_patch') ? scorePatterns(code, [[TS_ACCESS_MODIFIER_REGEX, 5], [TS_TYPED_ARROW_PARAM_REGEX, 5]]) : 0;
 const looksLikeHtmlTagPair = code => {
   const openTags = new Set();
   // Ignored via go/ees019
@@ -133,7 +132,7 @@ const getLanguageScores = code => [{
   score: scorePatterns(code, [[SQL_SELECT_FROM_REGEX, 5], [SQL_DML_REGEX, 5], [SQL_CLAUSE_REGEX, 2]])
 }, {
   language: 'typescript',
-  score: scorePatterns(code, [[TS_INTERFACE_TYPE_REGEX, 5], [TS_IMPORT_EXPORT_TYPE_REGEX, 4], [TS_TYPED_VAR_REGEX, 4], [TS_RETURN_TYPE_REGEX, 3], [TS_ADVANCED_REGEX, 3]]) + scoreEnhancedTypeScriptPatterns(code)
+  score: scorePatterns(code, [[TS_INTERFACE_TYPE_REGEX, 5], [TS_IMPORT_EXPORT_TYPE_REGEX, 4], [TS_TYPED_VAR_REGEX, 4], [TS_RETURN_TYPE_REGEX, 3], [TS_ADVANCED_REGEX, 3], [TS_ACCESS_MODIFIER_REGEX, 5], [TS_TYPED_ARROW_PARAM_REGEX, 5]])
 }, {
   language: 'javascript',
   score: scorePatterns(code, [[JS_VAR_REGEX, 3], [JS_FUNCTION_REGEX, 3], [JS_ARROW_REGEX, 3], [JS_IMPORT_EXPORT_REGEX, 3], [JS_COMMON_API_REGEX, 3]])

package/dist/esm/editor-commands/index.js

@@ -472,10 +472,7 @@ export var toggleWordWrapStateForCodeBlockNode = function toggleWordWrapStateFor
     if (expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
       tr.setNodeMarkup(codeBlock.pos, undefined, _objectSpread(_objectSpread({}, codeBlockNode.attrs), {}, {
         wrap: updatedToggleState
-      }));
-      if (fg('platform_editor_code_block_dogfooding_patch')) {
-        tr.setMeta('scrollIntoView', false);
-      }
+      })).setMeta('scrollIntoView', false);
     } else {
       codeBlockWrappedStates.set(codeBlockNode, updatedToggleState);
     }

package/dist/esm/pm-plugins/toolbar.js

@@ -159,7 +159,7 @@ export var getToolbarConfig = function getToolbarConfig() {
             filterOption: languageListFilter,
             formatMessage: formatMessage,
             languagePickerOptions: languagePickerOptions,
-            triggerSpacing: !areAnyNewToolbarFlagsEnabled && fg('platform_editor_code_block_dogfooding_patch') ? 'compact' : 'default'
+            triggerSpacing: !areAnyNewToolbarFlagsEnabled ? 'compact' : 'default'
           });
         }
       };

package/dist/esm/ui/CodeBlockLanguagePicker.js

@@ -28,25 +28,23 @@ export var CodeBlockLanguagePicker = function CodeBlockLanguagePicker(_ref) {
     var isDetectLanguageSelected = option.value === DETECT_LANGUAGE_VALUE;
     var command = isDetectLanguageSelected && (fg('platform_editor_code_block_ga_patch_1') || fg('platform_editor_code_block_language_detection_flow')) ? detectLanguage() : changeLanguage(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(option.value, selectionSource);
     var commandSucceeded = command(editorView.state, editorView.dispatch);
-    if (fg('platform_editor_code_block_dogfooding_patch')) {
-      if (fg('platform_editor_code_block_ga_patch_1')) {
-        if (interactionMethod === 'mouse') {
-          requestAnimationFrame(function () {
-            // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
-            // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
-            api === null || api === void 0 || api.core.actions.focus({
-              scrollIntoView: false
-            });
-          });
-        }
-      } else {
+    if (fg('platform_editor_code_block_ga_patch_1')) {
+      if (interactionMethod === 'mouse') {
         requestAnimationFrame(function () {
-          // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+          // Mouse-opened picker should return editing focus to the code block. Keyboard-opened
+          // picker keeps focus on the trigger to avoid CodeMirror DOM focus without cm.hasFocus.
           api === null || api === void 0 || api.core.actions.focus({
             scrollIntoView: false
           });
         });
       }
+    } else {
+      requestAnimationFrame(function () {
+        // Let PopupSelect/FocusLock finish returning focus to the trigger, then restore the editor.
+        api === null || api === void 0 || api.core.actions.focus({
+          scrollIntoView: false
+        });
+      });
     }
     if (commandSucceeded && (option.value !== DETECT_LANGUAGE_VALUE || fg('platform_editor_code_block_ga_patch_1'))) {
       saveRecentLanguage(option.value);

package/dist/esm/ui/LanguagePicker.js

@@ -43,17 +43,6 @@ var popupSelectComponents = {
   Group: CustomGroup,
   Option: CustomOption
 };
-var menuPopperProps = {
-  modifiers: [{
-    name: 'offset',
-    options: {
-      offset: [0, 8]
-    }
-  }, {
-    name: 'preventOverflow',
-    enabled: false
-  }]
-};
 var focusWithoutScrolling = function focusWithoutScrolling(element) {
   element.focus({
     preventScroll: true
@@ -167,30 +156,24 @@ export var LanguagePicker = function LanguagePicker(_ref) {
     var isInputChange = !actionMeta || actionMeta.action === 'input-change';
     if (isInputChange) {
       inputValueRef.current = newInputValue;
-    }
-    if (isInputChange || !fg('platform_editor_code_block_dogfooding_patch')) {
       setHasSearchQuery(newInputValue.trim().length > 0);
       return newInputValue;
     }
     return inputValueRef.current;
   }, []);
   var handleMenuOpen = useCallback(function () {
-    if (fg('platform_editor_code_block_dogfooding_patch')) {
-      inputValueRef.current = '';
-      setHasSearchQuery(false);
-      setLockedPopperPlacement(undefined);
-    }
+    inputValueRef.current = '';
+    setHasSearchQuery(false);
+    setLockedPopperPlacement(undefined);
     onMenuOpen === null || onMenuOpen === void 0 || onMenuOpen();
   }, [onMenuOpen]);
   var handleTriggerMouseDown = useCallback(function (event) {
-    if (fg('platform_editor_code_block_dogfooding_patch')) {
-      // PopupSelect's FocusLock returns focus to the element that was focused before the
-      // picker opened. If that is the editor/code block, closing the picker can scroll the
-      // whole code block into view. Focus the trigger first without scrolling so FocusLock
-      // returns to the trigger; see CodeBlockLanguagePicker's handleSelection for restoring
-      // editor focus.
-      focusWithoutScrolling(event.currentTarget);
-    }
+    // PopupSelect's FocusLock returns focus to the element that was focused before the
+    // picker opened. If that is the editor/code block, closing the picker can scroll the
+    // whole code block into view. Focus the trigger first without scrolling so FocusLock
+    // returns to the trigger; see CodeBlockLanguagePicker's handleSelection for restoring
+    // editor focus.
+    focusWithoutScrolling(event.currentTarget);
   }, []);
   var handleTriggerMouseUp = useCallback(function (event) {
     if (fg('platform_editor_code_block_ga_patch_1')) {
@@ -241,7 +224,7 @@ export var LanguagePicker = function LanguagePicker(_ref) {
     onInputChange: handleInputChange,
     onMenuOpen: handleMenuOpen,
     options: hasSearchQuery ? searchOptions : options,
-    popperProps: fg('platform_editor_code_block_dogfooding_patch') ? stableMenuPopperProps : menuPopperProps,
+    popperProps: stableMenuPopperProps,
     searchThreshold: -1,
     target: renderTarget,
     testId: "code-block-language-picker",

package/dist/esm/utils/auto-detect-view.js

@@ -3,7 +3,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { ACTIONS } from '../pm-plugins/actions';
 import { autoDetectPluginKey } from '../pm-plugins/auto-detect-state';
 import { createAutoDetectEntry } from './auto-detect-state';
@@ -44,41 +43,34 @@ var runPendingDetection = function runPendingDetection(view, localId, api) {
     detectionResult: detectionResult,
     autoDetectedLanguage: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : entry.autoDetectedLanguage
   });
-
-  // If there is no confident detection, record the result without clearing user-visible language.
-  var shouldOnlyUpdateDetectionState = !detectedLanguage && (!found.node.attrs.language || shouldPreserveAutoDetectedLanguage);
   var hasDetectedLanguageChange = Boolean(detectedLanguage) && found.node.attrs.language !== detectedLanguage;
   var shouldClearStaleLanguage = !detectedLanguage && Boolean(found.node.attrs.language) && !shouldPreserveAutoDetectedLanguage;
-  var shouldUpdateNodeLanguage = fg('platform_editor_code_block_dogfooding_patch') ? hasDetectedLanguageChange || shouldClearStaleLanguage : !shouldOnlyUpdateDetectionState;
+  var shouldUpdateNodeLanguage = hasDetectedLanguageChange || shouldClearStaleLanguage;
   api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref) {
     var tr = _ref.tr;
     if (shouldUpdateNodeLanguage) {
+      var _api$analytics;
       tr.setNodeMarkup(found.pos, undefined, _objectSpread(_objectSpread({}, found.node.attrs), {}, {
         language: detectedLanguage
       }), found.node.marks);
-    }
-    tr.setMeta(autoDetectPluginKey, {
-      type: ACTIONS.SET_AUTO_DETECT_ENTRY,
-      data: {
-        localId: localId,
-        entry: nextEntry
-      }
-    });
-    // When platform_editor_code_block_dogfooding_patch is cleaned up, merge this with the previous shouldUpdateNodeLanguage check.
-    if (!fg('platform_editor_code_block_dogfooding_patch') || shouldUpdateNodeLanguage) {
-      var _api$analytics;
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
         action: ACTION.LANGUAGE_AUTO_DETECTED,
         actionSubject: ACTION_SUBJECT.CODE_BLOCK,
-        attributes: _objectSpread({
+        attributes: {
           language: detectedLanguage !== null && detectedLanguage !== void 0 ? detectedLanguage : 'none',
-          detectionResult: detectionResult
-        }, fg('platform_editor_code_block_dogfooding_patch') ? {
+          detectionResult: detectionResult,
           detectionPhase: detectionPhase
-        } : {}),
+        },
         eventType: EVENT_TYPE.TRACK
       })(tr);
     }
+    tr.setMeta(autoDetectPluginKey, {
+      type: ACTIONS.SET_AUTO_DETECT_ENTRY,
+      data: {
+        localId: localId,
+        entry: nextEntry
+      }
+    });
     // Language detection runs in the background and should not move the viewport.
     return tr.setMeta('scrollIntoView', false);
   });

package/dist/esm/utils/language-detect.js

@@ -1,7 +1,7 @@
 import _typeof from "@babel/runtime/helpers/typeof";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /* eslint-disable require-unicode-regexp */
-import { fg } from '@atlaskit/platform-feature-flags';
+
 // Conservative weighted-regex heuristic for common high-confidence snippets, not a full classifier.
 // Ambiguous snippets intentionally return null so users can select the language manually.
 var MAX_DETECTION_CHARS = 10000;
@@ -94,9 +94,6 @@ var scorePatterns = function scorePatterns(code, patterns) {
     return score + (hasPattern(code, pattern) ? value : 0);
   }, 0);
 };
-var scoreEnhancedTypeScriptPatterns = function scoreEnhancedTypeScriptPatterns(code) {
-  return fg('platform_editor_code_block_dogfooding_patch') ? scorePatterns(code, [[TS_ACCESS_MODIFIER_REGEX, 5], [TS_TYPED_ARROW_PARAM_REGEX, 5]]) : 0;
-};
 var looksLikeHtmlTagPair = function looksLikeHtmlTagPair(code) {
   var openTags = new Set();
   // Ignored via go/ees019
@@ -148,7 +145,7 @@ var getLanguageScores = function getLanguageScores(code) {
     score: scorePatterns(code, [[SQL_SELECT_FROM_REGEX, 5], [SQL_DML_REGEX, 5], [SQL_CLAUSE_REGEX, 2]])
   }, {
     language: 'typescript',
-    score: scorePatterns(code, [[TS_INTERFACE_TYPE_REGEX, 5], [TS_IMPORT_EXPORT_TYPE_REGEX, 4], [TS_TYPED_VAR_REGEX, 4], [TS_RETURN_TYPE_REGEX, 3], [TS_ADVANCED_REGEX, 3]]) + scoreEnhancedTypeScriptPatterns(code)
+    score: scorePatterns(code, [[TS_INTERFACE_TYPE_REGEX, 5], [TS_IMPORT_EXPORT_TYPE_REGEX, 4], [TS_TYPED_VAR_REGEX, 4], [TS_RETURN_TYPE_REGEX, 3], [TS_ADVANCED_REGEX, 3], [TS_ACCESS_MODIFIER_REGEX, 5], [TS_TYPED_ARROW_PARAM_REGEX, 5]])
   }, {
     language: 'javascript',
     score: scorePatterns(code, [[JS_VAR_REGEX, 3], [JS_FUNCTION_REGEX, 3], [JS_ARROW_REGEX, 3], [JS_IMPORT_EXPORT_REGEX, 3], [JS_COMMON_API_REGEX, 3]])

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "14.1.20",
+	"version": "14.1.21",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,21 +34,21 @@
 		"@atlaskit/editor-plugin-toolbar": "^9.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-shared-styles": "^4.0.0",
-		"@atlaskit/editor-toolbar": "^2.1.0",
+		"@atlaskit/editor-toolbar": "^2.2.0",
 		"@atlaskit/flag": "^18.1.0",
 		"@atlaskit/frontend-utilities": "^4.1.0",
 		"@atlaskit/icon": "^37.0.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
-		"@atlaskit/primitives": "^20.5.0",
+		"@atlaskit/primitives": "^20.6.0",
 		"@atlaskit/prosemirror-input-rules": "^4.0.0",
 		"@atlaskit/select": "^22.5.0",
 		"@atlaskit/tmp-editor-statsig": "^124.1.0",
-		"@atlaskit/tokens": "^15.5.0",
+		"@atlaskit/tokens": "^15.6.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.25.0",
+		"@atlaskit/editor-common": "^116.26.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -103,9 +103,6 @@
 		"platform_editor_code_block_add_line_number_button": {
 			"type": "boolean"
 		},
-		"platform_editor_code_block_dogfooding_patch": {
-			"type": "boolean"
-		},
 		"platform_editor_code_block_ga_patch_1": {
 			"type": "boolean"
 		},