Extract AtSuggestionCompleter

src/providers/atsuggestion.ts

@@ -0,0 +1,53 @@
+import * as vscode from 'vscode'
+
+import { AtSuggestion } from './atsuggestionlib/atsuggestion'
+import { escapeRegExp } from '../utils/utils'
+
+export class AtSuggestionCompleter implements vscode.CompletionItemProvider {
+    private readonly atSuggestion: AtSuggestion
+    private readonly triggerCharacter: string
+
+    constructor(
+        extension: {
+            readonly extensionRoot: string
+        },
+        triggerCharacter: string
+    ) {
+        this.atSuggestion = new AtSuggestion(extension, triggerCharacter)
+        this.triggerCharacter = triggerCharacter
+    }
+
+    get readyPromise() {
+        return this.atSuggestion.readyPromise
+    }
+
+    provideCompletionItems(
+        document: vscode.TextDocument,
+        position: vscode.Position,
+        token: vscode.CancellationToken,
+        context: vscode.CompletionContext
+    ): vscode.CompletionItem[] | undefined {
+        const line = document.lineAt(position).text.substring(0, position.character)
+        return this.completion(line, {document, position, token, context})
+    }
+
+    private completion(
+        line: string,
+        args: {
+            document: vscode.TextDocument,
+            position: vscode.Position,
+            token: vscode.CancellationToken,
+            context: vscode.CompletionContext
+        }
+    ): vscode.CompletionItem[] {
+        const escapedTriggerCharacter = escapeRegExp(this.triggerCharacter)
+        const reg = new RegExp(escapedTriggerCharacter + '[^\\\\s]*$')
+        const result = line.match(reg)
+        let suggestions: vscode.CompletionItem[] = []
+        if (result) {
+            suggestions = this.atSuggestion.provideFrom(result, args)
+        }
+        return suggestions
+    }
+
+}

src/providers/completer/atsuggestion.ts → src/providers/atsuggestionlib/atsuggestion.ts

@@ -1,9 +1,9 @@
 import * as vscode from 'vscode'
 
-import type {IProvider} from './interface'
-import {escapeRegExp} from '../../utils/utils'
+import type { IProvider } from '../completer/interface'
+import { escapeRegExp } from '../../utils/utils'
 import { readFilePath } from '../../lib/lwfs/lwfs'
-import { CommandKind } from './completionkind'
+import { CommandKind } from '../completer/completionkind'
 
 
 export interface AtSuggestionItemEntry {
@@ -99,4 +99,5 @@ export class AtSuggestion implements IProvider {
         })
         return this.suggestions
     }
+
 }

src/providers/completion.ts

@@ -8,12 +8,10 @@ import {Command} from './completer/command'
 import type {CmdItemEntry} from './completer/command'
 import {Environment} from './completer/environment'
 import type {EnvItemEntry} from './completer/environment'
-import {AtSuggestion} from './completer/atsuggestion'
 import {LabelDefinition} from './completer/labeldefinition'
 import {Package} from './completer/package'
 import {Input, Import, SubImport} from './completer/input'
 import {Glossary} from './completer/glossary'
-import {escapeRegExp} from '../utils/utils'
 import { readFilePath } from '../lib/lwfs/lwfs'
 import { BracketReplacer } from './completer/bracketreplacer'
 import { CommandRemover } from './completer/commandremover'
@@ -47,7 +45,6 @@ export class Completer implements vscode.CompletionItemProvider {
     private readonly import: Import
     private readonly subImport: SubImport
     readonly glossary: Glossary
-    readonly atSuggestionCompleter: AtSuggestionCompleter
     private readonly bracketReplacer: BracketReplacer
     private readonly commandAdder: CommandAdder
     private readonly commandRemover: CommandRemover
@@ -77,7 +74,6 @@ export class Completer implements vscode.CompletionItemProvider {
         this.import = new Import(extension)
         this.subImport = new SubImport(extension)
         this.glossary = new Glossary(extension)
-        this.atSuggestionCompleter = new AtSuggestionCompleter(extension)
         this.bracketReplacer = new BracketReplacer()
         this.commandAdder = new CommandAdder(this.command)
         this.commandRemover = new CommandRemover()
@@ -90,7 +86,6 @@ export class Completer implements vscode.CompletionItemProvider {
             this.command.readyPromise,
             this.environment.readyPromise,
             this.package.readyPromise,
-            this.atSuggestionCompleter.readyPromise
         ]).then(() => resolve()))
     }
 
@@ -275,41 +270,4 @@ export class Completer implements vscode.CompletionItemProvider {
     }
 }
 
-export class AtSuggestionCompleter implements vscode.CompletionItemProvider {
-    private readonly atSuggestion: AtSuggestion
-    private readonly triggerCharacter: string
 
-    constructor(extension: {
-        readonly extensionRoot: string
-    }) {
-        const configuration = vscode.workspace.getConfiguration('latex-toybox')
-        const triggerCharacter = configuration.get('intellisense.atSuggestion.trigger.latex') as string
-        this.atSuggestion = new AtSuggestion(extension, triggerCharacter)
-        this.triggerCharacter = triggerCharacter
-    }
-
-    get readyPromise() {
-        return this.atSuggestion.readyPromise
-    }
-
-    provideCompletionItems(
-        document: vscode.TextDocument,
-        position: vscode.Position,
-        token: vscode.CancellationToken,
-        context: vscode.CompletionContext
-    ): vscode.CompletionItem[] | undefined {
-        const line = document.lineAt(position).text.substring(0, position.character)
-        return this.completion(line, {document, position, token, context})
-    }
-
-    private completion(line: string, args: {document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken, context: vscode.CompletionContext}): vscode.CompletionItem[] {
-        const escapedTriggerCharacter = escapeRegExp(this.triggerCharacter)
-        const reg = new RegExp(escapedTriggerCharacter + '[^\\\\s]*$')
-        const result = line.match(reg)
-        let suggestions: vscode.CompletionItem[] = []
-        if (result) {
-            suggestions = this.atSuggestion.provideFrom(result, args)
-        }
-        return suggestions
-    }
-}

src/providersmanager.ts

@@ -13,6 +13,7 @@ import { FoldingProvider } from './providers/folding'
 import { BibtexFormatterProvider } from './providers/bibtexformatter'
 import type { Extension } from './main'
 import { MathPreviewPanelSerializer } from './components/mathpreviewpanel'
+import { AtSuggestionCompleter } from './providers/atsuggestion'
 
 
 abstract class SingleProviderManager implements vscode.Disposable {
@@ -88,9 +89,10 @@ export class ProvidersManager {
                 register(): vscode.Disposable {
                     const configuration = vscode.workspace.getConfiguration('latex-toybox')
                     const atSuggestionLatexTrigger = configuration.get('intellisense.atSuggestion.trigger.latex', '@')
+                    const atSuggestionCompleter = new AtSuggestionCompleter(extension, atSuggestionLatexTrigger)
                     return vscode.languages.registerCompletionItemProvider(
                         latexDoctexSelector,
-                        extension.completer.atSuggestionCompleter,
+                        atSuggestionCompleter,
                         atSuggestionLatexTrigger
                     )
                 }

test/completion.test.ts

@@ -9,6 +9,7 @@ import {
     runTestWithFixture,
     sleep
 } from './utils/ciutils'
+import { AtSuggestionCompleter } from '../src/providers/atsuggestion'
 
 
 function assertCompletionItemContainsSnippet(items: vscode.CompletionItem[], prefix: string, snippet: string): void {
@@ -78,7 +79,9 @@ suite('Completion test suite', () => {
         await sleep(1000)
         const pos = new vscode.Position(3,1)
         const token = new vscode.CancellationTokenSource().token
-        const items = extension.exports.realExtension.completer.atSuggestionCompleter.provideCompletionItems(
+        const atSuggestionCompleter = new AtSuggestionCompleter(extension.exports.realExtension, '@')
+        await atSuggestionCompleter.readyPromise
+        const items = atSuggestionCompleter.provideCompletionItems(
             doc, pos, token,
             {
                 triggerKind: vscode.CompletionTriggerKind.Invoke,
@@ -104,7 +107,9 @@ suite('Completion test suite', () => {
         await sleep(1000)
         const pos = new vscode.Position(3,1)
         const token = new vscode.CancellationTokenSource().token
-        const items = extension.exports.realExtension.completer.atSuggestionCompleter.provideCompletionItems(
+        const atSuggestionCompleter = new AtSuggestionCompleter(extension.exports.realExtension, '#')
+        await atSuggestionCompleter.readyPromise
+        const items = atSuggestionCompleter.provideCompletionItems(
             doc, pos, token,
             {
                 triggerKind: vscode.CompletionTriggerKind.Invoke,

test/fixtures/completion/fixture003/.vscode/settings.json

@@ -2,6 +2,5 @@
     "latex-toybox.intellisense.atSuggestionJSON.replace": {
         "@+": "\\sum",
         "@8": "",
-    },
-    "latex-toybox.intellisense.atSuggestion.trigger.latex": "#"
+    }
 }