Commit Graph

1523 Commits

Author SHA1 Message Date
Nathan Sobo
074c1815d0 Start adding marker methods to DisplayBuffer
Whereas marker methods on buffer take for granted that everything is
in buffer coordinates, methods on the DisplayBuffer offer both
screen and buffer coordinate versions of the marker API.
2013-01-30 22:46:52 -07:00
Nathan Sobo
1d1c613f5b Allow buffer marker head and tail positions to be manipulated 2013-01-30 22:16:08 -07:00
Nathan Sobo
5dd142b966 Allow markers to be created in a reverse orientation
This means that the head of the marker precedes its tail in the buffer.
This will be important if we want to build selections on top of markers.
2013-01-30 21:44:57 -07:00
Nathan Sobo
d8ffdcd6bd Allow markers to be created with just a position
When a marker is created with just a position, it only gets a head
position and has no tail position.
2013-01-30 21:37:57 -07:00
Nathan Sobo
0e67f35748 Start on marker interface in DisplayBuffer 2013-01-30 21:04:52 -07:00
Nathan Sobo
fd99c795b9 Merge remote-tracking branch 'origin/dev' into better-anchors 2013-01-30 20:45:31 -07:00
Nathan Sobo
e02f9cd830 Rename Buffer.createMarker to markRange 2013-01-30 17:41:04 -07:00
Corey Johnson
4e7b1888b4 include ' in editor.nonWordCharacters 2013-01-30 16:04:29 -08:00
Nathan Sobo
dfe0cad217 Replace anchor point/range with a single concept: markers
A "marker" is basically like a persistent selection/cursor composite,
having a head and a tail. The "head" is like the cursor in a selection,
and the "tail" is like the part of the selection that doesn't move. My
goal is for markers to be the only construct used to track regions
in the buffer. I want to replace anchors with them.
2013-01-30 16:52:09 -07:00
Kevin Sawicki
5f343d74b2 Use new EditSession.isFoldedAtBufferRow method when moving lines 2013-01-30 13:54:26 -08:00
Kevin Sawicki
1acf0b870f Support translating points and ranges 2013-01-30 13:49:10 -08:00
Corey Johnson
c650deea01 Merge branch 'font-config' into dev 2013-01-30 13:24:12 -08:00
Nathan Sobo
bcd9d5d2b9 Rename addAnchorPoint to createAnchorPoint 2013-01-30 13:57:39 -07:00
Nathan Sobo
f3029f9ead 💄 2013-01-30 13:24:22 -07:00
Nathan Sobo
6388ec8bd7 Kill call to removed method 2013-01-30 13:24:06 -07:00
Corey Johnson
9b1cb29e1f Don't store fontSize and fontFamily as instance variables 2013-01-30 12:20:02 -08:00
Corey Johnson
29ccd271de Set font-size css property using style tag 2013-01-30 12:11:17 -08:00
Corey Johnson
9ea29b2899 Set font-family css property using style tag 2013-01-30 12:07:23 -08:00
Nathan Sobo
113a8fa279 Merge remote-tracking branch 'origin/dev' into better-anchors
Conflicts:
	src/app/cursor.coffee
	src/app/editor.coffee
2013-01-30 12:59:04 -07:00
Kevin Sawicki
f90d29262c Use octicon as folding indicator 2013-01-30 11:50:29 -08:00
Kevin Sawicki
8dbcefa932 Style color of folded line numbers 2013-01-30 11:50:23 -08:00
Nathan Sobo
30909a8e8f Move anchor points to buffer; restore invalidated points on undo 2013-01-30 12:23:42 -07:00
Corey Johnson
129b574df4 Remove lineHeight config option and rename @rowHeight back to @lineHeight 2013-01-30 09:59:53 -08:00
Justin Palmer
f138a29a87 add config option for line height
This renames the original lineHeight variable to rowHeight to avoid
collision
2013-01-30 09:59:53 -08:00
Justin Palmer
a83460452e add config option for setting the font family 2013-01-30 09:59:53 -08:00
Corey Johnson & Kevin Sawicki
4db876aed1 Deleting before fold no longer unfolds after undo
Use same row delta computation for updating start and
end rows in folds.
2013-01-30 09:10:26 -08:00
Corey Johnson
a2b1f33518 Merge branch 'word-regex-config' into dev 2013-01-30 08:40:04 -08:00
Corey Johnson
97fa9d522a end/beginning word implementations are now more similar 2013-01-30 08:39:32 -08:00
Corey Johnson
f698d7e9dc 💄 2013-01-30 08:20:11 -08:00
Corey Johnson
086c7ef987 multiline regex not needed 2013-01-30 08:15:28 -08:00
Corey Johnson
1a8986aae2 Fix start/end for range 2013-01-30 08:02:19 -08:00
Nathan Sobo
0ecfba3262 WIP: Start adding new anchorPoint API on edit session
These will replace anchors, but they won't be stored on the Buffer
at all. The API user will access them by a returned scalar id rather
than calling methods on the returned anchor object directly.
2013-01-29 18:21:56 -07:00
Kevin Sawicki
05314ae215 Call delete() from deleteRows() 2013-01-29 17:16:33 -08:00
Corey Johnson
a34b9296e9 Escape \ in editor.nonWordCharachters 2013-01-29 17:14:10 -08:00
Corey Johnson
c32836ad2c _ and - both considered non word characters. Fixes #82
Maybe @defunkt wanted the reverse though (consider _ and - word characters)? Either way, it's a config option you can change now.
2013-01-29 17:10:27 -08:00
Corey Johnson
c71f58a652 💄 2013-01-29 17:08:07 -08:00
Corey Johnson
167b9c28fa Rename wordSeparators to nonWordCharacters 2013-01-29 17:06:39 -08:00
Corey Johnson
8973a66cfe selection.selectWord will consider whitespace a word 2013-01-29 16:57:22 -08:00
Corey Johnson
dac92ca6e7 Make cursor.moveCursorToBeginningOfWord behave like vim 2013-01-29 16:57:22 -08:00
Corey Johnson
b66efbe3e7 cursor.getBeginningOfCurrentWordBufferPosition behaves like vim 2013-01-29 16:57:22 -08:00
Corey Johnson & Kevin Sawicki
1d2fa089e5 editor.wordRegex is now a config option. 2013-01-29 16:57:22 -08:00
Kevin Sawicki
1303e58a87 Don't move trailing newline for multiline selections 2013-01-29 16:51:33 -08:00
Kevin Sawicki
4bfa5dd7a0 Remove unneeded Range.fromObject call 2013-01-29 15:40:34 -08:00
Kevin Sawicki
1a04fa31d1 Clip range specified to Buffer.getTextInRange() 2013-01-29 15:35:14 -08:00
Kevin Sawicki
367927faa1 Remove unneeded empty selection logic 2013-01-29 15:08:21 -08:00
Kevin Sawicki
096566ab2a Bind ctrl-meta-down to move line(s) down
Refs #134
2013-01-29 14:58:52 -08:00
Kevin Sawicki
348a0a3d9a Return normalized point 2013-01-29 14:58:51 -08:00
Kevin Sawicki
66df860329 💄 2013-01-29 14:58:51 -08:00
Kevin Sawicki
ad7e4b63c0 Bind ctrl-meta-up to move line(s) up
Refs #134
2013-01-29 14:58:51 -08:00
Jon Rohan
298d50b61e changing the space invisible to 00b7 'middot' 2013-01-29 14:38:01 -05:00