feat(diagnostic): add target to diagnosticInfo (#4642)

closes #4633
neoclide · Aug 31, 2023 · 5571414 · 5571414
1 parent e4ffae5
commit 5571414
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/__tests__/modules/diagnosticBuffer.test.ts b/src/__tests__/modules/diagnosticBuffer.test.ts
@@ -45,7 +45,7 @@ describe('diagnostic buffer', () => {
       helper.updateConfiguration('diagnostic.messageTarget', 'echo')
       let buf = await createDiagnosticBuffer()
       let diagnostics = [createDiagnostic('foo')]
-      let res = await buf.showFloat(diagnostics)
+      let res = await buf.showFloat(diagnostics, 'echo')
       expect(res).toBe(false)
     })
 

diff --git a/src/diagnostic/buffer.ts b/src/diagnostic/buffer.ts
@@ -282,10 +282,11 @@ export class DiagnosticBuffer implements SyncItem {
   /**
    * Echo diagnostic message under cursor.
    */
-  public async echoMessage(truncate = false, position: Position): Promise<boolean> {
+  public async echoMessage(truncate = false, position: Position, target?: string): Promise<boolean> {
     const config = this.config
     if (!config.enable || config.enableMessage === 'never' || config.displayByAle) return false
-    let useFloat = config.messageTarget == 'float'
+    if (!target) target = config.messageTarget
+    let useFloat = target == 'float'
     let diagnostics = this.getDiagnosticsAtPosition(position)
     if (config.messageLevel) {
       diagnostics = diagnostics.filter(diagnostic => {
@@ -316,8 +317,8 @@ export class DiagnosticBuffer implements SyncItem {
     return true
   }
 
-  public async showFloat(diagnostics: Diagnostic[]): Promise<boolean> {
-    if (this.config.messageTarget !== 'float') return false
+  public async showFloat(diagnostics: Diagnostic[], target = 'float'): Promise<boolean> {
+    if (target !== 'float') return false
     if (!floatFactory) floatFactory = window.createFloatFactory({ modes: ['n'], autoHide: true })
     if (diagnostics.length == 0) {
       floatFactory.close()

diff --git a/src/diagnostic/manager.ts b/src/diagnostic/manager.ts
@@ -423,11 +423,11 @@ class DiagnosticManager implements Disposable {
     return res[0].getDiagnosticsAtPosition(res[1])
   }
 
-  public async echoCurrentMessage(): Promise<void> {
+  public async echoCurrentMessage(target?: string): Promise<void> {
     let res = await this.getBufferAndPosition()
     if (!res) return
     let [item, position] = res
-    await item.echoMessage(false, position)
+    await item.echoMessage(false, position, target)
   }
 
   public async jumpRelated(): Promise<void> {

diff --git a/src/plugin.ts b/src/plugin.ts
@@ -97,7 +97,7 @@ export default class Plugin {
     this.addAction('refreshSource', name => sources.refresh(name))
     this.addAction('toggleSource', name => sources.toggleSource(name))
     this.addAction('diagnosticRefresh', bufnr => diagnosticManager.refresh(bufnr))
-    this.addAction('diagnosticInfo', () => diagnosticManager.echoCurrentMessage())
+    this.addAction('diagnosticInfo', target => diagnosticManager.echoCurrentMessage(target))
     this.addAction('diagnosticToggle', enable => diagnosticManager.toggleDiagnostic(enable))
     this.addAction('diagnosticToggleBuffer', (bufnr, enable) => diagnosticManager.toggleDiagnosticBuffer(bufnr, enable))
     this.addAction('diagnosticNext', severity => diagnosticManager.jumpNext(severity))