github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 06:48:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,120 Commits 140 Branches 571 Tags
ec6ed285b124ab85d0aa891775dbae40382b8ca3
Commit Graph

1120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d8975e7a94 SpecHelper has a method for getting pixel points from a row/column 2012-02-02 11:14:50 -08: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
3c37c0ebeb Test the correct line 2012-02-01 18:13:22 -08:00
Corey Johnson
8882c060f1 e 
spelling is hard, let's go shopping
 2012-02-01 18:02:12 -08:00
Corey Johnson
86d23c775d meta-v inserts text at cursor position 2012-02-01 18:00:47 -08:00
Corey Johnson
27ee0792a4 💄 2012-02-01 17:59:59 -08:00
Corey Johnson
16cfcd9396 Move the copy event test to editor, make selection test copy implementation 2012-02-01 17:46:22 -08:00
Corey Johnson
d0cdc212c5 Merge branch 'editor' 2012-02-01 17:08:37 -08:00
Corey Johnson
53d68d93ca Rename old methods and make the specs pass! 2012-02-01 16:50:10 -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
Corey Johnson
cc3b5732e7 Point.toEqual will return true if it matches an array 
`new Point(1,2)` is equivalent to `[1,2]`.
 2012-02-01 15:54:28 -08:00
Corey Johnson
dc9a343b9d little fixes to the custom webkit doc 2012-02-01 11:44:52 -08:00
Nathan Sobo
e669d4ca9e Merge branch 'editor' into highlight 2012-01-31 22:03:04 -07:00
Nathan Sobo
e6cda3dac3 Merge branch 'editor' of github.com:github/atom into editor 2012-01-31 22:02:41 -07:00
Nathan Sobo
77f227c7e9 WIP: Using ace tokenizer to break lines into tokens. 
Breaks some specs because the highlighter doesn't update when the
buffer changes. Not loading the ace theme CSS yet, so you can't see any
colors yet either.
 2012-01-31 21:59:58 -07:00
Nathan Sobo
677df675fb 💄 reorganize editor spec a bit 2012-01-31 20:57:43 -07:00
Nathan Sobo
0e677b6b82 Update ace to 5b6e24dd0953e4728766bd8d6c807a48e9ec61cd 2012-01-31 19:23:42 -07:00
Corey Johnson
84f6a1ca01 Custom version of webkit with @tmm1's stack trace patch 2012-01-31 10:56:53 -08:00
Corey Johnson
c87f37997b Use install_name_tool to make webkit embedable 2012-01-31 10:56:48 -08:00
Nathan Sobo
a72dc17b87 Move hidden input to follow cursor to stop spurious scrolling 
Commit 8e77c05c fixed scrolling *up* when clicking the buffer while
scrolled down. But it was still scrolling to the far left when typing /
clicking on a really long line. This commit solves both issues by
always positioning the hidden input to the same location as the cursor,
so it doesn't tell webkit to scroll away from the current focus when it
is focused or the user types.
 2012-01-31 11:21:13 -07:00
Corey Johnson
d42cdaf157 Selection spec uses copy event to test copying. 
Also added a some multiline tests.
 2012-01-31 10:10:18 -08:00
Corey Johnson
84d9824b19 buffer.getTextInRange handles multiple lines. 2012-01-31 09:56:16 -08:00
Nathan Sobo
4575483d80 Selection expands flexibly when window is resized 
If a region of the selection needs to span the full line, I assign
right: 0 instead of a width so that it always stretches across the
entire editor, even after a resize.
 2012-01-31 10:55:17 -07:00
Nathan Sobo
666ef76c83 Never use more than 3 divs to render a selection 
This should hopefully improve performance for large selections.
 2012-01-31 10:44:10 -07:00
Nathan Sobo
0535f20dda Merge branch 'master' of github.com:github/atom 2012-01-30 19:58:32 -07:00
Nathan Sobo
21a5f25d93 Merge branch 'master' of github.com:github/atom into editor 
Conflicts:
	src/atom/editor.coffee
 2012-01-30 19:47:51 -07:00
Corey Johnson
f9527859a3 💄 2012-01-30 17:46:18 -08:00