Commit Graph

12724 Commits

Author SHA1 Message Date
Nathan Sobo
6a963e8845 Merge remote-tracking branch 'origin/master'
Conflicts:
	src/atom/cursor.coffee
	src/atom/editor.coffee
	src/atom/selection.coffee
2012-02-06 12:37:26 -07:00
Nathan Sobo
64a97b9427 Use SpacePen for all views
SpacePen is better because its objects inherit directly from the jQuery
prototype, meaning you can create them with `new`.
2012-02-06 12:12:45 -07:00
Corey Johnson
697e547048 💩 2012-02-06 10:44:10 -08:00
Corey Johnson
ea48ae626c l can't move the cursor past the last character. 2012-02-06 10:38:56 -08:00
Corey Johnson
425e2b4f59 💄 2012-02-06 10:37:37 -08:00
Corey Johnson
724416be97 SelectLines isn't used anymore 2012-02-06 10:19:53 -08:00
Corey Johnson
dd9723e256 x will not allow the newline to be deleted 2012-02-06 10:19:17 -08:00
Corey Johnson
824af2bc03 Backspace/Delete describes deleteLeft/deleteRight better.
If there is an existing selection, Backspace/Delete will just remove the selection.
2012-02-06 10:17:41 -08:00
Corey Johnson
126067f02d 💄 2012-02-06 10:16:32 -08:00
Corey Johnson
f6f7a5aadd Removing console.log
💩
2012-02-03 17:34:47 -08:00
Corey Johnson
7cdcf2b358 When dd is called on the last line, it removes the \n from the previous line
Treat dd as a special, completing version of d.
2012-02-03 17:31:39 -08:00
Corey Johnson
88cf574bc6 Positioning the cursor beyond the bottom of the buffer will clip it to the last column of the last row 2012-02-03 16:07:54 -08:00
Corey Johnson
b45c00d90e If an object implements inspect jasmine will use it in test output 2012-02-03 16:05:57 -08:00
Corey Johnson
53c14722aa Selection.selectLine takes a row as an argument. 2012-02-03 15:03:13 -08:00
Corey Johnson
99e5c04016 Don't turn on vim-mode in editor 2012-02-03 14:48:23 -08:00
Corey Johnson
e0132b84ca Make the cursor a block in command mode 2012-02-03 13:58:48 -08:00
Corey Johnson
bbf892de96 Triple click selects line under cursor 2012-02-03 13:11:42 -08:00
Nathan Sobo
275e7853af Refactor and comment Highlighter.handleBufferChange
Because it's kinda complex in a way I can't reduce any further to make
it self-evident.
2012-02-03 11:43:20 -07:00
Nathan Sobo
94f7296999 Highlighter resumes from last unchanged line's state
This allows for new a new line inserted inside a comment to be
highlighted correctly, for example.
2012-02-03 11:19:50 -07:00
Corey Johnson
7c778d197e Text is selected when mouse is moved after double click 2012-02-03 09:55:10 -08:00
Corey Johnson & Nathan Sobo
cdd072d8b6 Connect editor to highlighter change events 2012-02-02 17:59:01 -08:00
Corey Johnson & Nathan Sobo
84c104b0b9 Highlighter emits change events.
Changes to the buffer may cause lines beyond the scope of the textual
change to be re-highlighted. If so so, this is reflected in the
pre/post range of Highlighter's change events.
2012-02-02 17:45:57 -08:00
Corey Johnson & Nathan Sobo
803e12a201 Add deep copy to Range 2012-02-02 17:43:39 -08:00
Corey Johnson & Nathan Sobo
82366b1226 Jasmine will call toString() if available to print an object. 2012-02-02 17:00:10 -08:00
Corey Johnson & Nathan Sobo
ec6ed285b1 Merge branch 'editor' 2012-02-02 17:06:18 -07:00
Corey Johnson & Nathan Sobo
0120df540a Lines remain syntax-highlighted when they are updated. 2012-02-02 17:04:37 -07:00
Corey Johnson & Nathan Sobo
71e5462611 Refactor Buffer.change 2012-02-02 16:49:12 -07:00
Nathan Sobo
6ed33fbd17 💄 2012-02-02 16:39:56 -07:00
Nathan Sobo
470ec2e5e4 Refactor Highligher.handleBufferChange
Clarify the logic of extending the re-highlighting beyond the scope of
the textual change.
2012-02-02 16:39:42 -07:00
Corey Johnson & Nathan Sobo
a62bd4b304 Double clicking selects a word. 2012-02-02 14:57:05 -08:00
Corey Johnson
c6c762ba23 Double mouse click selects word
The mousedown event on editor is causing this to fail right now.
2012-02-02 14:13:28 -08:00
Nathan Sobo
00bc17baf0 WIP: Add theme/twilight.css.
Lines aren't being updated properly quite yet, and the stylesheet needs
more tweaking, but colors are there when you load a file.
2012-02-02 12:47:35 -07:00
Nathan Sobo
2b748dd8a7 Merge branch 'editor' into highlight
Conflicts:
	src/atom/buffer.coffee
2012-02-02 12:31:35 -07:00
Nathan Sobo
5e95fc482d Buffer.setText emits the proper change events 2012-02-02 12:30:25 -07:00
Corey Johnson
d2a6eca8f3 meta-x removes text from buffer and places it on the clipboard 2012-02-02 09:35:18 -08:00
Nathan Sobo
104e75e0d7 WIP: Handle changes that affect highlighting of subsequent lines.
Entering a /* at the top of the document will cause lines below to be
interpreted as comments. Still needs cleanup. There are some unrelated
failures associated with Buffer.setText not firing events correctly,
which is causing the highlighter to get into an invalid state.
2012-02-01 21:52:07 -07:00
Nathan Sobo
2f7aa1c4fa Merge branch 'editor' into highlight 2012-02-01 20:33:18 -07:00
Nathan Sobo
6cde6952c7 💄 2012-02-01 20:32:59 -07:00
Nathan Sobo
2f6c16c941 Merge branch 'editor' into highlight
Conflicts:
	src/atom/editor.coffee
2012-02-01 20:24:42 -07:00
Nathan Sobo
1e6d4c618e Refactor Buffer.change 2012-02-01 20:19:26 -07:00
Corey Johnson
86d23c775d meta-v inserts text at cursor position 2012-02-01 18:00:47 -08:00
Corey Johnson
a8380a6df6 Next word on at end of file moves cursor to end of file.
Not sure how this was working before? Maybe a quirk of ace?
2012-02-01 16:49:46 -08:00
Corey Johnson
0f75561a12 Use renamed cursor methods on editor 2012-02-01 16:48:55 -08:00
Corey Johnson
d45c6f9926 Delete is on selection now, not editor 2012-02-01 16:46:05 -08:00
Corey Johnson
14d4d5029e Rename DeleteChar to DeleteRight 2012-02-01 16:45:28 -08:00
Nathan Sobo
23bcc68ac5 Highlighter updates when the buffer is changed 2012-02-01 17:38:16 -07:00
Corey Johnson
09dd7fe913 💄 2012-02-01 16:08:03 -08:00
Corey Johnson
d250580d1b Add getSelection method. Make getCursor return editors cursor var. 2012-02-01 16:04:19 -08:00
Corey Johnson
a3332571a9 Remove backspace and change implementation of delete.
A selection will only delete what is selected. Otherwise it will leave
the buffer unmodified.
2012-02-01 15:57:37 -08:00
Corey Johnson
8fb219af47 Define backspace and delete in terms of deleteLeft and deleteRight. 2012-02-01 15:56:23 -08:00