Merge pull request #17049 from atom/aw/line-endings-ahoy

Line endings ahoy
This commit is contained in:
Ash Wilson
2018-03-29 16:10:34 -04:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -71,7 +71,7 @@
"service-hub": "^0.7.4",
"sinon": "1.17.4",
"temp": "^0.8.3",
"text-buffer": "13.12.4",
"text-buffer": "13.13.0",
"tree-sitter": "^0.11.0",
"typescript-simple": "1.0.0",
"underscore-plus": "^1.6.6",
@@ -118,7 +118,7 @@
"image-view": "0.62.4",
"incompatible-packages": "0.27.3",
"keybinding-resolver": "0.38.1",
"line-ending-selector": "0.7.5",
"line-ending-selector": "0.7.6",
"link": "0.31.4",
"markdown-preview": "0.159.20",
"metrics": "1.2.6",

View File

@@ -664,7 +664,7 @@ class Cursor extends Model {
// Returns a {RegExp}.
wordRegExp (options) {
const nonWordCharacters = _.escapeRegExp(this.getNonWordCharacters())
let source = `^[\t\r ]*$|[^\\s${nonWordCharacters}]+`
let source = `^[\t ]*$|[^\\s${nonWordCharacters}]+`
if (!options || options.includeNonWordCharacters !== false) {
source += `|${`[${nonWordCharacters}]+`}`
}