improved Promise check

Author: mkloubert

package.json

@@ -2,7 +2,7 @@
   "name": "vs-script-commands",
   "displayName": "Script Commands",
   "description": "Adds additional commands to Visual Studio Code that uses scripts (JavaScript) for execution.",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "publisher": "mkloubert",
   "engines": {
     "vscode": "^1.5.0"

src/controller.ts

@@ -868,23 +868,11 @@ export class ScriptCommandController extends Events.EventEmitter implements vsco
                                     });
 
                                     let result = cmdModule.execute(args);
-                                    if ('object' === typeof result) {
-                                        if ('function' === typeof result['then']) {
-                                            // seems to be a promise
-
-                                            result.then((r) => {
-                                                completed(null, r);
-                                            }, (err) => {
-                                                completed(err);
-                                            });
-                                        }
-                                        else {
-                                            completed(null, result);  // DOES NOT seem to be a promise
-                                        }
-                                    }
-                                    else {
-                                        completed(null, result);  // no object
-                                    }
+                                    Promise.resolve(result).then((r) => {
+                                        completed(null, r);
+                                    }).catch((err) => {
+                                        completed(err);
+                                    });
                                 }
                                 else {
                                     completed(null);  // no execute() function found