github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18287 from atom/dw-fix-18195

Browse Source 
Don't soft-wrap spaces and '/' to new lines
This commit is contained in:
Max Brunsfeld
2018-10-20 10:11:09 -07:00
committed by GitHub
parent 1065c0f943 78cdabf692
commit 692c1d3253
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/text-editor-spec.js
View File

@@ -561,7 +561,7 @@ describe('TextEditor', () => {
it('wraps to the end of the previous line', () => {
editor.setCursorScreenPosition([4, 4])
editor.moveLeft()
expect(editor.getCursorScreenPosition()).toEqual([3, 49])
expect(editor.getCursorScreenPosition()).toEqual([3, 46])
})
})
@@ -791,7 +791,7 @@ describe('TextEditor', () => {
editor.setCursorScreenPosition([0, 2])
editor.moveToEndOfLine()
const cursor = editor.getLastCursor()
expect(cursor.getScreenPosition()).toEqual([3, 5])
expect(cursor.getScreenPosition()).toEqual([4, 4])
})
})

15
src/text-utils.js
View File

@@ -99,12 +99,19 @@ const isCJKCharacter = (character) =>
isKoreanCharacter(character)
const isWordStart = (previousCharacter, character) =>
((previousCharacter === ' ') || (previousCharacter === '\t')) &&
((character !== ' ') && (character !== '\t'))
(
previousCharacter === ' ' ||
previousCharacter === '\t' ||
previousCharacter === '-' ||
previousCharacter === '/'
) &&
(
character !== ' ' &&
character !== '\t'
)
const isWrapBoundary = (previousCharacter, character) =>
isWordStart(previousCharacter, character) || isCJKCharacter(character) ||
previousCharacter === '-' || character === '/' || character === ' '
isWordStart(previousCharacter, character) || isCJKCharacter(character)
// Does the given string contain at least surrogate pair, variation sequence,
// or combined character?