github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-09 14:15:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,891 Commits 140 Branches 571 Tags
487c4ed439ff0f051bec74a66ee11a2ee17628d0
Commit Graph

647 Commits

Author SHA1 Message Date
Corey Johnson & Nathan Sobo
487c4ed439 $self includes work 2012-08-01 11:45:30 -07:00
Corey Johnson & Nathan Sobo
bccd525084 Handle includes 2012-08-01 11:05:37 -07:00
Corey Johnson & Nathan Sobo
fceb9e16f9 remove log statement 2012-08-01 10:52:51 -07:00
Corey Johnson & Nathan Sobo
594e27b057 Parser maintains a stack of rules, which begin/end patterns mutate 2012-08-01 10:47:40 -07:00
Corey Johnson & Nathan Sobo
fbdebd644d Revert "Handle patterns that include other patterns from the grammar repository" 
This reverts commit 64795c032306200f05ce3b262fe58adc86e06b34.
 2012-08-01 09:48:40 -07:00
Corey Johnson & Nathan Sobo
62dc3a1e8f Revert "Replace includes with the patterns to which they refer " 
This reverts commit e7add6472bda071734348dcdd48a6435d685209d.
 2012-08-01 09:48:40 -07:00
Corey Johnson & Nathan Sobo
b56c4dda43 Replace includes with the patterns to which they refer 2012-08-01 09:48:40 -07:00
Corey Johnson & Nathan Sobo
62c5da760c Handle patterns that include other patterns from the grammar repository 2012-08-01 09:48:40 -07:00
Corey Johnson & Nathan Sobo
289b15d032 Create an object-model of the TextMate grammar with methods for the parser 2012-08-01 09:48:39 -07:00
Corey Johnson & Nathan Sobo
0b9d6d4d9b 💄 2012-08-01 09:48:39 -07:00
Corey Johnson & Nathan Sobo
aa02785d67 Parser handles patterns w/ begin/end regexes (if begin/end are on the same line) 2012-08-01 09:48:38 -07:00
Nathan Sobo
7682f586be Parser can tokenize lines containing simple tokens (no nested scopes yet) 2012-08-01 09:48:37 -07:00
Corey Johnson & Nathan Sobo
a2a58a3506 TextMate parser can parse single plain tokens / tokens with captures 2012-08-01 09:48:37 -07:00
Corey Johnson & Nathan Sobo
c6bae093c1 Starting on TextMate bundle support 2012-08-01 09:48:35 -07:00
Corey Johnson & Nathan Sobo
a589557aaa Ignore bracket matching when there are multiple cursors 2012-08-01 09:47:12 -07:00
Corey Johnson & Nathan Sobo
97b492edfc When an identical closing bracket is inserted, don't insert a new character and move cursor to the right. 2012-08-01 09:33:42 -07:00
Corey Johnson & Nathan Sobo
dc50959af1 Coerce Point.add and Point.plus's argument from array to point object 2012-08-01 09:32:02 -07:00
Corey Johnson & Nathan Sobo
3a5e73aa77 Merge branch 'making-folding-better' 2012-07-30 13:43:47 -07:00
Corey Johnson & Nathan Sobo
f7614c210a Add unfold-all and bind it to ctrl-} 2012-07-30 12:11:54 -07:00
Corey Johnson & Nathan Sobo
a7db67e68d When DisplayBuffer.foldBufferRow is called with a buffer row that is within a fold, it folds the scope that incloses the buffer row's fold 2012-07-30 11:46:43 -07:00
Corey Johnson & Nathan Sobo
9622d6f9b3 Rename un/foldScopeContainingBufferRow to un/foldBufferRow. 
Scope containing buffer row was a misnomer. Waiting until I implement the repeat folding feature before considering a better name.
 2012-07-30 10:25:53 -07:00
Corey Johnson & Nathan Sobo
75f0438f6a Rename fold/unfold to foldCurrentRow/unfoldCurrentRow 2012-07-30 09:58:15 -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
960bd1ea70 Show "buffer in conflict" alert after edit session is visible 2012-07-26 13:32:26 -07: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
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
Corey Johnson
470e8a6191 Add rootView.deactivateExtension 2012-07-25 15:45:21 -07:00
Corey Johnson
fefb3bc175 Better error message when extension fails to serialize 2012-07-25 15:16:13 -07: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
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
c05fa7dc6f Merge branch 'master' into global-find 
Conflicts:
	src/app/buffer.coffee
 2012-07-20 19:01:38 -06:00
Corey Johnson & Nathan Sobo
b27a793b92 Fix bug in Project.scan that was getting the state machine into a bad state 
Chunks of stdout data are being buffered by lines. But then we were splitting these chunks on \n and the last fragment was therefore always "". This caused problems. Still need to test this.
 2012-07-19 19:17:31 -06:00
Nathan Sobo
239cba25e4 Use the silver searcher to implement global search 
Parsing uses a simple state machine in `Project.scan`.
 2012-07-19 17:28:46 -06:00
Corey Johnson & Nathan Sobo
9e4f401485 WIP: trying to make preview faster 2012-07-19 11:28:41 -06:00
Corey Johnson & Nathan Sobo
12f765cc47 💄 2012-07-19 11:14:38 -06:00
Corey Johnson & Nathan Sobo
7a85e07cf1 Project.scan handles paths with newlines 2012-07-19 10:27:42 -06:00
Nathan Sobo
a61064eeeb Throw an exception when creating a File object for a path that isn't a file 
This exception is getting thrown inside of `Project.scan` when it incorrectly parses a path with newlines in it. But the exception gets swallowed by ChildProcess.exec. At least it prevents a file from being created that we don't end up unsubscribing from. But `Project.scan` needs to be improved.
 2012-07-19 09:20:45 -06:00
Nathan Sobo
f5e46e57fc Use bundled ack instead of grep 
Our ack is slightly modified to use `'\0'` characters instead of `':'` in the --nogroup listing. This makes it easier to handle both `':'` characters and newlines in filenames, but we aren't really doing that yet.
 2012-07-19 09:17:44 -06:00
Corey Johnson & Nathan Sobo
8534df28d5 Another attempt with find/grep/perl/xargs that doesn't work 2012-07-18 18:04:39 -06:00
Corey Johnson & Nathan Sobo
4b1403724b Ensure that evil filenames do not hose Project.scan 2012-07-18 17:53:53 -06:00
Corey Johnson & Nathan Sobo
b959d5aa37 Buffers are memoized on project by path 2012-07-18 12:56:09 -07:00
Corey Johnson & Nathan Sobo
72750fd4a2 RootView.getEditors() only returns editors that are direct descendants of a pane 2012-07-18 12:45:28 -07:00