Updated by ALF automation.
Show number of search results in Find bar while typing
Adding the CodeMirror built-in Auto Close Brackets addon
Updating to last merge
Fix bug #330 (Calling FileIndexManager.getFileInfoList() while another such
call is already in progress fails) - keep track of existing index-sync
promise so we can just wait on it instead of failing.
Updated by ALF automation.
Merge pull request #3017 from adobe/alf

ALF Automation
Merge pull request #3064 from adobe/pflynn/fileindexmanager-reentrancy

Fix bug #330 (Calling FileIndexManager.getFileInfoList() fails if another such call in progress)
Changes after review
Update CodeMirror SHA to latest upstream master
Don't clear Find results counter if it's about to get overwritten by
running a new search query. I think this was a mistake from a bad
merge/rebase with master.
remove red bg color when deleting search arg
update inner mode detection for codemirror v3
Merge pull request #3036 from adobe/pflynn/find-counter

Show number of search results in Find bar while typing
Merge pull request #3073 from adobe/randy/cmv3-code-fix-2

Update inner mode detection for codemirror v3
Merge pull request #3040 from TomMalbran/tom/close-brackets

Adding the CodeMirror built-in Auto Close Brackets addon
Move the command and string to the right place
Merge pull request #3075 from TomMalbran/tom/close-brackets-cleanup

Cleanup for Adding the CodeMirror built-in Auto Close Brackets addon
Merge remote-tracking branch 'origin/master' into pflynn/separate-statusbar

* origin/master:
  Move the command and string to the right place
  update inner mode detection for codemirror v3
  remove red bg color when deleting search arg
  Don't clear Find results counter if it's about to get overwritten by running a new search query. I think this was a mistake from a bad merge/rebase with master.
  Update CodeMirror SHA to latest upstream master
  Changes after review
  Updated by ALF automation.
  Fix bug #330 (Calling FileIndexManager.getFileInfoList() while another such call is already in progress fails) - keep track of existing index-sync promise so we can just wait on it instead of failing.
  Adding the CodeMirror built-in Auto Close Brackets addon
  Show number of search results in Find bar while typing
  Updated by ALF automation.

Conflicts:
	src/editor/EditorManager.js