Merge pull request #35514 from overleaf/worktree-mg-comment-fix

Split add-comment to own extension and always register command

GitOrigin-RevId: 2e25643b7fe4ff30693479975945d94cc586bd61

services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx

@@ -28,7 +28,6 @@ import { useFeatureFlag } from '@/shared/context/split-test-context'
 import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 import UpgradeTrackChangesModal from '@/features/review-panel/components/upgrade-track-changes-modal'
-import { useUserSettingsContext } from '@/shared/context/user-settings-context'
 
 // TODO: remove this when definitely no longer used
 export * from './codemirror-context'
@@ -96,9 +95,6 @@ function CodeMirrorEditorComponents({
 }: CodeMirrorEditorComponentsProps) {
   useToolbarMenuBarEditorCommands()
   const { features } = useProjectContext()
-  const {
-    userSettings: { floatingMenu },
-  } = useUserSettingsContext()
   const writefullToolbarMigrationEnabled = useFeatureFlag(
     'writefull-toolbar-migration'
   )
@@ -113,8 +109,7 @@ function CodeMirrorEditorComponents({
 
       <MathPreviewTooltip />
       <EditorContextMenu />
-      {floatingMenu &&
-        features.trackChangesVisible &&
+      {features.trackChangesVisible &&
         (writefullToolbarMigrationEnabled ? (
           <>
             <AddCommentCommand />