From fbb0ab210e78084115db4bbeeb370c4ac3a1a5c6 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Thu, 17 Aug 2023 11:01:10 +0100
Subject: [PATCH] [cm6] Configure "4 spaces" as the indent unit for all files
 (#14366)

GitOrigin-RevId: 5aed6bc5abfd194c11830bdedcbba65ef1ed0522
---
 .../frontend/js/features/source-editor/extensions/index.ts  | 3 ++-
 .../js/features/source-editor/languages/bibtex/index.ts     | 6 ++----
 .../js/features/source-editor/languages/latex/index.ts      | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/services/web/frontend/js/features/source-editor/extensions/index.ts b/services/web/frontend/js/features/source-editor/extensions/index.ts
index 0621f58db4..7ca37d2f5a 100644
--- a/services/web/frontend/js/features/source-editor/extensions/index.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/index.ts
@@ -7,7 +7,7 @@ import {
   highlightActiveLineGutter,
 } from '@codemirror/view'
 import { EditorState, Extension } from '@codemirror/state'
-import { foldGutter, indentOnInput } from '@codemirror/language'
+import { foldGutter, indentOnInput, indentUnit } from '@codemirror/language'
 import { history } from '@codemirror/commands'
 import { language } from './language'
 import { lineWrappingIndentation } from './line-wrapping-indentation'
@@ -107,6 +107,7 @@ export const createExtensions = (options: Record<string, any>): Extension[] => [
   // NOTE: `annotations` needs to be before `language`
   annotations(),
   language(options.currentDoc, options.metadata, options.settings),
+  indentUnit.of('    '), // 4 spaces
   theme(options.theme),
   realtime(options.currentDoc, options.handleError),
   cursorPosition(options.currentDoc),
diff --git a/services/web/frontend/js/features/source-editor/languages/bibtex/index.ts b/services/web/frontend/js/features/source-editor/languages/bibtex/index.ts
index 74c30f301c..826db93f7d 100644
--- a/services/web/frontend/js/features/source-editor/languages/bibtex/index.ts
+++ b/services/web/frontend/js/features/source-editor/languages/bibtex/index.ts
@@ -1,8 +1,6 @@
-import { LanguageSupport, indentUnit } from '@codemirror/language'
+import { LanguageSupport } from '@codemirror/language'
 import { BibTeXLanguage } from './bibtex-language'
 
 export const bibtex = () => {
-  return new LanguageSupport(BibTeXLanguage, [
-    indentUnit.of('    '), // 4 spaces
-  ])
+  return new LanguageSupport(BibTeXLanguage)
 }
diff --git a/services/web/frontend/js/features/source-editor/languages/latex/index.ts b/services/web/frontend/js/features/source-editor/languages/latex/index.ts
index c3a7503ca1..c48d3f4f49 100644
--- a/services/web/frontend/js/features/source-editor/languages/latex/index.ts
+++ b/services/web/frontend/js/features/source-editor/languages/latex/index.ts
@@ -1,7 +1,7 @@
 import { latexIndentService } from './latex-indent-service'
 import { shortcuts } from './shortcuts'
 import { linting } from './linting'
-import { LanguageSupport, indentUnit } from '@codemirror/language'
+import { LanguageSupport } from '@codemirror/language'
 import { CompletionSource } from '@codemirror/autocomplete'
 import { openAutocomplete } from './open-autocomplete'
 import { metadata } from './metadata'
@@ -30,7 +30,6 @@ const completionSources: CompletionSource[] = [
 
 export const latex = () => {
   return new LanguageSupport(LaTeXLanguage, [
-    indentUnit.of('    '), // 4 spaces
     shortcuts(),
     documentOutline.extension,
     documentCommands.extension,