Cheng Zhao
3929189e7a
Merge branch 'master' into privilege-escalation
...
Conflicts:
src/text-buffer.coffee
2014-02-12 19:32:49 +08:00
Kevin Sawicki
d9ddf516f8
📝 Clarify TextBuffer::isInConflict
2014-02-11 08:46:21 -08:00
Kevin Sawicki
1436b8eb5e
Rename path variables to filePath
2014-02-11 08:46:00 -08:00
Kevin Sawicki
1645efa2ce
Clear conflict when the buffer is saved
2014-02-11 08:46:00 -08:00
Cheng Zhao
d0fe2c9a5b
Cache content after file is written successfully.
2014-02-11 15:10:41 +08:00
Kevin Sawicki
c00c5c97f1
Remove unused file extension API
2014-02-10 14:43:47 -08:00
Kevin Sawicki
967db1f7b8
Remove more empty Private: comment blocks
2014-02-06 11:21:03 -08:00
Kevin Sawicki
227454e27e
Remove ### style visibility comments
2014-02-06 10:40:45 -08:00
Kevin Sawicki
932a792289
Remove Private: prefix
2014-02-06 10:02:53 -08:00
Nathan Sobo
f8d959ae16
Upgrade to text-buffer 0.12.0
...
* Drop deprecation of insert/append/delete. The method names will remain
short.
* Replace ::getLastPosition with ::getEndPosition
2014-01-08 10:53:07 -07:00
Nathan Sobo
b29f1965f0
Move more methods into text-buffer npm
2014-01-07 10:19:43 -07:00
Nathan Sobo
48a2a1934b
Start moving text related methods to text-buffer npm
2014-01-07 09:18:59 -07:00
Nathan Sobo
d6de973500
Remove shims that call super
...
They were previously there for documentation purposes, but we've decided
to document them in the text-buffer npm directly and link it into the
documentation. This drops some of the docs on delegated methods, because
our docs generator doesn't understand `delegatesMethods` declarations,
but TextBuffer was marked private anyway so we can get back to it later.
2014-01-06 15:16:34 -07:00
Nathan Sobo
25cc37bc86
Replace {StringMarker} references with {Marker} in API docs
2014-01-06 15:13:12 -07:00
Nathan Sobo
8da9e8ddc1
Rename nostalgia to serializable
...
This name was surprisingly available and better matches this module's
utilitarian nature.
2014-01-03 18:32:44 -07:00
Nathan Sobo
66831ce8b9
Subclass the text-buffer npm TextBuffer
2013-12-31 12:46:47 -07:00
Nathan Sobo
dd2c6d2f24
Eliminate TextBuffer's dependence on telepath
...
Atom's TextBuffer now relies on the text-buffer npm for its core
functionality.
2013-12-31 12:13:15 -07:00
Nathan Sobo
3db9e16637
Upgrade to telepath 0.75.0 for custom object support
2013-12-16 19:03:10 -07:00
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
