Merge pull request #7104 from adobe/nj/cmv4-save-as-sel

[cmv4] Preserve multiple selections when saving new document or doing save as

Author: redmunds

src/document/DocumentCommandHandlers.js

@@ -714,8 +714,7 @@ define(function (require, exports, module) {
                 var editor = EditorManager.getActiveEditor();
                 if (editor) {
                     if (settings) {
-                        editor.setCursorPos(settings.cursorPos);
-                        editor.setSelection(settings.selection.start, settings.selection.end);
+                        editor.setSelections(settings.selections);
                         editor.setScrollPos(settings.scrollPos.x, settings.scrollPos.y);
                     }
                 }
@@ -828,8 +827,7 @@ define(function (require, exports, module) {
             if (doc.isUntitled()) {
                 if (doc === activeDoc) {
                     settings = {
-                        selection: activeEditor.getSelection(),
-                        cursorPos: activeEditor.getCursorPos(),
+                        selections: activeEditor.getSelections(),
                         scrollPos: activeEditor.getScrollPos()
                     };
                 }
@@ -918,8 +916,7 @@ define(function (require, exports, module) {
             if (activeEditor) {
                 doc = activeEditor.document;
                 settings = {};
-                settings.selection = activeEditor.getSelection();
-                settings.cursorPos = activeEditor.getCursorPos();
+                settings.selections = activeEditor.getSelections();
                 settings.scrollPos = activeEditor.getScrollPos();
             }
         }

test/spec/DocumentCommandHandlers-test.js

@@ -752,7 +752,10 @@ define(function (require, exports, module) {
         describe("Save As", function () {
             var filePath,
                 newFilename,
-                newFilePath;
+                newFilePath,
+                selections = [{start: {line: 0, ch: 1}, end: {line: 0, ch: 3}, primary: false, reversed: false},
+                              {start: {line: 0, ch: 6}, end: {line: 0, ch: 6}, primary: true, reversed: false},
+                              {start: {line: 0, ch: 9}, end: {line: 0, ch: 12}, primary: false, reversed: true}];
 
             beforeEach(function () {
                 filePath    = testPath + "/test.js";
@@ -768,8 +771,10 @@ define(function (require, exports, module) {
                 });
 
                 runs(function () {
-                    var currentDocument = DocumentManager.getCurrentDocument();
+                    var currentDocument = DocumentManager.getCurrentDocument(),
+                        currentEditor = EditorManager.getActiveEditor();
                     expect(currentDocument.file.fullPath).toEqual(filePath);
+                    currentEditor.setSelections(selections);
                 });
 
                 runs(function () {
@@ -782,8 +787,10 @@ define(function (require, exports, module) {
                 });
 
                 runs(function () {
-                    var currentDocument = DocumentManager.getCurrentDocument();
+                    var currentDocument = DocumentManager.getCurrentDocument(),
+                        currentEditor = EditorManager.getActiveEditor();
                     expect(currentDocument.file.fullPath).toEqual(newFilePath);
+                    expect(currentEditor.getSelections()).toEqual(selections);
                 });
 
                 runs(function () {