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

Only exclude the current command from autocompletion (#14367)

Browse source 
GitOrigin-RevId: 1f1dc0f2c3bcd19b12e06ec56d2d82181b0b5c6d
This commit is contained in:
Alf Eaton 2023-08-17 11:01:33 +01:00 committed by Copybot
parent fbb0ab210e
commit 06aa92d0fd
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/web/frontend/js/features/source-editor/languages/latex/completions/doc-commands.ts
View file

@ -2,6 +2,7 @@ import { applySnippet, extendOverUnpairedClosingBrace } from './apply'
import { Completion, CompletionContext } from '@codemirror/autocomplete' import { Completion, CompletionContext } from '@codemirror/autocomplete'
import { documentCommands } from '../document-commands' import { documentCommands } from '../document-commands'
import { Command } from '../../../utils/tree-operations/commands' import { Command } from '../../../utils/tree-operations/commands'
import { syntaxTree } from '@codemirror/language'
const commandNameFromLabel = (label: string): string | undefined => const commandNameFromLabel = (label: string): string | undefined =>
label.match(/^\\\w+/)?.[0] label.match(/^\\\w+/)?.[0]
@ -36,9 +37,8 @@ export function customCommandCompletions(
} }
const countCommandUsage = (context: CompletionContext) => { const countCommandUsage = (context: CompletionContext) => {
const { doc } = context.state const tree = syntaxTree(context.state)
const currentNode = tree.resolveInner(context.pos, -1)
const excludeLineNumber = doc.lineAt(context.pos).number
const result = new Map< const result = new Map<
string, string,
@ -51,7 +51,7 @@ const countCommandUsage = (context: CompletionContext) => {
} }
for (const command of commandListProjection.items) { for (const command of commandListProjection.items) {
if (command.line === excludeLineNumber) { if (command.from === currentNode.from) {
continue continue
} }
const label = buildLabel(command) const label = buildLabel(command)

19
services/web/test/frontend/features/source-editor/components/codemirror-editor-autocomplete.spec.tsx
View file

@ -1064,4 +1064,23 @@ describe('autocomplete', { scrollBehavior: false }, function () {
cy.findAllByRole('option').contains('sometext.txt').click() cy.findAllByRole('option').contains('sometext.txt').click()
activeEditorLine().should('have.text', '\\input{sometext.txt}') activeEditorLine().should('have.text', '\\input{sometext.txt}')
}) })
it('excludes the current command from completions', function () {
const scope = mockScope(mockDocContent(''))
cy.mount(
<Container>
<EditorProviders scope={scope}>
<CodeMirrorEditor />
</EditorProviders>
</Container>
)
cy.get('.cm-line').eq(21).type('\\fff \\ff')
cy.findAllByRole('listbox').should('have.length', 1)
cy.findAllByRole('option').contains('\\fff').click()
cy.get('.cm-line').eq(21).should('have.text', '\\fff \\fff')
})
}) })