Merge branch 'ide-file-finder-improve-order' into 'master'

Fixed IDE file finder ordering

See merge request gitlab-org/gitlab-ce!18948

3 files changed, 14 insertions, 7 deletions

diff --git a/app/assets/javascripts/ide/components/file_finder/index.vue b/app/assets/javascripts/ide/components/file_finder/index.vue
index ea2b13a8b21..cabb3f59b17 100644
--- a/app/assets/javascripts/ide/components/file_finder/index.vue
+++ b/app/assets/javascripts/ide/components/file_finder/index.vue
@@ -39,12 +39,10 @@ export default {
         return this.allBlobs.slice(0, MAX_FILE_FINDER_RESULTS);
       }
 
-      return fuzzaldrinPlus
-        .filter(this.allBlobs, searchText, {
-          key: 'path',
-          maxResults: MAX_FILE_FINDER_RESULTS,
-        })
-        .sort((a, b) => b.lastOpenedAt - a.lastOpenedAt);
+      return fuzzaldrinPlus.filter(this.allBlobs, searchText, {
+        key: 'path',
+        maxResults: MAX_FILE_FINDER_RESULTS,
+      });
     },
     filteredBlobsLength() {
       return this.filteredBlobs.length;
diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue
index 6c373a92776..1ec69adce09 100644
--- a/app/assets/javascripts/ide/components/ide.vue
+++ b/app/assets/javascripts/ide/components/ide.vue
@@ -52,7 +52,10 @@ export default {
   methods: {
     ...mapActions(['toggleFileFinder']),
     mousetrapStopCallback(e, el, combo) {
-      if (combo === 't' && el.classList.contains('dropdown-input-field')) {
+      if (
+        (combo === 't' && el.classList.contains('dropdown-input-field')) ||
+        el.classList.contains('inputarea')
+      ) {
         return true;
       } else if (combo === 'command+p' || combo === 'ctrl+p') {
         return false;
diff --git a/spec/javascripts/ide/components/ide_spec.js b/spec/javascripts/ide/components/ide_spec.js
index 6f580e1f7af..045a60e56a0 100644
--- a/spec/javascripts/ide/components/ide_spec.js
+++ b/spec/javascripts/ide/components/ide_spec.js
@@ -107,5 +107,11 @@ describe('ide component', () => {
         vm.mousetrapStopCallback(null, vm.$el.querySelector('.dropdown-input-field'), 't'),
       ).toBe(true);
     });
+
+    it('stops callback in monaco editor', () => {
+      setFixtures('<div class="inputarea"></div>');
+
+      expect(vm.mousetrapStopCallback(null, document.querySelector('.inputarea'), 't')).toBe(true);
+    });
   });
 });