fix getEditor cannot find issue

ShMcK · ShMcK · commit c93d997f9270 · 2016-04-30T12:38:43.000-07:00
diff --git a/lib/atom/actions/editor.js b/lib/atom/actions/editor.js
@@ -7,10 +7,12 @@ function getEditor() {
             getEditorCount += 1;
             setTimeout(function () {
                 editor = atom.workspace.getActiveTextEditor();
-            });
-            if (getEditorCount > 999) {
-                console.log('Failed to find active editor');
-                reject(null);
+            }, 10);
+            if (getEditorCount > 1000) {
+                console.log('Cannot find active text editor');
+                setTimeout(function () {
+                    editor = atom.workspace.getActiveTextEditor();
+                }, 100);
             }
         }
         resolve(editor);
diff --git a/lib/atom/actions/file.js b/lib/atom/actions/file.js
@@ -16,7 +16,10 @@ function open(filePath, options) {
         if (exists_1.fileExists(filePath)) {
             fs_1.unlink(filePath);
         }
-        resolve(atom.workspace.open(filePath, options));
+        atom.workspace.open(filePath, options);
+        setTimeout(function () {
+            resolve();
+        }, 200);
     });
 }
 exports.open = open;
diff --git a/lib/reducers/editor-actions/action-reducer.js b/lib/reducers/editor-actions/action-reducer.js
@@ -0,0 +1,60 @@
+"use strict";
+var editor_1 = require('../../atom/editor');
+var action_helpers_1 = require('./action-helpers');
+var Type = {
+    OPEN: 'open',
+    SET: 'set',
+    INSERT: 'insert',
+    OPEN_CONSOLE: 'openConsole',
+};
+function editorActions(actionString) {
+    return new Promise(function (resolve, reject) {
+        var command = action_helpers_1.getCommand(actionString);
+        var params = action_helpers_1.getParams(actionString);
+        switch (command) {
+            case Type.OPEN:
+                var obj = action_helpers_1.getOptions(params[0]);
+                var file = obj.param;
+                var options = obj.options;
+                if (params.length === 1) {
+                    editor_1.open(file, options);
+                    setTimeout(function () {
+                        resolve();
+                    }, 100);
+                }
+                break;
+            case Type.SET:
+                if (params.length === 1) {
+                    var content_1 = params[0];
+                    setTimeout(function () {
+                        editor_1.set(content_1);
+                        resolve(true);
+                    });
+                }
+                break;
+            case Type.INSERT:
+                if (params.length === 1) {
+                    var content_2 = params[0];
+                    setTimeout(function () {
+                        editor_1.insert(content_2, {});
+                        resolve(true);
+                    });
+                }
+                break;
+            case Type.OPEN_CONSOLE:
+                if (params.length === 0) {
+                    setTimeout(function () {
+                        editor_1.openDevTools();
+                        resolve(true);
+                    });
+                }
+                break;
+            default:
+                console.log('Invalid editor action command');
+                reject(false);
+        }
+    }).catch(function (err) {
+        console.error('Error with editor', err);
+    });
+}
+exports.editorActions = editorActions;
diff --git a/src/atom/actions/editor.ts b/src/atom/actions/editor.ts
@@ -6,10 +6,12 @@ export function getEditor(): Promise<AtomCore.IEditor> {
       getEditorCount += 1;
       setTimeout(function() {
         editor = atom.workspace.getActiveTextEditor();
-      });
-      if (getEditorCount > 999) {
-        console.log('Failed to find active editor');
-        reject(null);
+      }, 10);
+      if (getEditorCount > 1000) {
+        console.log('Cannot find active text editor');
+        setTimeout(() => {
+          editor = atom.workspace.getActiveTextEditor();
+        }, 100);
       }
     }
     resolve(editor);
diff --git a/src/atom/actions/file.ts b/src/atom/actions/file.ts
@@ -16,6 +16,9 @@ export function open(filePath: string, options = {}): Promise<any> {
     if (fileExists(filePath)) {
       unlink(filePath);
     }
-    resolve(atom.workspace.open(filePath, options));
+    atom.workspace.open(filePath, options);
+    setTimeout(() => {
+      resolve();
+    }, 200); // delay necessary since opening a file is slow
   });
 }
diff --git a/src/reducers/editor-actions/action-reducer.ts b/src/reducers/editor-actions/action-reducer.ts
@@ -0,0 +1,63 @@
+import {open, set, insert, openDevTools} from '../../atom/editor';
+import {getCommand, getParams, getOptions} from './action-helpers';
+
+const Type = {
+  OPEN: 'open',
+  SET: 'set',
+  INSERT: 'insert',
+  OPEN_CONSOLE: 'openConsole',
+};
+
+export function editorActions(actionString: string): Promise<void> {
+  return new Promise((resolve, reject) => {
+    let command: string = getCommand(actionString);
+    let params: string[] = getParams(actionString);
+    switch (command) {
+      case Type.OPEN:
+        let obj = getOptions(params[0]);
+        let file = obj.param;
+        let options = obj.options;
+        if (params.length === 1) {
+          open(file, options);
+          setTimeout(function() {
+            resolve();
+          }, 100);
+        }
+        break;
+      case Type.SET:
+        if (params.length === 1) {
+          let content = params[0];
+
+          setTimeout(function() {
+            set(content);
+            resolve(true);
+          });
+        }
+        break;
+      case Type.INSERT:
+        if (params.length === 1) {
+          // let obj = getOptions(params[0]);
+          let content: string = params[0];
+          // let options: object = obj.options;
+          setTimeout(function() {
+            insert(content, {});
+            resolve(true);
+          });
+        }
+        break;
+      case Type.OPEN_CONSOLE:
+        if (params.length === 0) {
+          setTimeout(function() {
+            openDevTools();
+            resolve(true);
+          });
+        }
+        break;
+      default:
+        console.log('Invalid editor action command');
+        reject(false);
+    }
+  }).catch((err) => {
+    console.error('Error with editor', err);
+  });
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -85,6 +85,7 @@
         "src/reducers/checks/verify.ts",
         "src/reducers/dir/index.ts",
         "src/reducers/editor-actions/action-helpers.ts",
+        "src/reducers/editor-actions/action-reducer.ts",
         "src/reducers/editor-actions/actions.ts",
         "src/reducers/editor-actions/index.ts",
         "src/reducers/editor-actions/parser.ts",

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,10 @@ function open(filePath, options) {`
`16`	`16`	`if (exists_1.fileExists(filePath)) {`
`17`	`17`	`fs_1.unlink(filePath);`
`18`	`18`	`}`
`19`		`- resolve(atom.workspace.open(filePath, options));`
	`19`	`+ atom.workspace.open(filePath, options);`
	`20`	`+ setTimeout(function () {`
	`21`	`+ resolve();`
	`22`	`+ }, 200);`
`20`	`23`	`});`
`21`	`24`	`}`
`22`	`25`	`exports.open = open;`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ export function open(filePath: string, options = {}): Promise<any> {`
`16`	`16`	`if (fileExists(filePath)) {`
`17`	`17`	`unlink(filePath);`
`18`	`18`	`}`
`19`		`- resolve(atom.workspace.open(filePath, options));`
	`19`	`+ atom.workspace.open(filePath, options);`
	`20`	`+ setTimeout(() => {`
	`21`	`+ resolve();`
	`22`	`+ }, 200); // delay necessary since opening a file is slow`
`20`	`23`	`});`
`21`	`24`	`}`