probablycorey
512f373ca6
Merge remote-tracking branch 'origin/master' into cj-update-user-keymap
2014-01-02 11:54:06 -08:00
probablycorey
d56137e3c0
Always try to unwatch current user keymap
2014-01-02 09:56:41 -08:00
probablycorey
88ee021b4d
Watch user's keycap for changes and apply them
2013-12-31 15:21:42 -08:00
Kevin Sawicki
9962ce9859
Implement createToken in Syntax
2013-12-31 15:15:40 -08:00
Kevin Sawicki
882d766689
Activate/deactivate grammars directly
2013-12-31 15:15:40 -08:00
Kevin Sawicki
959401f5a7
Drop TextMate prefix from class names
2013-12-31 15:15:40 -08:00
Kevin Sawicki
fa9aa3691b
Extend GrammarRegistry in Syntax
2013-12-31 15:15:40 -08:00
Kevin Sawicki
a95fdce85f
📝 Mark Syntax class as public
2013-12-31 15:15:40 -08:00
Kevin Sawicki
e8edc83e39
💄 Sort requires
2013-12-31 15:15:40 -08:00
Kevin Sawicki
3ff702581a
Group shim lines
2013-12-31 15:15:40 -08:00
Kevin Sawicki
88c9275bff
Activate grammar when already active
2013-12-31 15:15:39 -08:00
Kevin Sawicki
826d536c09
Add atom.syntax.grammars shim
2013-12-31 15:15:39 -08:00
Kevin Sawicki
c99c2af6ae
Remove NullGrammar class now in first-mate
2013-12-31 15:15:39 -08:00
Kevin Sawicki
ccc6eed3da
Remove unused method
2013-12-31 15:15:39 -08:00
Kevin Sawicki
e1aec57ffe
Create tokens in TokenizedBuffer
2013-12-31 15:15:39 -08:00
Kevin Sawicki
2681dcc63c
Remove TextMateGrammar class now in first-mate
2013-12-31 15:15:39 -08:00
Kevin Sawicki
6f5d85edb9
Use grammar registry from first-mate
2013-12-31 15:15:39 -08:00
probablycorey
8d2e1b7e43
Selection::selectToEndOfLine acts on screen lines.
2013-12-31 08:38:27 -08:00
probablycorey
c37b884007
Add moveCursorToEnd/BeginningOfBufferLine
...
Fixes #1123
2013-12-31 08:21:35 -08:00
probablycorey
bac76784e0
cmd-left moves the cursor to column 0 on lines only containing whitespace
...
Fixes #1344
2013-12-30 13:57:34 -08:00
Ben Ogle
458d3b3d3c
Remove fat arrow
2013-12-20 15:04:17 -08:00
Ben Ogle
11ec939924
Add a cancel() function to the promise
2013-12-20 15:03:39 -08:00
Ben Ogle
5fdb3196a3
Add cancelScan()
2013-12-19 17:08:18 -08:00
Ben Ogle
8763a49dc6
Remove log line
2013-12-19 16:39:01 -08:00
Ben Ogle
871b7406cd
Terminate the old search if another is run.
2013-12-19 15:41:29 -08:00
Nathan Sobo
7d47527b17
Merge remote-tracking branch 'origin/master' into ns-telepathic-pane-items
2013-12-18 16:14:44 -07:00
Nathan Sobo
76922c2d46
Include stack of window state parse errors in CI build output
2013-12-18 13:10:25 -07:00
Nathan Sobo
fd7c3f3980
Merge branch 'master' into ns-telepathic-pane-items
...
Conflicts:
src/pane.coffee
2013-12-18 13:07:37 -07:00
Matt Colyer
bf021ab7f7
Merge branch 'master' into win32-specs
...
Conflicts:
tasks/spec-task.coffee
2013-12-18 09:34:28 -08:00
Nathan Sobo
0dc031140c
Omit destroyed pane items
...
This is an interim solution which enables atom/image-view#4 to correctly
deserialize when the path has been deleted both on atom master and in
atom/atom#1326 .
2013-12-17 21:39:12 -07:00
Kevin Sawicki
cef7577826
Install apm into node_modules
...
settings-views launches apm via a NodeBufferedProcess so it still needs to
be available built against Atom's headers.
The version in apm/ is just for running via the CLI directly and is compiled
against node's headers.
2013-12-17 19:25:44 -08:00
Matt Colyer
e7f63b7c62
Merge branch 'master' into win32-specs
2013-12-17 18:22:08 -08:00
Matt Colyer
8b112cfd65
Get core specs running
2013-12-17 17:55:46 -08:00
Kevin Sawicki
ed8800d182
Install apm to apm/ from vendor/apm
2013-12-17 16:53:31 -08:00
Kevin Sawicki
0aabfddfcb
🐎 Stat without exceptions in Directory::getEntries
2013-12-17 16:51:11 -08:00
Matt Colyer
20df9f4666
Add --log-file option for redirecting output
2013-12-17 16:31:13 -08:00
Nathan Sobo
e40b7b1412
Update to telepath 0.79.0 so representation creation can be delayed
...
Instead of creating representations for a class as soon as the class is
registered, we wait until all representation classes are registered and
call `::createRepresentations` on the Atom global to build everything in
a single bottom up traversal.
2013-12-17 17:05:54 -07:00
Nathan Sobo
611559ecd6
Fix pane spec. Fully test serialization lifecycle via ::testPersistence.
2013-12-17 17:05:54 -07:00
Nathan Sobo
c74783ebbf
Allow telepath to manage serialization of non-telepathic pane items
...
This is the first step in converting Pane into a telepath model. We skip
interaction with the deserializer for items and allow telepath to handle
everything. There's actually a preexisting replication error in moveItem
that I'm going to leave until we drop out a Pane model.
2013-12-17 17:05:54 -07:00
Nathan Sobo
9df69f801b
Register deserializers on telepath as representation classes
2013-12-17 17:05:54 -07:00
Nathan Sobo
0438565c43
Fix site.createDocument shim
2013-12-17 16:46:16 -07:00
Nathan Sobo
e7b632eb18
Merge branch 'master' into ns-telepathic-atom-global
2013-12-17 16:30:24 -07:00
Kevin Sawicki
cdce91157f
Reverse load path order
...
Packages may be linked into ~/.atom/packages or ~/.atom/dev/packages
so the resource should be loaded from there when available.
2013-12-17 15:04:17 -08:00
Kevin Sawicki
a566bd469d
Use fs-plus.isFileSync to check path
...
Previously fs::statSyncNoException not being null was used but it always
returns an object or false so the first path checked was always being used.
2013-12-17 15:01:53 -08:00
Kevin Sawicki
389586bb41
Add ~/.atom/dev/packages to load paths
2013-12-17 15:00:27 -08:00
Nathan Sobo
a57083a48b
Mark Atom global class methods with instance equivalents as 'Private:'
2013-12-17 11:18:59 -07:00
Nathan Sobo
3db9e16637
Upgrade to telepath 0.75.0 for custom object support
2013-12-16 19:03:10 -07:00
Nathan Sobo
bd3cfda2bb
Merge branch 'master' into ns-telepathic-atom-global
...
Conflicts:
src/atom.coffee
2013-12-16 18:18:06 -07:00
Ben Ogle
43baee5abd
Merge pull request #1322 from atom/bo-fix-tabs-and-soft-wrap
...
Dont re-atomicize atomic tokens
2013-12-16 15:56:22 -08:00
Ben Ogle
b959fc0a6a
use @
2013-12-16 15:46:07 -08:00
