github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-29 00:38:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
18,310 Commits 140 Branches 571 Tags
bd19899dd83b94de29b2b2d215fb8d9883ba9aec
Commit Graph

18310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Corey Johnson
69d7ff0a55 add unfold to display buffer 2012-07-27 16:05:56 -07:00
Corey Johnson
7ff31d1ad7 Remove toggleFold and replace with fold 2012-07-27 13:46:50 -07:00
Corey Johnson
76ffa5a2c5 change toggle-fold to fold 2012-07-27 13:45:13 -07:00
Nathan Sobo
dc662ed071 When ( [ { ' or " is inserted, insert the matching character after the cursor 2012-07-27 13:08:43 -06:00
Nathan Sobo
87f4d8c6e9 Upon inserting '(', insert matching ')' character after cursor 2012-07-27 13:02:26 -06:00
Nathan Sobo
d0d5cb534f Merge branch 'master' of github.com:github/atom 2012-07-27 12:30:17 -06:00
Nathan Sobo
3516dea210 Introduce LanguageMode wrapper for Ace modes as a foundation of our own modes 
LanguageMode is the central point for all language-specific behavior associated with an EditSession. There is one LanguageMode instance per EditSession. LanguageMode has access to the EditSession and its TokenizedBuffer, and in reverse the EditSession, DisplayBuffer, and TokenizedBuffer also make use of LanguageMode. This is a bit incestuous, but I think it's okay because you can think of LanguageMode as a swappable strategy object that governs language-specific aspects of that constellation of objects.
 2012-07-27 12:30:06 -06:00
Corey Johnson
20ff70115f Fix bug in failing editor spec 2012-07-27 11:11:45 -07:00
Corey Johnson
960bd1ea70 Show "buffer in conflict" alert after edit session is visible 2012-07-26 13:32:26 -07:00
Nathan Sobo
79893d96b6 Merge commit '0384f025dd6915d2d9771e37983dc839e49b28f7' 2012-07-26 14:11:29 -06:00
Nathan Sobo
334ba6ba82 Ctrl-meta-1 reveals the active file in the tree view 2012-07-26 14:10:02 -06:00
Corey Johnson
0384f025dd Add Buffer.isInConflict() 2012-07-26 11:00:16 -07:00
Corey Johnson
42299c6a71 When the active edit session is modified, and its file is then modified by the file system, it displays an alert. 2012-07-26 10:59:58 -07:00
Nathan Sobo
8b743b90a2 Bugfix: Don't clear selections after running an x command w/ no matches 
Operations now return a range to select rather than actually performing a selection in `execute`. This allows the composite command to aggregate all ranges to select and only change the selection if it's non empty. Before we had to clear the selections ahead of time and then rely on each operation to imperatively add its selection. This is easier to control. It also ensures that when we execute a previewed operation, we don't add a selection but instead change the selection.
 2012-07-26 11:53:03 -06:00
Nathan Sobo
40c4373629 Merge branch 'master' of github.com:github/atom 2012-07-26 11:26:48 -06:00
Nathan Sobo
dcc1193b49 Preserve focus state of command panel's mini-editor on refresh 2012-07-26 11:26:38 -06:00
Corey Johnson
0c15b0f7be Remove width 100% from .commandPanel (it was not needed and now command panels border is consistent) 2012-07-26 10:19:13 -07:00
Nathan Sobo
252a1a4d5f 💄 2012-07-26 10:29:42 -06:00
Nathan Sobo
786c9dd8c8 Merge branch 'master' of github.com:github/atom 2012-07-26 10:09:38 -06:00
Nathan Sobo
54616aee78 Bugfix: When the command panel makes a selection, it destroys surrounding folds 2012-07-26 10:09:28 -06:00
Nathan Sobo
f2fa9793b1 Remove logging 2012-07-26 10:08:16 -06:00
Corey Johnson
9722bde747 don't assume DirectoryViews have entries when serializing 2012-07-25 16:04:08 -07:00
Corey Johnson
1fad6ad869 fixed :probablycorey:'s :shit:show 2012-07-25 15:58:22 -07:00
Corey Johnson
470e8a6191 Add rootView.deactivateExtension 2012-07-25 15:45:21 -07:00
Corey Johnson
d737199299 Deactivate the root whew instead of deactivating the tree view 2012-07-25 15:16:13 -07:00
Corey Johnson
c91e28071a Add deactivate to TreeView 2012-07-25 15:16:13 -07:00
Corey Johnson
70dfdc6cdd a TreeView without a root path can be serialized 2012-07-25 15:16:13 -07:00
Corey Johnson
fefb3bc175 Better error message when extension fails to serialize 2012-07-25 15:16:13 -07:00
Nathan Sobo
31914d1056 Merge branch 'master' of github.com:github/atom 2012-07-25 15:37:45 -06:00
Nathan Sobo
7dc9b2dbf5 Fix bug where short folded lines don't always span the scroll view 2012-07-25 15:32:15 -06:00
Corey Johnson
0e1a52b090 Eliminate race condition for unwatching paths. 2012-07-25 14:15:06 -07:00
Nathan Sobo
6428fa9733 Merge pull request #31 from github/global-find 
Search in project
 2012-07-25 13:32:33 -07:00
Nathan Sobo
1886b2a48e Merge branch 'master' of github.com:github/atom into global-find 
Conflicts:
	spec/app/buffer-spec.coffee
	spec/extensions/command-panel-spec.coffee
	spec/extensions/tree-view-spec.coffee
	src/app/buffer.coffee
	src/extensions/command-panel/command-panel.coffee
	src/extensions/command-panel/keymap.coffee
 2012-07-25 13:38:12 -06:00
Nathan Sobo
7270758a9e Focus the active editor after executing a previewed operation 2012-07-25 13:26:57 -06:00
Nathan Sobo
454557b502 Merge branch 'master' into global-find 
Conflicts:
	spec/extensions/command-panel-spec.coffee
	src/app/buffer.coffee
	src/extensions/command-panel/command-panel.coffee
	src/extensions/command-panel/keymap.coffee
 2012-07-24 17:59:49 -06:00
Nathan Sobo
09114b5a1d Command panel no longer overlays editors, but pushes them up w/ flexbox. YES! 2012-07-24 17:34:28 -06:00
Nathan Sobo
3dbb7c2426 Use legacy flexbox to implement vertical tool panels for consistency 2012-07-24 17:23:33 -06:00
Nathan Sobo
6e75567fee Enable status bar in the default .atom/atom.coffee file 2012-07-24 17:19:17 -06:00
Nathan Sobo
9798b2531e Merge branch 'master' of github.com:github/atom 2012-07-24 17:18:00 -06:00
Nathan Sobo
e49e1c58dd Fix editor's lack of cooperation as a flexbox item 
Two main changes: First, use absolute position left/right/top/bottom of 0 as a hack to achieve 100% width and height of the flexbox that contains the gutter and scroll view when it is inside an editor that is itself a flexbox item. Now we don't rely on the editor having a definite height because of the absolute positioning. This seemed to confuse the newer flexbox implementation, so I fell back to the old one which seems to work better than last time I tried it for this purpose (it had rendering artifacts before)
 2012-07-24 17:17:49 -06:00
Corey Johnson
dc50002681 does this fix the flexbox problem? 2012-07-24 16:11:17 -07:00
Nathan Sobo
98decaadef This is why, sadly, even the old flex box doesn't seem to work for us. 2012-07-24 16:53:36 -06:00
Corey Johnson
e0fe617c57 a version of flexbox using the old style 2012-07-24 15:24:52 -07:00
Corey Johnson
e491fe7bb7 Clean up after tests 2012-07-24 10:52:42 -07:00
Corey Johnson & Nathan Sobo
239fd2f9e6 buffer triggers a 'path-change' event when a file is moved or removed 2012-07-24 10:34:30 -07:00
Corey Johnson & Nathan Sobo
eafd007c39 Make error an optional argument to unwatchPath 2012-07-24 10:19:58 -07:00
Nathan Sobo
66f80c2dd8 Backfill coverage for handling of breaks in Project.scan subprocess output 
If the stdout callback is fired with partial data, and it ends right after a path, we need to ensure we don't handle it as if there's an extra newline.
 2012-07-24 10:07:07 -06:00
Nathan Sobo
5ebcabb813 Fix preview list cursor styling 2012-07-23 20:14:15 -06:00
Nathan Sobo
c493272be1 Fix click behavior when the event target is a child of the li instead of the li 2012-07-23 20:12:06 -06:00
Nathan Sobo
07cd01571e Apply some more styling, for better or worse :-) 2012-07-23 20:02:32 -06:00