github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-03 16:02:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[cm6] Configure "4 spaces" as the indent unit for all files (#14366)

Browse source 
GitOrigin-RevId: 5aed6bc5abfd194c11830bdedcbba65ef1ed0522
This commit is contained in:
Alf Eaton 2023-08-17 11:01:10 +01:00 committed by Copybot
parent 2d15ce8d05
commit fbb0ab210e
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/frontend/js/features/source-editor/extensions/index.ts
View file

@ -7,7 +7,7 @@ import {
highlightActiveLineGutter, highlightActiveLineGutter,
} from '@codemirror/view' } from '@codemirror/view'
import { EditorState, Extension } from '@codemirror/state' 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 { history } from '@codemirror/commands'
import { language } from './language' import { language } from './language'
import { lineWrappingIndentation } from './line-wrapping-indentation' 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` // NOTE: `annotations` needs to be before `language`
annotations(), annotations(),
language(options.currentDoc, options.metadata, options.settings), language(options.currentDoc, options.metadata, options.settings),
indentUnit.of(' '), // 4 spaces
theme(options.theme), theme(options.theme),
realtime(options.currentDoc, options.handleError), realtime(options.currentDoc, options.handleError),
cursorPosition(options.currentDoc), cursorPosition(options.currentDoc),

6
services/web/frontend/js/features/source-editor/languages/bibtex/index.ts
View file

@ -1,8 +1,6 @@
import { LanguageSupport, indentUnit } from '@codemirror/language' import { LanguageSupport } from '@codemirror/language'
import { BibTeXLanguage } from './bibtex-language' import { BibTeXLanguage } from './bibtex-language'
export const bibtex = () => { export const bibtex = () => {
return new LanguageSupport(BibTeXLanguage, [ return new LanguageSupport(BibTeXLanguage)
indentUnit.of(' '), // 4 spaces
])
} }

3
services/web/frontend/js/features/source-editor/languages/latex/index.ts
View file

@ -1,7 +1,7 @@
import { latexIndentService } from './latex-indent-service' import { latexIndentService } from './latex-indent-service'
import { shortcuts } from './shortcuts' import { shortcuts } from './shortcuts'
import { linting } from './linting' import { linting } from './linting'
import { LanguageSupport, indentUnit } from '@codemirror/language' import { LanguageSupport } from '@codemirror/language'
import { CompletionSource } from '@codemirror/autocomplete' import { CompletionSource } from '@codemirror/autocomplete'
import { openAutocomplete } from './open-autocomplete' import { openAutocomplete } from './open-autocomplete'
import { metadata } from './metadata' import { metadata } from './metadata'
@ -30,7 +30,6 @@ const completionSources: CompletionSource[] = [
export const latex = () => { export const latex = () => {
return new LanguageSupport(LaTeXLanguage, [ return new LanguageSupport(LaTeXLanguage, [
indentUnit.of(' '), // 4 spaces
shortcuts(), shortcuts(),
documentOutline.extension, documentOutline.extension,
documentCommands.extension, documentCommands.extension,