fix(ui): revert notifications changes (#5484)

fannheyward · web-flow · commit 096b85580955 · 2025-11-19T19:28:53.000+08:00
* Revert "fix(tests): update cases of cmdline message (#5468)" This reverts commit aa90971. * Revert "feat(notification)!: ensure that the ui notification is shown (#5447)" This reverts commit 8652e89. * chore(tests): increase case timeout * feat(ui): use echom for notifications
diff --git a/autoload/coc/ui.vim b/autoload/coc/ui.vim
@@ -166,7 +166,7 @@ function! coc#ui#echo_messages(hl, msgs)
     return
   endif
   execute 'echohl '.a:hl
-  echo join(msgs, "\n")
+  echom join(msgs, "\n")
   echohl None
 endfunction
 
diff --git a/src/__tests__/completion/basic.test.ts b/src/__tests__/completion/basic.test.ts
@@ -1164,7 +1164,7 @@ describe('completion', () => {
       await helper.waitPopup()
       await helper.confirmCompletion(0)
       await helper.waitFor('getline', ['.'], 'foo.bar')
-    })
+    }, 10000)
 
     it('should should complete items without input', async () => {
       await workspace.document
diff --git a/src/__tests__/completion/sources.test.ts b/src/__tests__/completion/sources.test.ts
@@ -205,8 +205,8 @@ describe('vim source', () => {
   it('should show error for bad source file', async () => {
     let filepath = createSourceFile('tmp', '')
     await sources.createVimSourceExtension(filepath)
-    let res = await helper.doAction('notificationHistory')
-    expect(res[res.length - 1].message).toMatch('Error')
+    let line = await helper.getCmdline()
+    expect(line).toMatch('Error')
   })
 
   it('should register filetypes extension for vim source', async () => {
diff --git a/src/__tests__/core/files.test.ts b/src/__tests__/core/files.test.ts
@@ -150,8 +150,8 @@ describe('applyEdits()', () => {
     }
     let res = await workspace.applyEdit(workspaceEdit)
     expect(res).toBe(false)
-    const notifications = await helper.doAction('notificationHistory')
-    expect(notifications[notifications.length - 1].message).toMatch('Error')
+    let line = await helper.getCmdline()
+    expect(line).toMatch('Error')
   })
 
   it('should apply TextEdit of documentChanges', async () => {
diff --git a/src/__tests__/handler/callHierarchy.test.ts b/src/__tests__/handler/callHierarchy.test.ts
@@ -103,8 +103,8 @@ describe('CallHierarchy', () => {
 
   it('should show warning when provider does not exist', async () => {
     await helper.doAction('showIncomingCalls')
-    let res = await helper.doAction('notificationHistory')
-    expect(res[res.length - 1].message).toMatch('not found')
+    let line = await helper.getCmdline()
+    expect(line).toMatch('not found')
   })
 
   it('should show message when no result returned.', async () => {
@@ -120,8 +120,8 @@ describe('CallHierarchy', () => {
       }
     }))
     await callHierarchy.showCallHierarchyTree('incoming')
-    let res = await helper.doAction('notificationHistory')
-    expect(res[res.length - 1].message).toMatch('Unable')
+    let line = await helper.getCmdline()
+    expect(line).toMatch('Unable')
   })
 
   it('should render description and support default action', async () => {
diff --git a/src/__tests__/handler/codeActions.test.ts b/src/__tests__/handler/codeActions.test.ts
@@ -110,11 +110,11 @@ describe('handler codeActions', () => {
       await helper.createDocument()
       currActions = []
       await helper.doAction('codeActionRange', 1, 2, CodeActionKind.QuickFix)
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('No quickfix code action')
+      let line = await helper.getCmdline()
+      expect(line).toMatch(/No quickfix code action/)
       await helper.doAction('codeActionRange', 1, 2)
-      res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('No code action available')
+      line = await helper.getCmdline()
+      expect(line).toMatch(/No code action available/)
     })
 
     it('should apply chosen action', async () => {
@@ -388,8 +388,8 @@ describe('handler codeActions', () => {
         await codeActions.doCodeAction(null, 'command', true)
       }).rejects.toThrow(Error)
       await codeActions.doCodeAction(null, 'cmd', true)
-      let notifications = await helper.doAction('notificationHistory')
-      expect(notifications[notifications.length - 1].message).toMatch('No cmd code action')
+      let line = await helper.getCmdline()
+      expect(line).toMatch('No cmd code action')
     })
 
     it('should use quickpick', async () => {
@@ -415,8 +415,8 @@ describe('handler codeActions', () => {
       currActions = []
       await helper.createDocument()
       await helper.doAction('doQuickfix')
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('No quickfix')
+      let msg = await helper.getCmdline()
+      expect(msg).toMatch('No quickfix')
     })
 
     it('should do preferred quickfix action', async () => {
diff --git a/src/__tests__/handler/codelens.test.ts b/src/__tests__/handler/codelens.test.ts
@@ -84,8 +84,8 @@ describe('codeLenes feature', () => {
 
   it('should toggle codeLens display', async () => {
     await codeLens.toggle(999)
-    let notifications = await helper.doAction('notificationHistory')
-    expect(notifications[notifications.length - 1].message).toMatch('not exists')
+    let line = await helper.getCmdline()
+    expect(line).toMatch('not exists')
     await createBufferWithCodeLens()
     await commands.executeCommand('document.toggleCodeLens')
     let doc = await workspace.document
diff --git a/src/__tests__/handler/documentColors.test.ts b/src/__tests__/handler/documentColors.test.ts
@@ -267,8 +267,8 @@ describe('Colors', () => {
     it('should show warning when color does not exist', async () => {
       await helper.createDocument()
       await colors.pickPresentation()
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('Color not found')
+      let msg = await helper.getCmdline()
+      expect(msg).toMatch('Color not found')
     })
 
     it('should not throw when presentations do not exist', async () => {
@@ -300,8 +300,8 @@ describe('Colors', () => {
     it('should show warning when color does not exist', async () => {
       await helper.createDocument()
       await colors.pickColor()
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('not found')
+      let msg = await helper.getCmdline()
+      expect(msg).toMatch('not found')
     })
 
     it('should pickColor', async () => {
diff --git a/src/__tests__/handler/inlayHint.test.ts b/src/__tests__/handler/inlayHint.test.ts
@@ -308,8 +308,8 @@ describe('InlayHint', () => {
     it('should show message when inlayHint not supported', async () => {
       let doc = await workspace.document
       handler.setState('toggle', doc.bufnr)
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('not found')
+      let cmdline = await helper.getCmdline()
+      expect(cmdline).toMatch(/not\sfound/)
     })
 
     it('should show message when not enabled', async () => {
@@ -318,8 +318,8 @@ describe('InlayHint', () => {
       let disposable = await registerProvider('')
       disposables.push(disposable)
       handler.setState('toggle', doc.bufnr)
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('not enabled')
+      let cmdline = await helper.getCmdline()
+      expect(cmdline).toMatch(/not\senabled/)
     })
 
     it('should toggle inlayHints', async () => {
diff --git a/src/__tests__/handler/outline.test.ts b/src/__tests__/handler/outline.test.ts
@@ -385,8 +385,8 @@ fun1() {}
       await nvim.command(`edit +setl\\ buftype=nofile t`)
       await workspace.document
       await symbols.showOutline(1)
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('Unable to show outline')
+      let line = await helper.getCmdline()
+      expect(line).toMatch('Unable to show outline')
     })
 
     it('should not throw when provider does not exist', async () => {
diff --git a/src/__tests__/handler/rename.test.ts b/src/__tests__/handler/rename.test.ts
@@ -163,8 +163,8 @@ describe('rename handler', () => {
 
     it('should renameCurrentWord by cursors', async () => {
       await commands.executeCommand('document.renameCurrentWord')
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('Invalid position')
+      let line = await helper.getCmdline()
+      expect(line).toMatch('Invalid position')
       let doc = await helper.createDocument('t.js')
       await nvim.setLine('foo foo foo')
       await commands.executeCommand('document.renameCurrentWord')
diff --git a/src/__tests__/handler/search.test.ts b/src/__tests__/handler/search.test.ts
@@ -75,8 +75,8 @@ describe('search', () => {
       err = e
     }
     expect(err).toBeDefined()
-    let res = await helper.doAction('notificationHistory')
-    expect(res[res.length - 1].message).toMatch('Error on command "rrg"')
+    let msg = await helper.getCmdline()
+    expect(msg).toMatch(/Error on command "rrg"/)
   })
 
   it('should show empty result when no result found', async () => {
diff --git a/src/__tests__/handler/semanticTokens.test.ts b/src/__tests__/handler/semanticTokens.test.ts
@@ -234,15 +234,15 @@ describe('semanticTokens', () => {
       let item = semanticTokens.getItem(doc.bufnr)
       await item.onCursorHold(winid, 1)
       await semanticTokens.inspectSemanticToken()
-      const res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('not enabled')
+      let line = await helper.getCmdline()
+      expect(line).toMatch('not enabled')
     })
 
     it('should show error message for buffer not attached', async () => {
       await nvim.command(`edit +setl\\ buftype=nofile foo`)
       await helper.doAction('inspectSemanticToken')
-      const res = await helper.doAction('notificationHistory')
-      expect(res[1].message).toMatch('not attached')
+      let msg = await helper.getCmdline()
+      expect(msg).toMatch(/not attached/)
     })
 
     it('should show message when not enabled', async () => {
diff --git a/src/__tests__/handler/symbols.test.ts b/src/__tests__/handler/symbols.test.ts
@@ -180,8 +180,8 @@ describe('symbols handler', () => {
       await helper.createDocument()
       await nvim.call('cursor', [3, 0])
       await symbols.selectSymbolRange(false, '', ['Function'])
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('No symbols found')
+      let msg = await helper.getCmdline()
+      expect(msg).toMatch(/No symbols found/)
     })
 
     it('should select symbol range at cursor position', async () => {
diff --git a/src/__tests__/handler/typeHierarchy.test.ts b/src/__tests__/handler/typeHierarchy.test.ts
@@ -193,8 +193,8 @@ describe('TypeHierarchy', () => {
       await plugin.cocAction('showSuperTypes')
       await nvim.command('echo ""')
       await plugin.cocAction('showSubTypes')
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('Unable')
+      let line = await helper.getCmdline()
+      expect(line).toMatch('Unable')
     })
 
     it('should invoke super types and sub types action', async () => {
diff --git a/src/__tests__/list/manager.test.ts b/src/__tests__/list/manager.test.ts
@@ -439,11 +439,11 @@ describe('list', () => {
     it('should show error for bad option', async () => {
       manager.parseArgs(['$x', 'location'])
       await helper.wait(20)
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('Invalid list option')
+      let msg = await helper.getCmdline()
+      expect(msg).toMatch('Invalid list option')
       manager.parseArgs(['-xyz', 'location'])
-      res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('Invalid option')
+      msg = await helper.getCmdline()
+      expect(msg).toMatch('Invalid option')
     })
 
     it('should parse valid arguments', async () => {
@@ -455,8 +455,8 @@ describe('list', () => {
 
     it('should show error for interactive with list not support interactive', async () => {
       manager.parseArgs(['--interactive', 'location'])
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('not supported')
+      let msg = await helper.getCmdline()
+      expect(msg).toMatch('not supported')
     })
   })
 
@@ -470,8 +470,8 @@ describe('list', () => {
       await helper.doAction('listResume')
       expect(manager.isActivated).toBe(true)
       await manager.resume('not_exists')
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('Can\'t find')
+      let line = await helper.getCmdline()
+      expect(line).toMatch('Can\'t find')
     })
   })
 
diff --git a/src/__tests__/list/mappings.test.ts b/src/__tests__/list/mappings.test.ts
@@ -122,30 +122,30 @@ describe('User mappings', () => {
     expect(ListConfiguration).toBeDefined()
     expect(listConfiguration.fixKey('<c-a>')).toBe('<C-a>')
     listConfiguration.fixKey('<a')
-    let res = await helper.doAction('notificationHistory')
-    expect(res[res.length - 1].message).toMatch('not supported')
+    let msg = await helper.getCmdline()
+    expect(msg).toMatch('not supported')
     let revert = helper.updateConfiguration('list.insertMappings', {
       xy: 'action:tabe',
     })
     await helper.wait(30)
-    res = await helper.doAction('notificationHistory')
+    msg = await helper.getCmdline()
     revert()
     await nvim.command('echo ""')
-    expect(res[res.length - 1].message).toMatch('Invalid configuration')
+    expect(msg).toMatch('Invalid configuration')
     revert = helper.updateConfiguration('list.insertMappings', {
       '<M-x>': 'action:tabe',
     })
     await helper.wait(30)
-    res = await helper.doAction('notificationHistory')
+    msg = await helper.getCmdline()
     revert()
-    expect(res[res.length - 1].message).toMatch('Invalid configuration')
+    expect(msg).toMatch('Invalid configuration')
     revert = helper.updateConfiguration('list.insertMappings', {
       '<C-a>': 'foo:bar',
     })
     await helper.wait(30)
-    res = await helper.doAction('notificationHistory')
+    msg = await helper.getCmdline()
     revert()
-    expect(res[res.length - 1].message).toMatch('Invalid configuration')
+    expect(msg).toMatch('Invalid configuration')
   })
 
   it('should execute action keymap', async () => {
diff --git a/src/__tests__/list/session.test.ts b/src/__tests__/list/session.test.ts
@@ -101,8 +101,8 @@ describe('list session', () => {
       lastItems = undefined
       await manager.session.doPreview(0)
       await manager.doAction('not_exists')
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('not found')
+      let line = await helper.getCmdline()
+      expect(line).toMatch('not found')
     })
 
     it('should invoke parallel action', async () => {
diff --git a/src/__tests__/modules/extensionManager.test.ts b/src/__tests__/modules/extensionManager.test.ts
@@ -450,8 +450,8 @@ describe('ExtensionManager', () => {
     it('should show message for extensions not found', async () => {
       let manager = create(tmpfolder)
       await manager.uninstallExtensions(['foo'])
-      const res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('not found')
+      let line = await helper.getCmdline()
+      expect(line).toMatch('not found')
     })
   })
 
diff --git a/src/__tests__/modules/services.test.ts b/src/__tests__/modules/services.test.ts
@@ -363,8 +363,8 @@ describe('services', () => {
       let service = services.getService('test')
       await service.start()
       spy.mockRestore()
-      let res = await helper.doAction('notificationHistory')
-      expect(res[res.length - 1].message).toMatch('failed to start')
+      let line = await helper.getCmdline()
+      expect(line).toMatch('failed to start')
     })
 
     it('should sendRequest & sendNotification', async () => {
diff --git a/src/__tests__/modules/window.test.ts b/src/__tests__/modules/window.test.ts
@@ -415,19 +415,25 @@ describe('window', () => {
     it('should echo error messages regardless of messageDialogKind', async () => {
       helper.updateConfiguration('coc.preferences.messageDialogKind', 'menu')
       let spy = jest.spyOn(window.notifications, 'echoMessages')
-      window.notifications.echoMessages('error message', 'error')
+      await window.showErrorMessage('error message')
       expect(spy).toHaveBeenCalledWith('error message', 'error')
       spy.mockRestore()
     })
 
     it('should echo messages without items regardless of messageDialogKind', async () => {
       helper.updateConfiguration('coc.preferences.messageDialogKind', 'confirm')
       let spy = jest.spyOn(window.notifications, 'echoMessages')
-      window.notifications.echoMessages('info message', 'more')
+      await window.showInformationMessage('info message')
       expect(spy).toHaveBeenCalledWith('info message', 'more')
       spy.mockRestore()
     })
 
+    it('should handle unexpected messageDialogKind', async () => {
+      helper.updateConfiguration('coc.preferences.messageDialogKind', 'invalid')
+      let p = window.showInformationMessage('test message', 'first', 'second')
+      await expect(p).rejects.toThrow('Unexpected messageDialogKind: invalid')
+    })
+
     it('should respect enableMessageDialog for backward compatibility', async () => {
       helper.updateConfiguration('coc.preferences.enableMessageDialog', true)
       helper.updateConfiguration('coc.preferences.messageDialogKind', 'confirm')
diff --git a/src/__tests__/tree/treeView.test.ts b/src/__tests__/tree/treeView.test.ts
@@ -596,8 +596,8 @@ describe('TreeView', () => {
       await nvim.call('cursor', [2, 3])
       await nvim.input('<tab>')
       await helper.waitValue(async () => {
-        const res = await helper.doAction('notificationHistory')
-        return res[res.length - 1].message.includes('No actions')
+        let cmdline = await helper.getCmdline()
+        return cmdline.includes('No actions')
       }, true)
     })
 
@@ -611,8 +611,8 @@ describe('TreeView', () => {
       await nvim.call('cursor', [2, 3])
       await nvim.input('<tab>')
       await helper.waitValue(async () => {
-        const res = await helper.doAction('notificationHistory')
-        return res[res.length - 1].message.includes('No actions')
+        let cmdline = await helper.getCmdline()
+        return cmdline.includes('No actions')
       }, true)
     })
 
diff --git a/src/core/notifications.ts b/src/core/notifications.ts
