Commit Graph

2520 Commits

Author SHA1 Message Date
Nathan Sobo
5ef5c4565a Merge branch 'master' of github.com:github/atom into multi-keystroke-bindings 2012-06-18 17:06:17 -06:00
Nathan Sobo
d9dec3d974 Add spec confirming that multi-keystroke bindings can match against bindings in multiple binding sets
For example, if you have a very unspecific binding "ctrl-x ctrl-c", you can also have very specific "ctrl-x …" bindings, and bindings from both sets can be matched. A partial match in a more specific does not rule out later matches in a less specific set.
2012-06-18 17:05:52 -06:00
Nathan Sobo
9e5b4beeaa Add spec to confirm that an entering an unmatched keystroke sequence clears the queued keystrokes 2012-06-18 16:53:58 -06:00
Nathan Sobo
ac4aae2cec WIP: Begin introducing multi-keystroke bindings to Keymap 2012-06-18 16:46:39 -06:00
Corey Johnson & Nathan Sobo
db833a4782 Don't apply all editor bindings to mini editors 2012-06-15 17:49:21 -07:00
Corey Johnson & Nathan Sobo
c02e5bbdbf Do not allow root view to set a font-size less than 1 2012-06-15 17:30:10 -07:00
Corey Johnson & Nathan Sobo
db69ee5627 Calculate gutter dimensions when editor's dimensions are calculated 2012-06-15 17:30:10 -07:00
Nathan Sobo
d9500e6bcd Atom spec no longer closes all open windows
This makes life easier when you're running the spec suite while actually using atom to edit itself.
2012-06-15 16:24:49 -06:00
Nathan Sobo
1c29fc1417 Ctrl-w selects word under cursor 2012-06-15 16:17:45 -06:00
Nathan Sobo
f99ce5782c 💄 2012-06-15 16:03:54 -06:00
Corey Johnson & Nathan Sobo
951f76f2bf Serialize root view state to a string of JSON when storing it on the window upon refresh
This avoid situations where arrays in the window state pointed to a different constructor than the current context's Array constructor.
2012-06-15 15:34:07 -06:00
Corey Johnson & Nathan Sobo
4a35427db3 Delete the newline at the end of a fold only when it makes sense 2012-06-15 14:53:15 -06:00
Nathan Sobo
95622dc64e If the cursor is at any buffer position inside a fold, backspace deletes the folded text 2012-06-15 14:41:05 -06:00
Corey Johnson & Nathan Sobo
8d516fe4fe Use a legitimate replace method in AceAdaptor.
Fixes comment toggling in coffeescript, and requires a better implementation of findMatchingBracket in AceAdaptor for outdent to work.
2012-06-15 11:56:09 -07:00
Corey Johnson & Nathan Sobo
a9a326f626 remove log 2012-06-15 11:53:47 -07:00
Kevin Sawicki
b5d08ffcf3 Add missing 'r' in scrollToEntry method name 2012-06-14 22:15:28 -07:00
Corey Johnson & Nathan Sobo
e38ade2730 Bugfix: Backspace in middle of line below a fold no longer deletes the newline preceding the cursor 2012-06-14 17:08:14 -06:00
Corey Johnson & Nathan Sobo
1dfbaf67d1 Delete at the end of a line above a fold deletes the folded lines (leaving a newline) 2012-06-14 16:58:47 -06:00
Corey Johnson & Nathan Sobo
daa688b1e1 Merge branch 'master' of github.com:github/atom
Conflicts:
	src/app/edit-session.coffee
2012-06-14 16:25:05 -06:00
Corey Johnson & Nathan Sobo
f025bec910 If a selection ends on a fold, backspace/delete delete all lines inside the fold 2012-06-14 15:52:54 -06:00
Corey Johnson & Nathan Sobo
c73eb97d72 💄 2012-06-14 15:41:02 -06:00
Corey Johnson
547688047d Merge pull request #22 from github/command-panel-fixes
Command panel fixes
2012-06-14 14:07:31 -07:00
Corey Johnson & Nathan Sobo
9ada2daebd If command panel selects text within a fold, the fold is destroyed 2012-06-14 14:00:35 -07:00
Corey Johnson & Nathan Sobo
8a2aa881f7 💄 2012-06-14 13:57:33 -07:00
Corey Johnson & Nathan Sobo
8416dc3598 DisplayBuffer.destroyFoldsContainingBufferRow destroys all folds containing buffer row (instead of just folds starting at buffer row) 2012-06-14 13:56:08 -07:00
Corey Johnson & Nathan Sobo
b57eef6dbc Implement meta-G (redo search in reverse) 2012-06-14 11:01:53 -07:00
Corey Johnson & Nathan Sobo
6b5a52ae5c Add repeat-relative-address-in-reverse event to command panel 2012-06-14 11:01:28 -07:00
Corey Johnson & Nathan Sobo
4adffdc9f3 Use isReverse instead of reverse in RegexAddress 2012-06-14 11:00:45 -07:00
Corey Johnson & Nathan Sobo
bc3f9543be Update search in reverse test on command interpreter spec 2012-06-14 11:00:14 -07:00
Corey Johnson & Nathan Sobo
b6f9801a19 Move repeat-relative-address test from command inter peter spec to command panel spec 2012-06-14 10:35:30 -07:00
Corey Johnson & Nathan Sobo
7153f5803d An address range is relative iff both addresses are relative 2012-06-14 10:35:30 -07:00
Corey Johnson
c98ad2973d Adding '-' in front of a RegexAddress causes it to search in reverse 2012-06-14 10:35:29 -07:00
Corey Johnson & Nathan Sobo
940b7b0e7a RootView.proto.activateExtension requires extensions to have names 2012-06-14 11:20:36 -06:00
Corey Johnson & Nathan Sobo
810b9849ee RootView serialize absorbs exceptions when serializing extensions 2012-06-14 11:20:16 -06:00
Corey Johnson & Nathan Sobo
291886b4b3 Rename LanguageMode to TokenizedBuffer 2012-06-14 11:02:52 -06:00
Nathan Sobo
470f46931f Selection views update properly when selections are merged 2012-06-14 10:28:21 -06:00
Nathan Sobo
47533ad3a0 Add spec coverage for command panel serialization and fix bad method call therein 2012-06-13 21:23:33 -06:00
Nathan Sobo
b59e73edcd Rename Renderer -> DisplayBuffer
The idea is that the DisplayBuffer serves a similar role to the Buffer, except that it's holding content in an arrangement that's optimized for display.
2012-06-13 21:02:30 -06:00
Nathan Sobo
5135f3e066 Editor no longer references Renderer directly 2012-06-13 20:37:30 -06:00
Nathan Sobo
81d2e88c8a Nix unused methods 2012-06-13 20:17:57 -06:00
Nathan Sobo
ede9309a80 💄 2012-06-13 20:09:33 -06:00
Nathan Sobo
0c35178cc2 Add newline at end of file 2012-06-13 20:09:18 -06:00
Nathan Sobo
e385f8051f Merge branch 'master' into language-mode 2012-06-13 19:56:01 -06:00
Corey Johnson
958a8bf12c 💄 2012-06-13 17:49:20 -07:00
Corey Johnson
e7dafec21c Rename command to compositCommand in command interpreter 2012-06-13 17:49:12 -07:00
Corey Johnson
17e20d2fb0 Change .editor to .miniEditor in command panel specs 2012-06-13 17:48:51 -07:00
Nathan Sobo
8769061a0f Merge branch 'master' of github.com:github/atom into language-mode 2012-06-13 18:34:59 -06:00
Nathan Sobo
e444ba193c Merge all ace adaptors into a single AceAdaptor class 2012-06-13 18:31:03 -06:00
Nathan Sobo
5f20b09284 Remove Buffer.proto.getMode. All ace interaction should be mediated by LanguageMode 2012-06-13 18:09:28 -06:00
Nathan Sobo
d04d4e22a2 Move autoOutdent code to LanguageMode 2012-06-13 18:08:08 -06:00