fix: improve promise handling

atom-community · Mar 18, 2019 · ab3d655 · ab3d655
1 parent b887b37
commit ab3d655
Showing 1 changed file with 28 additions and 32 deletions.
diff --git a/lib/renderer.js b/lib/renderer.js
@@ -14,10 +14,9 @@ const domPurify = createDOMPurify();
 /**
  * [highlightCodeFragments description]
  * @param {HTMLElement} domFragment [description]
- * @param {Function} callback [description]
  * @returns {Promise}
  */
-function highlightCodeFragments(domFragment, callback) {
+function highlightCodeFragments(domFragment) {
  const defaultLanguage = 'text';
  // set editor font family
  const fontFamily = atom.config.get('editor.fontFamily');
@@ -34,6 +33,7 @@ function highlightCodeFragments(domFragment, callback) {
  let codeBlock = preElement.firstElementChild != null ? preElement.firstElementChild : preElement;
  let fenceName = codeBlock.getAttribute('class') ? codeBlock.getAttribute('class').replace(/^lang-/, '').replace(/^language-/, '') : defaultLanguage;
  preElement.classList.add('editor-colors', `lang-${fenceName}`);
+
  let editor = new TextEditor({readonly: true, keyboardInputEnabled: false});
  let editorElement = editor.getElement();
  editorElement.setUpdatedSynchronously(true);
@@ -45,7 +45,27 @@ function highlightCodeFragments(domFragment, callback) {
 
  atom.grammars.assignLanguageMode(editor, scopeForFenceName(fenceName));
  editor.setVisible(true);
- promises.push(callback(editorElement, preElement));
+ promises.push(new Promise((resolve, reject) => {
+ let done = () => {
+ editorElement.querySelectorAll('.line:not(.dummy)').forEach((line) => {
+ let line2 = document.createElement('div');
+ line2.className = 'line';
+ line2.innerHTML = line.firstChild.innerHTML;
+ preElement.appendChild(line2);
+ });
+ editorElement.remove();
+ resolve();
+ }
+ const languageMode = editor.getBuffer().getLanguageMode();
+ if ((languageMode.fullyTokenized) || (languageMode.tree)) {
+ done();
+ }
+ else {
+ editor.onDidTokenize(() => {
+ done();
+ });
+ }
+ }));
  });
 
  return Promise.all(promises);
@@ -66,32 +86,6 @@ function internalRender(markdownText) {
  return template.content.cloneNode(true);
 }
 
-function codeFragmentsHighlighted(editorElement, preElement) {
- let p = new Promise((resolve, reject) => {
- let done = () => {
- editor.component.getNextUpdatePromise().then(() => {
- editorElement.querySelectorAll('.line:not(.dummy)').forEach((line) => {
- let line2 = document.createElement('div');
- line2.className = 'line';
- line2.innerHTML = line.firstChild.innerHTML;
- preElement.appendChild(line2);
- });
- editorElement.remove();
- resolve();
- }).catch(reject);
- }
-
- let editor = editorElement.getModel();
- let languageMode = editor.getBuffer().getLanguageMode();
- if ((languageMode.fullyTokenized) || (languageMode.tree)) {
- done();
- }
- else {
- editor.onDidTokenize(() => done());
- }
- });
- return p;
-}
 
 export default {
  /**
@@ -106,11 +100,13 @@ export default {
  document.body.appendChild(div);
 
  let result = new Promise((resolve, reject) => {
- let wait = highlightCodeFragments(div, codeFragmentsHighlighted);
- wait.then(() => {
+ highlightCodeFragments(div).then(() => {
  div.remove();
  resolve(div.innerHTML);
- }).catch(reject);
+ }).catch((err) => {
+ console.error(err);
+ reject();
+ });
  });
  return result;
  }