fix(languages): avoid error when complete command not exists

Closes #2955
neoclide · Mar 9, 2021 · d09f354 · d09f354
1 parent f92a055
commit d09f354
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/commands.ts b/src/commands.ts
@@ -346,14 +346,8 @@ export class CommandManager implements Disposable {
    */
   public executeCommand(command: string, ...rest: any[]): Promise<any> {
     let cmd = this.commands.get(command)
-    if (!cmd) {
-      window.showMessage(`Command: ${command} not found`, 'error')
-      return
-    }
-    return Promise.resolve(cmd.execute.apply(cmd, rest)).catch(e => {
-      window.showMessage(`Command error: ${e.message}`, 'error')
-      logger.error(e.stack)
-    })
+    if (!cmd) throw new Error(`Command: ${command} not found`)
+    return Promise.resolve(cmd.execute.apply(cmd, rest))
   }
 
   public async addRecent(cmd: string): Promise<void> {

diff --git a/src/languages.ts b/src/languages.ts
@@ -583,7 +583,9 @@ class Languages {
           }
           await this.applyAdditionalEdits(additionalTextEdits, opt.bufnr, isSnippet)
           if (isSnippet) await snippetManager.selectCurrentPlaceholder()
-          if (item.command) commands.execute(item.command)
+          if (item.command && commands.has(item.command.command)) {
+            commands.execute(item.command)
+          }
         } catch (e) {
           logger.error('Error on CompleteDone:', e)
         }