github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-15 04:51:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[visual] calculate preamble position in the main tree iterator (#13964)

Browse source 
* [cm6] use preambleCheckLimit for finding preamble

* extend in case of title or author

* stop at SectioningCommand, include affiliation

* consistent comment

* using 30000 as node index

* use preambleNodes arr

* calc preamble without array

* remove preamble.to check

GitOrigin-RevId: 2019fd2b9673f181cba8966688f1ac9a6f984279
This commit is contained in:
Domagoj Kriskovic 2023-08-03 13:59:02 +02:00 committed by Copybot
parent 083bee6545
commit e98d728bd8
1 changed files with 59 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
services/web/frontend/js/features/source-editor/extensions/visual/atomic-decorations.ts
View file

@ -165,67 +165,6 @@ export const atomicDecorations = (options: Options) => {
}[]
} = { from: 0, to: 0, authors: [] }
// find the positions of the title and author in the preamble
tree.iterate({
enter(nodeRef) {
if (nodeRef.type.is('DocumentEnvironment')) {
// Attempt to include \begin{document} in the preamble
preamble.to = nodeRef.node.getChild('Content')?.from ?? nodeRef.from
return false
} else if (nodeRef.type.is('Title')) {
const node = nodeRef.node.getChild('TextArgument')
if (node) {
const content = state.sliceDoc(node.from, node.to)
preamble.title = { node, content }
}
} else if (nodeRef.type.is('Author')) {
const node = nodeRef.node.getChild('TextArgument')
if (node) {
const content = state.sliceDoc(node.from, node.to)
preamble.authors.push({ node, content })
}
}
},
})
if (preamble.to > 0) {
// hide the preamble. We use selectionIntersects directly, so that it also
// expands in readOnly mode.
const endLine = state.doc.lineAt(preamble.to).number
for (let lineNumber = 1; lineNumber <= endLine; ++lineNumber) {
const line = state.doc.line(lineNumber)
const classes = ['ol-cm-preamble-line']
if (lineNumber === 1) {
classes.push('ol-cm-environment-first-line')
}
if (lineNumber === endLine) {
classes.push('ol-cm-environment-last-line')
}
decorations.push(
Decoration.line({
class: classes.join(' '),
}).range(line.from)
)
}
const isExpanded = selectionIntersects(state.selection, preamble)
if (!isExpanded) {
decorations.push(
Decoration.replace({
widget: new PreambleWidget(preamble.to, isExpanded),
block: true,
}).range(0, preamble.to)
)
} else {
decorations.push(
Decoration.widget({
widget: new PreambleWidget(preamble.to, isExpanded),
block: true,
side: -1,
}).range(0)
)
}
}
const startListEnvironment = (envName: ListEnvironmentName) => {
if (currentListEnvironment) {
listEnvironmentStack.push(currentListEnvironment)
@ -242,6 +181,27 @@ export const atomicDecorations = (options: Options) => {
tree.iterate({
enter(nodeRef) {
if (nodeRef.node.type.is('Maketitle')) {
preamble.to = nodeRef.node.from
} else if (nodeRef.node.type.is('DocumentEnvironment')) {
preamble.to =
nodeRef.node.getChild('Content')?.from ?? nodeRef.node.from
} else if (nodeRef.node.type.is('Title')) {
const node = nodeRef.node.getChild('TextArgument')
if (node) {
const content = state.sliceDoc(node.from, node.to)
preamble.title = { node, content }
preamble.to = nodeRef.node.to
}
} else if (nodeRef.node.type.is('Author')) {
const node = nodeRef.node.getChild('TextArgument')
if (node) {
const content = state.sliceDoc(node.from, node.to)
preamble.authors.push({ node, content })
preamble.to = nodeRef.node.to
}
}
if (nodeRef.type.is('$Environment')) {
const envName = getUnstarredEnvironmentName(nodeRef.node, state)
const hideInEnvironmentTypes = [
@ -1048,6 +1008,44 @@ export const atomicDecorations = (options: Options) => {
},
})
if (preamble.to > 0) {
// hide the preamble. We use selectionIntersects directly, so that it also
// expands in readOnly mode.
const endLine = state.doc.lineAt(preamble.to).number
for (let lineNumber = 1; lineNumber <= endLine; ++lineNumber) {
const line = state.doc.line(lineNumber)
const classes = ['ol-cm-preamble-line']
if (lineNumber === 1) {
classes.push('ol-cm-environment-first-line')
}
if (lineNumber === endLine) {
classes.push('ol-cm-environment-last-line')
}
decorations.push(
Decoration.line({
class: classes.join(' '),
}).range(line.from)
)
}
const isExpanded = selectionIntersects(state.selection, preamble)
if (!isExpanded) {
decorations.push(
Decoration.replace({
widget: new PreambleWidget(preamble.to, isExpanded),
block: true,
}).range(0, preamble.to)
)
} else {
decorations.push(
Decoration.widget({
widget: new PreambleWidget(preamble.to, isExpanded),
block: true,
side: -1,
}).range(0)
)
}
}
return Decoration.set(decorations, true)
}