Merge pull request #8244 from adobe/randy/issue-8242

Isolated fix for changing height of modal bar with filter picker

Author: RaymondLim

src/search/FindInFilesUI.js

@@ -227,14 +227,35 @@ define(function (require, exports, module) {
 
         // Show file-exclusion UI *unless* search scope is just a single file
         if (!scope || scope.isDirectory) {
-            var exclusionsContext = {
-                label: FindUtils.labelForScope(scope),
-                promise: candidateFilesPromise
-            };
+            var oldModalBarHeight = _findBar._modalBar.height(),
+                exclusionsContext = {
+                    label: FindUtils.labelForScope(scope),
+                    promise: candidateFilesPromise
+                };
 
             filterPicker = FileFilters.createFilterPicker(exclusionsContext);
             // TODO: include in FindBar? (and disable it when FindBar is disabled)
             _findBar._modalBar.getRoot().find(".scope-group").append(filterPicker);
+
+            // Appending FilterPicker can change height of modal bar, so resize editor.
+            // Preserve scroll position of the current full editor across the editor refresh, adjusting for the 
+            // height of the modal bar so the code doesn't appear to shift if possible.
+            //
+            // TODO: This is an isolated fix for #8242.
+            // 1. If we keep this code, then this is done in a couple places in ModalBar,
+            //    so this code should be a utility function
+            // 2. Another solution is to pass this info FindBar.open
+            // 3. Also could make exclusion part of dialog a fixed height
+            var fullEditor = EditorManager.getCurrentFullEditor(),
+                scrollPos;
+            if (fullEditor) {
+                scrollPos = fullEditor.getScrollPos();
+                scrollPos.y -= oldModalBarHeight;   // modalbar already showing, adjust for old height
+            }
+            EditorManager.resizeEditor();
+            if (fullEditor) {
+                fullEditor._codeMirror.scrollTo(scrollPos.x, scrollPos.y + _findBar._modalBar.height());
+            }
         }
 
         handleQueryChange();