github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,435 Commits 140 Branches 571 Tags
423a4dc17d5575bd10a50ab1c7a1291865047b65
Commit Graph

1435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Corey Johnson
423a4dc17d Ensure editor and cursor methods explain if they act on buffer or screen lines 2012-03-07 16:23:23 -08:00
Nathan Sobo
8e4a6f65f7 Translate clicks to screen positions correctly when lines are scrolled right 2012-03-07 17:22:13 -07:00
Nathan Sobo
acb6c94ebb Make cursor and selection children of editor.lines to fix positioning when scrolled 2012-03-07 17:10:24 -07:00
Corey Johnson
ac77b7af87 Outdent and indent use bufferRow and screenRow in the appropriate places 2012-03-07 15:22:41 -08:00
Nathan Sobo
dc815f67ad 💄 2012-03-07 14:46:27 -07:00
Nathan Sobo
65920fdc25 Rename GlobalKeymap to Keymap 2012-03-07 14:45:26 -07:00
Nathan Sobo
62319113c1 Meta-w closes specs window 2012-03-07 14:27:21 -07:00
Corey Johnson
f6414c543c Add save command and keyboard shortcuts to editor. 2012-03-07 12:43:29 -08:00
Corey Johnson
fabe8fd609 Update test to use meta-/ instead of meta-s 2012-03-07 12:43:09 -08:00
Corey Johnson
3a6b3e6650 💄 2012-03-07 11:42:39 -08:00
Corey Johnson
c258c2847e Fix bug introduced when I resolved a conflict resolution. 2012-03-07 11:42:39 -08:00
Nathan Sobo
fdd8c7ad41 Unbind default events in window.shutDown to prevent spurious triggering in specs 2012-03-07 12:40:39 -07:00
Corey Johnson
29c697faaa Disable auto-scroll and make overflow-x hidden when soft-wrap is enabled 2012-03-07 11:29:33 -08:00
Nathan Sobo
461dd5cd37 Gutter renders correctly with line wrapping and folds 2012-03-07 12:19:30 -07:00
Nathan Sobo
20deb80d9f Give specs window a keymap with the default bindings 2012-03-07 11:04:41 -07:00
Nathan Sobo
baeef54be3 Revert "Global Keyboard shortcuts work from spec window." 
This reverts commit 6134d9e41e.
 2012-03-07 10:53:09 -07:00
Nathan Sobo
c18341dea8 💄 2012-03-07 10:51:31 -07:00
Nathan Sobo
43653d7f03 Merge remote-tracking branch 'origin/master' into gutter 
Conflicts:
	src/atom/highlighter.coffee
 2012-03-07 10:42:21 -07:00
Nathan Sobo
4f1c8da132 Individual tokens no longer need an isAtomic property 2012-03-06 19:24:14 -07:00
Nathan Sobo
47ee8d599d Rename input/output to buffer/screen in LineMap 
Now that we don't have two translation steps, it's not a lie to refer
to the coordinate spaces being translated by the line map as buffer and
screen
 2012-03-06 19:20:28 -07:00
Nathan Sobo
da6a708b46 Remove LineWrapper and LineFolder 
They are supplanted by Renderer
 2012-03-06 19:16:50 -07:00
Nathan Sobo
55a5f1b30e Install Renderer in Editor instead of LineWrapper & LineFolder 2012-03-06 19:15:13 -07:00
Nathan Sobo
a5b4c0af2f Add Renderer.clipScreenPosition 2012-03-06 18:27:24 -07:00
Nathan Sobo
fbd4b7e990 Renderer can place a fold placeholder directly before a soft-wrap 2012-03-06 18:27:06 -07:00
Corey Johnson & Nathan Sobo
6134d9e41e Global Keyboard shortcuts work from spec window. 2012-03-06 16:48:28 -08:00
Corey Johnson
0703578820 autoIndent is enabled by default. 2012-03-06 16:34:59 -08:00
Corey Johnson
0737529f07 Auto-outdent maintains proper cursor positon. 2012-03-06 16:34:43 -08:00
Corey Johnson
fe07e45ebc Refactor Ace specific code into its own adapter class. 2012-03-06 16:17:32 -08:00
Corey Johnson
f00632a96e Paste uses Editor.insertText 2012-03-06 15:53:54 -08:00
Corey Johnson
a1a5d9ac75 Add additional auto-indent test 2012-03-06 15:34:39 -08:00
Corey Johnson
e5f15758af 💄 2012-03-06 15:34:17 -08:00
Corey Johnson
a4011ef6d5 Moved default bindings from Global keymap constructor to a separate method. 2012-03-06 15:07:59 -08:00
Nathan Sobo
cb23fdbf92 Add spec for position translation with folds + line wrapping 2012-03-06 15:51:04 -07:00
Nathan Sobo
7e4aae7b4f Add position translation methods to Renderer 2012-03-06 15:33:29 -07:00
Nathan Sobo
8b7638998c Add spec for a fold causing a line to unwrap 2012-03-06 15:13:51 -07:00
Corey Johnson
8129183486 Merge pull request #4 from github/fix-xcode-4.3-build 
Fix compiler error in Xcode 4.3
 2012-03-06 13:42:09 -08:00
Adam Roben
5665fcb48c Fix compiler error in Xcode 4.3 
Presumably this also indicated infinite recursion, but I don't believe Atom is
ever actually deallocated.
 2012-03-06 13:27:47 -08:00
Corey Johnson
668022fb3b Outdent works with Ace's Mode classes 2012-03-06 11:14:50 -08:00
Nathan Sobo
03d5509cca Renderer handles buffer change events for wrapping & folding 2012-03-06 12:11:21 -07:00
Corey Johnson
79edb3fcdf Store tabText in atom. 
This is a combination of tabsOrSpaces and tabSize. I imagine things like these will be stored in a settings object on `atom` at some point.
 2012-03-06 11:08:20 -08:00
Nathan Sobo
c61510ce99 Ensure line wrapping interacts cleanly with folding 2012-03-05 19:15:03 -07:00
Nathan Sobo
ed13a27821 Add specs for more fold corner cases. 2012-03-05 17:46:55 -07:00
Nathan Sobo
59bcb27079 WIP: Start handling nested folds. 2012-03-05 17:29:12 -07:00
Nathan Sobo
d02817af21 Add spec for single-line folds 2012-03-05 17:09:03 -07:00
Nathan Sobo
764c827134 WIP: Add fold handling to renderer… still needs refinement. 2012-03-05 17:03:06 -07:00
Corey Johnson & Nathan Sobo
53fc625534 Inserting a newline indents the cursor (based on information from previous line) 2012-03-05 15:51:56 -08:00
Corey Johnson & Nathan Sobo
3ff8a1e92c Remove insertNewline method 2012-03-05 15:41:03 -08:00
Nathan Sobo
955bb383dd WIP: Start on Renderer, which combines LineWrapper and LineFolder 2012-03-05 16:07:22 -07:00
Nathan Sobo
3cc559fd9c Add Range.fromObject, which takes a [start, end] array 2012-03-05 16:06:57 -07:00
Nathan Sobo
fc7a13ce05 Rename Buffer.getLine to lineForRow 2012-03-05 16:06:27 -07:00