adobe
diff --git a/‎src/extensions/default/CSSCodeHints/unittests.js
Copy file name to clipboard
+8-2Lines changed: 8 additions & 2 deletions b/‎src/extensions/default/CSSCodeHints/unittests.js
Copy file name to clipboard
+8-2Lines changed: 8 additions & 2 deletions
diff --git a/‎src/extensions/default/HTMLCodeHints/unittests.js
Copy file name to clipboard
+8-2Lines changed: 8 additions & 2 deletions b/‎src/extensions/default/HTMLCodeHints/unittests.js
Copy file name to clipboard
+8-2Lines changed: 8 additions & 2 deletions
diff --git a/‎src/extensions/default/HtmlEntityCodeHints/unittests.js
Copy file name to clipboard
+9-1Lines changed: 9 additions & 1 deletion b/‎src/extensions/default/HtmlEntityCodeHints/unittests.js
Copy file name to clipboard
+9-1Lines changed: 9 additions & 1 deletion
diff --git a/‎src/extensions/default/InlineColorEditor/unittests.js
Copy file name to clipboard
+27-5Lines changed: 27 additions & 5 deletions b/‎src/extensions/default/InlineColorEditor/unittests.js
Copy file name to clipboard
+27-5Lines changed: 27 additions & 5 deletions
diff --git a/‎src/extensions/default/JavaScriptCodeHints/ScopeManager.js
Copy file name to clipboard
+52-49Lines changed: 52 additions & 49 deletions b/‎src/extensions/default/JavaScriptCodeHints/ScopeManager.js
Copy file name to clipboard
+52-49Lines changed: 52 additions & 49 deletions
diff --git a/‎src/extensions/default/JavaScriptCodeHints/unittests.js
Copy file name to clipboard
+17-8Lines changed: 17 additions & 8 deletions b/‎src/extensions/default/JavaScriptCodeHints/unittests.js
Copy file name to clipboard
+17-8Lines changed: 17 additions & 8 deletions
diff --git a/‎src/extensions/default/JavaScriptQuickEdit/unittests.js
Copy file name to clipboard
+11-3Lines changed: 11 additions & 3 deletions b/‎src/extensions/default/JavaScriptQuickEdit/unittests.js
Copy file name to clipboard
+11-3Lines changed: 11 additions & 3 deletions
@@ -114,10 +114,16 @@ define(function (require, exports, module) {
         }
 
         // Helper function for testing cursor position
+        function fixPos(pos) {
+            if (!("sticky" in pos)) {
+                pos.sticky = null;
+            }
+            return pos;
+        }
         function expectCursorAt(pos) {
             var selection = testEditor.getSelection();
-            expect(selection.start).toEqual(selection.end);
-            expect(selection.start).toEqual(pos);
+            expect(fixPos(selection.start)).toEqual(fixPos(selection.end));
+            expect(fixPos(selection.start)).toEqual(fixPos(pos));
         }
 
         // Helper function to
 
@@ -494,10 +494,16 @@ define(function (require, exports, module) {
             }
 
             // Helper function for testing cursor position
+            function fixPos(pos) {
+                if (!("sticky" in pos)) {
+                    pos.sticky = null;
+                }
+                return pos;
+            }
             function expectCursorAt(pos) {
                 var selection = testEditor.getSelection();
-                expect(selection.start).toEqual(selection.end);
-                expect(selection.start).toEqual(pos);
+                expect(fixPos(selection.start)).toEqual(fixPos(selection.end));
+                expect(fixPos(selection.start)).toEqual(fixPos(pos));
             }
 
             it("should insert =\"\" after attribute", function () {
 
@@ -31,6 +31,14 @@ define(function (require, exports, module) {
         HTMLEntityHints = require("main").SpecialCharHints,
         defaultContent  = require("text!unittest-files/default.html");
 
+    // Helper function for testing cursor position
+    function fixPos(pos) {
+        if (!("sticky" in pos)) {
+            pos.sticky = null;
+        }
+        return pos;
+    }
+
     describe("HTML Entity Hinting", function () {
 
         var testEditorAndDoc,
@@ -150,7 +158,7 @@ define(function (require, exports, module) {
 
                 var hints = expectHints(hintProvider);
                 hintProvider.insertHint(hints[0]);
-                expect(testEditorAndDoc.editor.getCursorPos()).toEqual({line: 17, ch: 23});
+                expect(fixPos(testEditorAndDoc.editor.getCursorPos())).toEqual(fixPos({line: 17, ch: 23}));
             });
         });
     });
 
@@ -37,6 +37,28 @@ define(function (require, exports, module) {
         ColorEditor        = require("ColorEditor").ColorEditor,
         tinycolor          = require("thirdparty/tinycolor-min");
 
+    // Helper functions for testing cursor position / selection range
+    function fixPos(pos) {
+        if (!("sticky" in pos)) {
+            pos.sticky = null;
+        }
+        return pos;
+    }
+    function fixSel(sel) {
+        fixPos(sel.start);
+        fixPos(sel.end);
+        if (!("reversed" in sel)) {
+            sel.reversed = false;
+        }
+        return sel;
+    }
+    function fixSels(sels) {
+        sels.forEach(function (sel) {
+            fixSel(sel);
+        });
+        return sels;
+    }
+
     describe("Inline Color Editor - unit", function () {
 
         var testDocument, testEditor, inline;
@@ -217,7 +239,7 @@ define(function (require, exports, module) {
                     runs(function () {
                         testDocument.replaceRange("", {line: 1, ch: 22}, {line: 1, ch: 24});
                         inline.colorEditor.setColorFromString("#c0c0c0");
-                        expect(inline.getCurrentRange()).toEqual({start: {line: 1, ch: 16}, end: {line: 1, ch: 23}});
+                        expect(fixSel(inline.getCurrentRange())).toEqual(fixSel({start: {line: 1, ch: 16}, end: {line: 1, ch: 23}}));
                         expect(testDocument.getRange({line: 1, ch: 16}, {line: 1, ch: 23})).toBe("#c0c0c0");
                     });
                 });
@@ -236,7 +258,7 @@ define(function (require, exports, module) {
                         // TODO (#2201): this assumes getColor() is a tinycolor, but sometimes it's a string
                         expect(inline.colorEditor.getColor().toHexString().toLowerCase()).toBe("#a0cdef");
                         expect(inline.close).not.toHaveBeenCalled();
-                        expect(inline.getCurrentRange()).toEqual({start: {line: 1, ch: 16}, end: {line: 1, ch: 23}});
+                        expect(fixSel(inline.getCurrentRange())).toEqual(fixSel({start: {line: 1, ch: 16}, end: {line: 1, ch: 23}}));
                     });
                 });
 
@@ -260,7 +282,7 @@ define(function (require, exports, module) {
                         testDocument.replaceRange("0", {line: 1, ch: 22}, {line: 1, ch: 22});
                         expect(inline._color).toBe("#abcde0");
                         expect(inline.close).not.toHaveBeenCalled();
-                        expect(inline.getCurrentRange()).toEqual({start: {line: 1, ch: 16}, end: {line: 1, ch: 23}});
+                        expect(fixSel(inline.getCurrentRange())).toEqual(fixSel({start: {line: 1, ch: 16}, end: {line: 1, ch: 23}}));
                     });
                 });
 
@@ -269,7 +291,7 @@ define(function (require, exports, module) {
                     runs(function () {
                         testDocument.replaceRange("", {line: 1, ch: 22}, {line: 1, ch: 23});
                         expect(inline._color).toBe("#abcdef");
-                        expect(inline.getCurrentRange()).toEqual({start: {line: 1, ch: 16}, end: {line: 1, ch: 22}});
+                        expect(fixSel(inline.getCurrentRange())).toEqual(fixSel({start: {line: 1, ch: 16}, end: {line: 1, ch: 22}}));
                     });
                 });
 
@@ -278,7 +300,7 @@ define(function (require, exports, module) {
                     runs(function () {
                         testDocument.replaceRange("", {line: 1, ch: 22}, {line: 1, ch: 24});
                         expect(inline._color).toBe("#abcdef");
-                        expect(inline.getCurrentRange()).toEqual({start: {line: 1, ch: 16}, end: {line: 1, ch: 22}});
+                        expect(fixSel(inline.getCurrentRange())).toEqual(fixSel({start: {line: 1, ch: 16}, end: {line: 1, ch: 22}}));
                     });
                 });
 
 
@@ -1169,65 +1169,68 @@ define(function (require, exports, module) {
 
             ensurePreferences();
             deferredPreferences.done(function () {
-                if (!file instanceof InMemoryFile) {
-                    FileSystem.resolve(dir, function (err, directory) {
+                if (file instanceof InMemoryFile) {
+                    initTernServer(pr, []);
+                    var hintsPromise = primePump(path);
+                    hintsPromise.done(function () {
+                        addFilesDeferred.resolveWith(null, [_ternWorker]);
+                    });
+                    return;
+                }
+
+                FileSystem.resolve(dir, function (err, directory) {
+                    if (err) {
+                        console.error("Error resolving", dir);
+                        addFilesDeferred.resolveWith(null);
+                        return;
+                    }
+
+                    directory.getContents(function (err, contents) {
                         if (err) {
-                            console.error("Error resolving", dir);
+                            console.error("Error getting contents for", directory);
                             addFilesDeferred.resolveWith(null);
                             return;
                         }
 
-                        directory.getContents(function (err, contents) {
-                            if (err) {
-                                console.error("Error getting contents for", directory);
-                                addFilesDeferred.resolveWith(null);
-                                return;
-                            }
+                        var files = contents
+                            .filter(function (entry) {
+                                return entry.isFile && !isFileExcluded(entry);
+                            })
+                            .map(function (entry) {
+                                return entry.fullPath;
+                            });
 
-                            var files = contents
-                                .filter(function (entry) {
-                                    return entry.isFile && !isFileExcluded(entry);
-                                })
-                                .map(function (entry) {
-                                    return entry.fullPath;
-                                });
+                        initTernServer(dir, files);
+
+                        var hintsPromise = primePump(path);
+                        hintsPromise.done(function () {
+                            if (!usingModules()) {
+                                // Read the subdirectories of the new file's directory.
+                                // Read them first in case there are too many files to
+                                // read in the project.
+                                addAllFilesAndSubdirectories(dir, function () {
+                                    // If the file is in the project root, then read
+                                    // all the files under the project root.
+                                    var currentDir = (dir + "/");
+                                    if (projectRoot && currentDir !== projectRoot &&
+                                            currentDir.indexOf(projectRoot) === 0) {
+                                        addAllFilesAndSubdirectories(projectRoot, function () {
+                                            // prime the pump again but this time don't wait
+                                            // for completion.
+                                            primePump(path);
 
-                            initTernServer(dir, files);
-
-                            var hintsPromise = primePump(path);
-                            hintsPromise.done(function () {
-                                if (!usingModules()) {
-                                    // Read the subdirectories of the new file's directory.
-                                    // Read them first in case there are too many files to
-                                    // read in the project.
-                                    addAllFilesAndSubdirectories(dir, function () {
-                                        // If the file is in the project root, then read
-                                        // all the files under the project root.
-                                        var currentDir = (dir + "/");
-                                        if (projectRoot && currentDir !== projectRoot &&
-                                                currentDir.indexOf(projectRoot) === 0) {
-                                            addAllFilesAndSubdirectories(projectRoot, function () {
-                                                // prime the pump again but this time don't wait
-                                                // for completion.
-                                                primePump(path);
-
-                                                addFilesDeferred.resolveWith(null, [_ternWorker]);
-                                            });
-                                        } else {
                                             addFilesDeferred.resolveWith(null, [_ternWorker]);
-                                        }
-                                    });
-                                } else {
-                                    addFilesDeferred.resolveWith(null, [_ternWorker]);
-                                }
-                            });
+                                        });
+                                    } else {
+                                        addFilesDeferred.resolveWith(null, [_ternWorker]);
+                                    }
+                                });
+                            } else {
+                                addFilesDeferred.resolveWith(null, [_ternWorker]);
+                            }
                         });
                     });
-                } else {
-                    initTernServer(pr, []);
-                    primePump(path);
-                    addFilesDeferred.resolveWith(null, [_ternWorker]);
-                }
+                });
             });
         }
 
 
@@ -58,6 +58,15 @@ define(function (require, exports, module) {
     });
 
     describe("JavaScript Code Hinting", function () {
+
+        // Helper function for testing cursor position
+        function fixPos(pos) {
+            if (!("sticky" in pos)) {
+                pos.sticky = null;
+            }
+            return pos;
+        }
+
         /*
          * Ask provider for hints at current cursor position; expect it to
          * return some
@@ -718,7 +727,7 @@ define(function (require, exports, module) {
                 selectHint(JSCodeHints.jsHintProvider, hintObj, "propA");
 
                 runs(function () {
-                    expect(testEditor.getCursorPos()).toEqual(end);
+                    expect(fixPos(testEditor.getCursorPos())).toEqual(fixPos(end));
                     expect(testDoc.getRange(start, end)).toEqual("A1.propA");
                     expect(testDoc.getLine(end.line).length).toEqual(8);
                 });
@@ -736,7 +745,7 @@ define(function (require, exports, module) {
                 selectHint(JSCodeHints.jsHintProvider, hintObj, "propA");
 
                 runs(function () {
-                    expect(testEditor.getCursorPos()).toEqual(end);
+                    expect(fixPos(testEditor.getCursorPos())).toEqual(fixPos(end));
                     expect(testDoc.getRange(start, endplus)).toEqual("A1.propAprop");
                     expect(testDoc.getLine(end.line).length).toEqual(12);
                 });
@@ -752,7 +761,7 @@ define(function (require, exports, module) {
                 var hintObj = expectHints(JSCodeHints.jsHintProvider);
                 selectHint(JSCodeHints.jsHintProvider, hintObj, "propA");
                 runs(function () {
-                    expect(testEditor.getCursorPos()).toEqual(end);
+                    expect(fixPos(testEditor.getCursorPos())).toEqual(fixPos(end));
                     expect(testDoc.getRange(start, end)).toEqual("A1.propA");
                     expect(testDoc.getLine(end.line).length).toEqual(8);
                 });
@@ -769,7 +778,7 @@ define(function (require, exports, module) {
                 var hintObj = expectHints(JSCodeHints.jsHintProvider);
                 selectHint(JSCodeHints.jsHintProvider, hintObj, "propA");
                 runs(function () {
-                    expect(testEditor.getCursorPos()).toEqual(end);
+                    expect(fixPos(testEditor.getCursorPos())).toEqual(fixPos(end));
                     expect(testDoc.getRange(start, endplus)).toEqual("A1.propApB");
                     expect(testDoc.getLine(end.line).length).toEqual(10);
                 });
@@ -787,7 +796,7 @@ define(function (require, exports, module) {
                 selectHint(JSCodeHints.jsHintProvider, hintObj, "propA");
 
                 runs(function () {
-                    expect(testEditor.getCursorPos()).toEqual(end);
+                    expect(fixPos(testEditor.getCursorPos())).toEqual(fixPos(end));
                     expect(testDoc.getRange(start, endplus)).toEqual("(A1.propAprop)");
                     expect(testDoc.getLine(endplus.line).length).toEqual(14);
                 });
@@ -1005,7 +1014,7 @@ define(function (require, exports, module) {
                 var hintObj = expectHints(JSCodeHints.jsHintProvider);
                 selectHint(JSCodeHints.jsHintProvider, hintObj, "my-key");
                 runs(function () {
-                    expect(testEditor.getCursorPos()).toEqual(end);
+                    expect(fixPos(testEditor.getCursorPos())).toEqual(fixPos(end));
                     expect(testDoc.getRange(start, end)).toEqual("arr[\"my-key\"]");
                     expect(testDoc.getLine(end.line).length).toEqual(13);
                 });
@@ -1021,7 +1030,7 @@ define(function (require, exports, module) {
                 var hintObj = expectHints(JSCodeHints.jsHintProvider);
                 selectHint(JSCodeHints.jsHintProvider, hintObj, "my-key");
                 runs(function () {
-                    expect(testEditor.getCursorPos()).toEqual(end);
+                    expect(fixPos(testEditor.getCursorPos())).toEqual(fixPos(end));
                     expect(testDoc.getRange(start, end)).toEqual("arr[\"my-key\"]");
                     expect(testDoc.getLine(end.line).length).toEqual(13);
                 });
@@ -1037,7 +1046,7 @@ define(function (require, exports, module) {
                 var hintObj = expectHints(JSCodeHints.jsHintProvider);
                 selectHint(JSCodeHints.jsHintProvider, hintObj, "for");
                 runs(function () {
-                    expect(testEditor.getCursorPos()).toEqual(end);
+                    expect(fixPos(testEditor.getCursorPos())).toEqual(fixPos(end));
                     expect(testDoc.getRange(start, end)).toEqual("arr.for");
                     expect(testDoc.getLine(end.line).length).toEqual(7);
                 });
 
@@ -61,6 +61,14 @@ define(function (require, exports, module) {
         return result.promise();
     }
 
+    // Helper function for testing cursor position
+    function fixPos(pos) {
+        if (!("sticky" in pos)) {
+            pos.sticky = null;
+        }
+        return pos;
+    }
+
     /**
      * Performs setup for an inline editor test. Parses offsets (saved to Spec.offsets) for all files in
      * the test project (testPath) and saves files back to disk without offset markup.
@@ -237,7 +245,7 @@ define(function (require, exports, module) {
                     var inlinePos = inlineWidget.editor.getCursorPos();
 
                     // verify cursor position in inline editor
-                    expect(inlinePos).toEqual(this.infos["test1inline.js"].offsets[0]);
+                    expect(fixPos(inlinePos)).toEqual(fixPos(this.infos["test1inline.js"].offsets[0]));
                 });
             });
 
@@ -249,7 +257,7 @@ define(function (require, exports, module) {
                     var inlinePos = inlineWidget.editor.getCursorPos();
 
                     // verify cursor position in inline editor
-                    expect(inlinePos).toEqual(this.infos["test1inline.js"].offsets[1]);
+                    expect(fixPos(inlinePos)).toEqual(fixPos(this.infos["test1inline.js"].offsets[1]));
                 });
             });
 
@@ -261,7 +269,7 @@ define(function (require, exports, module) {
                     var inlinePos = inlineWidget.editor.getCursorPos();
 
                     // verify cursor position in inline editor
-                    expect(inlinePos).toEqual(this.infos["test1inline.js"].offsets[2]);
+                    expect(fixPos(inlinePos)).toEqual(fixPos(this.infos["test1inline.js"].offsets[2]));
                 });
             });