Commit Graph

82 Commits

Author SHA1 Message Date
probablycorey
132194337e Merge remote-tracking branch 'origin/master' into cj-deleted-files-not-modified 2013-12-12 11:00:17 -08:00
Ben Ogle
4ffa5bb90e Make this fn private. 2013-12-12 10:34:08 -08:00
Ben Ogle
7111961929 Move function into setTextViaDiff() 2013-12-12 10:34:08 -08:00
Ben Ogle
5d46d7a881 💄 2013-12-12 10:34:08 -08:00
Ben Ogle
8d1d64d9d3 bufferRow -> row 2013-12-12 10:34:08 -08:00
Ben Ogle
60498616b7 numberLines -> lineCount 2013-12-12 10:34:08 -08:00
Ben Ogle
ed745d2072 Remove log lines 2013-12-12 10:34:08 -08:00
Ben Ogle
1f69963982 Apply text to buffer via diff on reload
Previously, it would blindly read from disk on reload, and set the text 
into the editor. This was problematic as it would mess with markers and 
folds. No longer. 

Fixes #1285 and fixes atom/bookmarks#3
2013-12-12 10:34:08 -08:00
Kevin Sawicki
9fbfeb970b Remove mixins already added by Model superclass 2013-12-12 09:04:16 -08:00
probablycorey
4bfcdf4d5b Remove unmodified editors from pane when the buffer is deleted 2013-12-10 17:08:07 -08:00
probablycorey
201717a9aa Remove duplicate destroy
Telepath now emits the 'destroy' event
2013-12-10 17:04:46 -08:00
probablycorey
24c84fe09c Merge remote-tracking branch 'origin/master' into cj-deleted-files-not-modified 2013-12-10 14:46:26 -08:00
probablycorey
63e3be8630 Only mark a deleted file as modified if it was previously modified.
Fixes #693
2013-12-09 11:06:29 -08:00
Nathan Sobo
a4d2b4d21a Make TokenizedBuffer a telepath.Model subclass
There's a bunch of improvised code to make this work right now because
of the circularity of this refactoring. It will stabilize over time.
2013-12-07 02:25:47 -08:00
Nathan Sobo
b61654b52f Upgrade to telepath 0.61.0
This version adds a bunch of reactive primitives and ensures we destroy
documents when they are no longer referenced.
2013-12-06 21:55:57 -08:00
probablycorey
a0ceb78627 Move snapshot code to package 2013-11-26 11:15:55 -08:00
Kevin Sawicki
cdc7f70b22 Pass buffer from event to TextBuffer::removeBuffer
Previously only the last buffer would be destroyed since the buffer
from the loop variable was being used.
2013-11-21 13:04:47 -08:00
probablycorey
bf05ddb958 🔫
I screwed up a rebase, this nasty commit is the result.
2013-11-19 15:15:12 -08:00
probablycorey
955d379e0e Rename EditSession to TextEditor 2013-11-19 14:56:09 -08:00
probablycorey
aaa82e23da Rename Editor to TextEditorView 2013-11-19 14:34:20 -08:00
Kevin Sawicki
a66543048b Include buffer in emitted events 2013-11-18 10:06:14 -08:00
Kevin Sawicki
3fe88c4df1 💄 Add period to comment 2013-11-15 11:17:35 -08:00
Kevin Sawicki
1d7b4c5f9a Updating places still using Buffer instead of TextBuffer 2013-11-15 11:17:35 -08:00
Kevin Sawicki
1c8df2c0b5 💄 Organize imports in TextBuffer 2013-11-15 11:17:35 -08:00
Kevin Sawicki
1d4f2fba8b Use id provide by telepath.Model 2013-11-15 11:17:34 -08:00
Kevin Sawicki
12dd412439 Restore relative path as uri of TextBuffer 2013-11-15 11:17:34 -08:00
Kevin Sawicki
7b43c8a860 Use Atom::replicate in git spec to simulate project serialization 2013-11-15 11:17:33 -08:00
Kevin Sawicki
cf0bdb9c94 Remove unused property 2013-11-15 11:17:33 -08:00
Kevin Sawicki
abc1f23516 Remove unused relative path from Editor/EditSession/TextBuffer 2013-11-15 11:17:33 -08:00
Kevin Sawicki
dc7e7f9ed0 Listen for buffer destroyed in Project 2013-11-15 11:17:33 -08:00
Kevin Sawicki
5fdec4dc7b Move checkoutHead implementation to Editor 2013-11-15 11:17:33 -08:00
Kevin Sawicki
055ec8cb9c Implement beforePersistence in TextBuffer 2013-11-15 11:17:33 -08:00
Kevin Sawicki
21e0e95a7a Add model property for disk contents digest 2013-11-15 11:17:33 -08:00
Kevin Sawicki
6caed6e918 Add model property for relative path 2013-11-15 11:17:32 -08:00
Kevin Sawicki
fe9f1373c1 Cancel stopped changing timeout when destroyed 2013-11-15 11:17:32 -08:00
Kevin Sawicki
1808e5f991 Initial 🔪 at extending telepath.Model in Project/TextBuffer 2013-11-15 11:17:32 -08:00
Kevin Sawicki
d793d114d4 Use atom.site instead of window.site 2013-11-11 08:44:26 -08:00
Ben Ogle
ee896846bb Comments. Change up the api a tiny bit. 2013-11-08 12:25:59 -08:00
Ben Ogle
ddd560b785 Add replace to project and buffer 2013-11-08 12:20:43 -08:00
Kevin Sawicki & Nathan Sobo
55c5ae926c Create telepath string with replicate: false option 2013-11-07 10:02:43 -08:00
Kevin Sawicki
ef97dadea1 Update fs-utils references to fs-plus 2013-11-01 08:46:02 -07:00
Nathan Sobo
62ccf92a5d Get core specs passing w/ Telepath v0.14.0. Delete replication specs.
Telepath v0.14.0 is a ground-up rewrite of the replication library,
which is principally designed to support moving document fragments
within the overall document. But it's also a lot better in a number of
ways. This commit does the minimal to get things working on the new
telepath. Standard package specs don't pass yet. Also, I deleted the
replication specs since they are extremely convoluted and will be able
to be replaced with much better versions once I complete the changes
enabled by the new Telepath.
2013-10-31 17:08:40 -06:00
probablycorey
0dd0c39918 Update comment 2013-10-25 15:29:52 -07:00
probablycorey
7002b4e5f6 Factor out common buffer loading code 2013-10-25 15:26:56 -07:00
probablycorey
bb281ce5af 💄 2013-10-25 15:19:20 -07:00
probablycorey
b5b07c1052 Emit modified-status-changed event when using serialized text 2013-10-25 14:40:53 -07:00
probablycorey
c77b44d5ef Move variable assignment 2013-10-25 14:29:59 -07:00
probablycorey
feed72b68e Change @loadFromDisk to @useSerializedText 2013-10-25 14:21:39 -07:00
probablycorey
8956881192 Only load serialized content if the disk content's have not changed. 2013-10-25 13:50:16 -07:00
probablycorey
32bc8a6258 Remove initialText option from TextBuffer constructor 2013-10-25 13:50:06 -07:00