Merge pull request #4126 from jlelong/jl_3995_NewDocumentCommand

Add intellisense for macros defined by \NewDocumentCommand

src/completion/completer/macro.ts

@@ -251,6 +251,20 @@ function parseAst(node: Ast.Node, filePath: string, defined?: Set<string>): CmdE
             parseInt(node.args?.[2].content?.[0].content) > 0) {
             args = (node.args?.[3].openMark === '[' ? '[]' : '{}') + '{}'.repeat(parseInt(node.args?.[2].content?.[0].content) - 1)
         }
+    } else if (node.type === 'macro' &&
+        ['ReNewDocumentCommand', 'NewDocumentCommand', 'ProvideDocumentCommand', 'DeclareDocumentCommand'].includes(node.content) &&
+        node.args?.length === 3 && node.args[0]?.content?.[0]?.type === 'macro') {
+        found = true
+        name = node.args[0].content[0].content
+        node.args[1].content.forEach((entry: Ast.Node) => {
+            if (entry.type === 'string') {
+                if (entry.content === 'm') {
+                    args += '{}'
+                } else if (entry.content === 'o' || entry.content === 'O') {
+                    args += '[]'
+                }
+            }
+        })
     }
 
     if (found && !defined.has(`${name}${args}`)) {

test/fixtures/armory/intellisense/newdocumentcommand.tex

@@ -0,0 +1,9 @@
+\documentclass[10pt]{article}
+\usepackage{xparse}
+\NewDocumentCommand\testNoArg{}{ABC}
+\DeclareDocumentCommand\testA{m}{ABC #1}
+\NewDocumentCommand{\testB}{O{}m}{ABC #2 #1}
+\ProvideDocumentCommand{\testC}{m o O{} m r() m}{ABC}
+\begin{document}
+
+\end{document}

test/suites/04_intellisense.test.ts

@@ -156,6 +156,17 @@ suite('Intellisense test suite', () => {
         assert.ok(suggestions.labels.includes('\\fix[]{}{}'))
     })
 
+    test.run('command intellisense with cmds defined by \\NewDocumentCommand', async (fixture: string) => {
+        await test.load(fixture, [
+            {src: 'intellisense/newdocumentcommand.tex', dst: 'main.tex'}
+        ])
+        const suggestions = test.suggest(0, 1)
+        assert.ok(suggestions.labels.includes('\\testNoArg'))
+        assert.ok(suggestions.labels.includes('\\testA{}'))
+        assert.ok(suggestions.labels.includes('\\testB[]{}'))
+        assert.ok(suggestions.labels.includes('\\testC{}[][]{}{}'))
+    })
+
     test.run('command intellisense with config `intellisense.argumentHint.enabled`', async (fixture: string) => {
         await vscode.workspace.getConfiguration('latex-workshop').update('intellisense.argumentHint.enabled', true)
         await test.load(fixture, [