Merge pull request #5428 from SAPlayer/quickview-fix

redmunds · redmunds · commit 8c22362e0552 · 2013-10-15T15:28:17.000-07:00
Fix for #5426 (Quick View popup closes & reopens when moving mouse rightward)
diff --git a/src/extensions/default/QuickView/main.js b/src/extensions/default/QuickView/main.js
@@ -594,10 +594,16 @@ define(function (require, exports, module) {
             }
             lastPos = pos;
             
+            // No preview if mouse is past last char on line
+            if (pos.ch >= editor.document.getLine(pos.line).length) {
+                hidePreview();
+                return;
+            }
+            
             // Is there already a popover provider and range?
             if (popoverState) {
                 if (popoverState.start && popoverState.end &&
-                        editor.posWithinRange(pos, popoverState.start, popoverState.end)) {
+                        editor.posWithinRange(pos, popoverState.start, popoverState.end, 1)) {
                     // That one's still relevant - nothing more to do
                     return;
                 } else {
@@ -607,12 +613,6 @@ define(function (require, exports, module) {
                 }
             }
             
-            // No preview if mouse is past last char on line
-            if (pos.ch >= editor.document.getLine(pos.line).length) {
-                hidePreview();
-                return;
-            }
-            
             // Initialize popoverState
             popoverState = {};
             
