Fix circular dependency

.gitattributes

@@ -0,0 +1 @@
+*.ftl linguist-detectable=false

.madgerc

@@ -0,0 +1,7 @@
+{
+	"detectiveOptions": {
+		"ts": {
+			"skipTypeImports": true
+		}
+	}
+}

src/compile/build.ts

@@ -3,7 +3,7 @@ import * as path from 'path'
 import * as fs from 'fs'
 import * as cp from 'child_process'
 import * as cs from 'cross-spawn'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { replaceArgumentPlaceholders } from '../utils/utils'
 import { AutoBuildInitiated, AutoCleaned, BuildDone } from '../core/event-bus'
 import { getLogger } from '../utils/logging/logger'
@@ -104,9 +104,9 @@ export class Builder {
         }
         const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(file))
         if (!bibChanged && lw.manager.localRootFile && configuration.get('latex.rootFile.useSubFile')) {
-            return lw.commander.build(true, lw.manager.localRootFile, lw.manager.rootFileLanguageId)
+            return lw.commands.build(true, lw.manager.localRootFile, lw.manager.rootFileLanguageId)
         } else {
-            return lw.commander.build(true, lw.manager.rootFile, lw.manager.rootFileLanguageId)
+            return lw.commands.build(true, lw.manager.rootFile, lw.manager.rootFileLanguageId)
         }
     }
 

src/completion/bibtex.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { getBibtexFormatConfig, type BibtexFormatConfig } from '../lint/bibtexformatterlib/bibtexutils'
 
 import { getLogger } from '../utils/logging/logger'

src/completion/completer/argument.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode'
-import * as lw from '../../lw'
+import { lw } from '../../lw'
 import type { IProvider, IProviderArgs } from '../latex'
 import { CmdEnvSuggestion, filterArgumentHint } from './completerutils'
 import { EnvSnippetType } from './environment'

src/completion/completer/atsuggestion.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
-import * as lw from '../../lw'
+import { lw, registerDisposable } from '../../lw'
 import type {IProvider, IProviderArgs} from '../latex'
 import {escapeRegExp} from '../../utils/utils'
 
@@ -23,7 +23,7 @@ export class AtSuggestion implements IProvider {
 
         const allSuggestions: {[key: string]: AtSuggestionItemEntry} = JSON.parse(fs.readFileSync(`${lw.extensionRoot}/data/at-suggestions.json`).toString()) as DataAtSuggestionJsonType
         this.initialize(allSuggestions)
-        lw.registerDisposable(vscode.workspace.onDidChangeConfiguration((e: vscode.ConfigurationChangeEvent) => {
+        registerDisposable(vscode.workspace.onDidChangeConfiguration((e: vscode.ConfigurationChangeEvent) => {
             if (e.affectsConfiguration('latex-workshop.intellisense.atSuggestion.user')) {
                 this.initialize(allSuggestions)
             }

src/completion/completer/citation.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
 import {bibtexParser} from 'latex-utensils'
-import * as lw from '../../lw'
+import { lw } from '../../lw'
 import * as eventbus from '../../core/event-bus'
 import {trimMultiLineString} from '../../utils/utils'
 import {computeFilteringRange} from './completerutils'

src/completion/completer/command.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
 import type * as Ast from '@unified-latex/unified-latex-types'
-import * as lw from '../../lw'
+import { lw, registerDisposable } from '../../lw'
 import type { IProvider, ICompletionItem, PkgType, IProviderArgs } from '../latex'
 import { CmdEnvSuggestion, splitSignatureString, filterNonLetterSuggestions, filterArgumentHint } from './completerutils'
 import {SurroundCommand} from './commandlib/surround'
@@ -55,7 +55,7 @@ export class Command implements IProvider {
         const symbols: { [key: string]: CmdType } = JSON.parse(fs.readFileSync(`${lw.extensionRoot}/data/unimathsymbols.json`).toString()) as DataUnimathSymbolsJsonType
         Object.entries(symbols).forEach(([key, symbol]) => this.defaultSymbols.push(this.entryCmdToCompletion(key, symbol)))
 
-        lw.registerDisposable(vscode.workspace.onDidChangeConfiguration((e: vscode.ConfigurationChangeEvent) => {
+        registerDisposable(vscode.workspace.onDidChangeConfiguration((e: vscode.ConfigurationChangeEvent) => {
             if (!e.affectsConfiguration('latex-workshop.intellisense.command.user') &&
                 !e.affectsConfiguration('latex-workshop.intellisense.package.exclude')) {
                 return

src/completion/completer/documentclass.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
-import * as lw from '../../lw'
+import { lw } from '../../lw'
 import type { IProvider } from '../latex'
 
 type DataClassnamesJsonType = typeof import('../../../data/classnames.json')

src/completion/completer/environment.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
 import type * as Ast from '@unified-latex/unified-latex-types'
-import * as lw from '../../lw'
+import { lw, registerDisposable } from '../../lw'
 import type { ICompletionItem, IProvider, IProviderArgs } from '../latex'
 import { CmdEnvSuggestion, splitSignatureString, filterNonLetterSuggestions, filterArgumentHint } from './completerutils'
 
@@ -44,7 +44,7 @@ export class Environment implements IProvider {
     private readonly packageEnvsForBegin= new Map<string, CmdEnvSuggestion[]>()
 
     constructor() {
-        lw.registerDisposable(vscode.workspace.onDidChangeConfiguration((e: vscode.ConfigurationChangeEvent) => {
+        registerDisposable(vscode.workspace.onDidChangeConfiguration((e: vscode.ConfigurationChangeEvent) => {
             if (!e.affectsConfiguration('latex-workshop.intellisense.package.exclude')) {
                 return
             }

src/completion/completer/glossary.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import type * as Ast from '@unified-latex/unified-latex-types'
-import * as lw from '../../lw'
+import { lw } from '../../lw'
 import type { ICompletionItem, IProvider } from '../latex'
 import { Cache } from '../../core/cache'
 import { argContentToStr } from '../../utils/parser'

src/completion/completer/input.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import * as fs from 'fs'
 import * as path from 'path'
 import * as micromatch from 'micromatch'
-import * as lw from '../../lw'
+import { lw } from '../../lw'
 import type { IProvider, IProviderArgs } from '../latex'
 
 import { getLogger } from '../../utils/logging/logger'

src/completion/completer/package.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
 import type * as Ast from '@unified-latex/unified-latex-types'
-import * as lw from '../../lw'
+import { lw } from '../../lw'
 import type { IProvider } from '../latex'
 import { argContentToStr } from '../../utils/parser'
 import { Cache } from '../../core/cache'

src/completion/completer/reference.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import * as fs from 'fs'
 import * as path from 'path'
 import type * as Ast from '@unified-latex/unified-latex-types'
-import * as lw from '../../lw'
+import { lw } from '../../lw'
 import { getLongestBalancedString, stripEnvironments } from '../../utils/utils'
 import { computeFilteringRange } from './completerutils'
 import type { IProvider, ICompletionItem, IProviderArgs } from '../latex'

src/completion/latex.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
 import * as path from 'path'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { Citation } from './completer/citation'
 import { DocumentClass } from './completer/documentclass'
 import { Command } from './completer/command'

src/core/cache.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import * as fs from 'fs'
 import * as path from 'path'
 import type * as Ast from '@unified-latex/unified-latex-types'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import * as eventbus from './event-bus'
 import * as utils from '../utils/utils'
 import type { CmdEnvSuggestion } from '../completion/completer/completerutils'

src/core/cacherlib/pathutils.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import * as path from 'path'
 import * as cs from 'cross-spawn'
 import * as fs from 'fs'
-import * as lw from '../../lw'
+import { lw } from '../../lw'
 import * as utils from '../../utils/utils'
 import { getLogger } from '../../utils/logging/logger'
 

src/core/cacherlib/watcher.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
 import * as path from 'path'
-import * as lw from '../../lw'
+import { lw } from '../../lw'
 import * as eventbus from '../event-bus'
 import { getLogger } from '../../utils/logging/logger'
 import { isBinary } from '../root-file'

src/core/commands.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import * as path from 'path'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { getSurroundingCommandRange, stripText } from '../utils/utils'
 import { getLogger } from '../utils/logging/logger'
 import { parser } from '../parse/parser'

src/core/root-file.ts

@@ -4,7 +4,7 @@ import * as path from 'path'
 import * as fs from 'fs'
 import * as tmp from 'tmp'
 import * as utils from '../utils/utils'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import * as eventbus from './event-bus'
 import { getLogger } from '../utils/logging/logger'
 

src/extras/activity-bar.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode'
-import * as lw from '../lw'
+import { lw } from '../lw'
 
 export class LaTeXCommanderTreeView {
     private readonly latexCommanderProvider: LaTeXCommanderProvider

src/extras/cleaner.ts

@@ -3,7 +3,7 @@ import * as path from 'path'
 import * as fs from 'fs'
 import { glob } from 'glob'
 import * as cs from 'cross-spawn'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { replaceArgumentPlaceholders } from '../utils/utils'
 
 import { getLogger } from '../utils/logging/logger'

src/extras/counter.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import * as fs from 'fs'
 import * as path from 'path'
 import * as cs from 'cross-spawn'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { getLogger } from '../utils/logging/logger'
 
 const logger = getLogger('Counter')

src/extras/math-preview-panel.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import * as path from 'path'
 import type { TexMathEnv } from '../preview/math/mathpreview'
 import { moveWebviewPanel } from '../utils/webview'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { getLogger } from '../utils/logging/logger'
 
 const logger = getLogger('Preview', 'Math')

src/extras/snippet-view.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import {readFileSync} from 'fs'
 import * as path from 'path'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import {replaceWebviewPlaceholders} from '../utils/webview'
 
 

src/extras/texdoc.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import * as cs from 'cross-spawn'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { getLogger } from '../utils/logging/logger'
 
 const logger = getLogger('TeXDoc')

src/language/definition.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
 import * as fs from 'fs'
 import * as path from 'path'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { tokenizer } from '../utils/tokenizer'
 import * as utils from '../utils/utils'
 

src/language/selection.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import type * as Ast from '@unified-latex/unified-latex-types'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { getLogger } from '../utils/logging/logger'
 
 const logger = getLogger('Selection')

src/language/symbol-document.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
-import * as lw from '../lw'
-import { TeXElement, TeXElementType } from '../outline/project'
+import { lw } from '../lw'
+import { TeXElement, TeXElementType } from '../outline/structurelib/types'
 import { buildBibTeX } from '../outline/structurelib/bibtex'
 import { construct as constructLaTeX } from '../outline/structurelib/latex'
 import { construct } from '../outline/structurelib/doctex'

src/language/symbol-project.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { construct } from '../outline/structurelib/latex'
-import { TeXElement } from '../outline/project'
+import { TeXElement } from '../outline/structurelib/types'
 
 export class ProjectSymbolProvider implements vscode.WorkspaceSymbolProvider {
 

src/lint/duplicate-label.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import * as path from 'path'
-import * as lw from '../lw'
+import { lw } from '../lw'
 
 const duplicatedLabelsDiagnostics = vscode.languages.createDiagnosticCollection('Duplicate Labels')
 

src/lint/latex-formatter.ts

@@ -3,7 +3,7 @@ import * as cs from 'cross-spawn'
 import * as path from 'path'
 import * as fs from 'fs'
 import * as os from 'os'
-import * as lw from '../lw'
+import { lw, registerDisposable } from '../lw'
 import {replaceArgumentPlaceholders} from '../utils/utils'
 import { getLogger } from '../utils/logging/logger'
 
@@ -195,7 +195,7 @@ class LatexFormatterProvider implements vscode.DocumentFormattingEditProvider, v
             logger.log('LaTexFormatter: Unsupported OS')
         }
 
-        lw.registerDisposable(vscode.workspace.onDidChangeConfiguration((e: vscode.ConfigurationChangeEvent) => {
+        registerDisposable(vscode.workspace.onDidChangeConfiguration((e: vscode.ConfigurationChangeEvent) => {
             if (e.affectsConfiguration('latex-workshop.latexindent.path')) {
                 formatter = ''
             }

src/lint/latex-linter.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import { chkTeX } from './linterlib/chktex'
 import { laCheck } from './linterlib/lacheck'
 import { getLogger } from '../utils/logging/logger'

src/lint/linterlib/chktex.ts

@@ -3,7 +3,7 @@ import * as path from 'path'
 import * as fs from 'fs'
 import * as os from 'os'
 import { ChildProcessWithoutNullStreams, spawn } from 'child_process'
-import * as lw from '../../lw'
+import { lw } from '../../lw'
 import type { ILinter } from '../latex-linter'
 import { processWrapper } from './linterutils'
 import { convertFilenameEncoding } from '../../utils/convertfilename'

src/lint/linterlib/lacheck.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import * as path from 'path'
 import * as fs from 'fs'
 import { ChildProcessWithoutNullStreams, spawn } from 'child_process'
-import * as lw from '../../lw'
+import { lw } from '../../lw'
 import type { ILinter } from '../latex-linter'
 import { processWrapper } from './linterutils'
 import { convertFilenameEncoding } from '../../utils/convertfilename'

src/locate/environment.ts

@@ -176,6 +176,16 @@ export class EnvPair {
                     return currentCommandPair
                 }
             }
+            // #4063
+            if (node.content === 'item' && node.args) {
+                for (let argIndex = 0; argIndex < node.args.length; argIndex++) {
+                    for (let index = 0; index < node.args[argIndex].content.length; index++) {
+                        const subnode = node.args[argIndex].content[index]
+                        const subnext = index === node.args[argIndex].content.length - 1 ? undefined : node.args[argIndex].content[index + 1]
+                        parentCommandPair = this.buildCommandPairTreeFromNode(doc, subnode, subnext, parentCommandPair, commandPairs)
+                    }
+                }
+            }
         }
         return parentCommandPair
     }

src/locate/synctex.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import * as fs from 'fs'
 import * as path from 'path'
 import * as cs from 'cross-spawn'
-import * as lw from '../lw'
+import { lw } from '../lw'
 import * as SyncTeX from './locatorlib/synctex'
 import { replaceArgumentPlaceholders } from '../utils/utils'
 import { isSameRealPath } from '../utils/pathnormalize'