Simplify (?) FindReplace helper function parseDollars
set highlighted element before scrolling it into view
Merge remote-tracking branch 'origin/master' into randy/issue-7762
added a force reload command for live preview
Fix live highlight when starting from a CSSDocument
Nicer fix
Do replacements in memory if a file is in the working set but not yet open (for #8160)
Properly track offsets for multiline regexps in Find/Replace in Files (for #8162)
Merge remote-tracking branch 'upstream/master' into simplify-parse-dollars

Conflicts:
	src/search/FindReplace.js
Turn off click-to-rename for folders to address #8200
Merge pull request #8172 from adobe/nj/issue-8160

Do replacements in memory if a file is in the working set but not yet open
Merge pull request #8204 from adobe/nj/issue-8200-disable-folder-rename

Turn off click-to-rename for folders
Fix commas that should be semicolons
Add an explicit non-breaking space before "with" in template
Merge pull request #8206 from adobe/rlim/explicit-space-in-template

Add an explicit non-breaking space before "with" in template
Clarify that in the single-line case, we're just using the total length of the match to calculate the offset
Explicitly set the value of 'collapsed' for #8208
Merge pull request #8177 from adobe/nj/issue-8162

Properly track offsets for multiline regexps in Find/Replace in Files
Blur the element that had focus instead of giving focus to the dialog when we can't focus a button
Change search bar UI to always say "Find..." in the first field, instead of
sometimes saying "Find in..." or "Replace in..." (which makes it sound like
it's describing the set of files to search in).