Use async/await

Author: ryu1kn

lib/clipboard.js

@@ -8,9 +8,9 @@ class Clipboard {
         this._platform = params.platform;
     }
 
-    read() {
-        return this._clipboardy.read()
-            .then(text => this._windows ? this._dropCRFromEOL(text) : text);
+    async read() {
+        const text = await this._clipboardy.read();
+        return this._windows ? this._dropCRFromEOL(text) : text;
     }
 
     get _windows() {

lib/commands/compare-selection-with-clipboard.js

@@ -11,17 +11,18 @@ class CompareSelectionWithClipboardCommand {
         this._logger = params.logger;
     }
 
-    execute(editor) {
-        return Promise.resolve()
-            .then(() => this._clipboard.read())
-            .then(text => {
-                this._selectionInfoRegistry.set(TextKey.CLIPBOARD, {text, fileName: 'Clipboard'});
-
-                const textInfo = this._selectionInfoBuilder.extract(editor);
-                this._selectionInfoRegistry.set(TextKey.REGISTER2, textInfo);
-                return this._diffPresenter.takeDiff(TextKey.CLIPBOARD, TextKey.REGISTER2);
-            })
-            .catch(this._handleError.bind(this));
+    async execute(editor) {
+        try {
+            const text = await this._clipboard.read();
+            this._selectionInfoRegistry.set(TextKey.CLIPBOARD, {text, fileName: 'Clipboard'});
+
+            const textInfo = this._selectionInfoBuilder.extract(editor);
+            this._selectionInfoRegistry.set(TextKey.REGISTER2, textInfo);
+
+            await this._diffPresenter.takeDiff(TextKey.CLIPBOARD, TextKey.REGISTER2);
+        } catch (e) {
+            this._handleError(e);
+        }
     }
 
     _handleError(e) {

lib/commands/compare-selection-with-text1.js

@@ -10,12 +10,15 @@ class CompareSelectionWithText1Command {
         this._selectionInfoRegistry = params.selectionInfoRegistry;
     }
 
-    execute(editor) {
-        return Promise.resolve().then(() => {
+    async execute(editor) {
+        try {
             const textInfo = this._selectionInfoBuilder.extract(editor);
             this._selectionInfoRegistry.set(TextKey.REGISTER2, textInfo);
-            return this._diffPresenter.takeDiff(TextKey.REGISTER1, TextKey.REGISTER2);
-        }).catch(this._handleError.bind(this));
+
+            await this._diffPresenter.takeDiff(TextKey.REGISTER1, TextKey.REGISTER2);
+        } catch (e) {
+            this._handleError(e);
+        }
     }
 
     _handleError(e) {