feat: add request token to markdown service calls

atom-community · Mar 18, 2019 · 16876c0 · 16876c0
1 parent 4fd3228
commit 16876c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/datatip-manager.js b/lib/datatip-manager.js
@@ -317,14 +317,15 @@ module.exports = class DatatipManager {
               const snippet = m.value.replace(regExpLSPPrefix, '');
               return `<pre><code class="${editor.getGrammar().name.toLowerCase()}">${snippet}</code></pre>`;
             }).join('\r\n');
-            this.renderer.render(s).then((html) => {
-              if (result.range.containsRange(this.currentMarkerRange)) {
+            const requestToken = `${position.row}:${position.column}`;
+            this.renderer.render(requestToken, s).then(({ token, html }) => {
+              if (token == requestToken) {    // make sure we are still on the same position
                 dataTipView = new DataTipView({ htmlView: html });
                 this.dataTipMarkerDisposables = this.mountDataTipWithMarker(editor, result.range, position, dataTipView);
               }
-            }).catch((err) => {
+            }).catch(({ token, error }) => {
               this.hideDataTip();
-              console.error(err)
+              console.error(error);
             });
           }
         });

diff --git a/styles/atom-ide-datatips.less b/styles/atom-ide-datatips.less
@@ -34,6 +34,7 @@
   display: flex;
   position: relative;
   max-width: 800px;
+  max-height: 400px;
   transition: background-color 0.15s ease;
   padding: 8px;
   white-space: pre-wrap;