Commit Graph

2051 Commits

Author SHA1 Message Date
Kevin Sawicki
ede5e88a19 Merge origin/master into nak-powered-search
Conflicts:
	src/packages/command-panel/lib/preview-list.coffee
	src/packages/fuzzy-finder/lib/load-paths-task.coffee
2013-04-03 11:43:35 -07:00
Nathan Sobo
f03b6207de Make all requires of 'fs-utils' assign to fsUtils var instead of fs 2013-04-03 12:01:37 -06:00
Nathan Sobo
5df78812ef Rename EditSession.scanInRange to scanInBufferRange
This is more consistent with other range-oriented methods on
EditSession. At this layer, we need to be explicit about what kind
of range we are talking about.
2013-04-03 11:28:55 -06:00
Nathan Sobo
59a5a5bc8f Always pass a hash to TextBuffer.scanInRange iterators
This makes it easy to only assign variables for the information you
need in the iterator. Before, we always forced you to take a match and
a range as the first two arguments even if you weren't using them.
2013-04-03 11:16:49 -06:00
Nathan Sobo
11f140ac5a Don't save/load window state to/from disk when pathToOpen is undefined
This fixes a bug where `meta-n` was not opening a new buffer in the
opened window if window state was previously saved for an `undefined`
path.
2013-04-03 10:27:57 -06:00
Nathan Sobo
ec93dc38b7 Version serialized state of EditSession
Since buffers are now serialized directly, previous versions of the
EditSession state which used the buffer's path as the `buffer` key
are no longer valid.
2013-04-03 10:21:56 -06:00
Kevin Sawicki
ba028f6358 Support ~/.atom/user.less 2013-04-02 17:37:21 -07:00
Kevin Sawicki
34ca5ce949 nak no longer includes a space after the colon 2013-04-02 16:49:33 -07:00
Mutwin Kraus
9a6b5986fe Add editor.selectLine 2013-04-02 15:24:12 -07:00
Mutwin Kraus
a9c74762cc Add focusPreviousPane to pane container 2013-04-02 15:24:12 -07:00
Nathan Sobo
1bbc9f61e9 Remove unsaved buffer prompt on reload now that we handle it correctly 2013-04-02 15:45:17 -06:00
Nathan Sobo
dab8c5b53b Assign cachedDiskContents when unsaved buffer is deserialized
This allows the buffer to return to an "unmodified" state if the
unsaved changes are reversed.
2013-04-02 15:45:16 -06:00
Nathan Sobo
3150785db2 Ensure we never deserialize two instances of the same buffer
We might have two edit sessions pointing to the same buffer, for
example if we have a split pane… So when we deserialize a buffer, we
always need to check that we don't already have an instance of that
buffer on the project. If we do, then we've already deserialized it
once so we don't need to worry about the saved text.

We still have a problem when deserializing previously unsaved buffers,
because we can't use the path to identify them.
2013-04-02 15:45:16 -06:00
Nathan Sobo
e8216a8313 Don't store @project reference inside TextBuffer. Use the global. 2013-04-02 15:45:16 -06:00
Mutwin Kraus
cc87595e4e Serialize TextBuffer inside EditSession serialize 2013-04-02 15:45:16 -06:00
Mutwin Kraus
693d8258ad Preserve buffer contents for unsaved files when reloading 2013-04-02 15:45:16 -06:00
Kevin Sawicki
699212a13e Always pull line text from buffer
This accounts for positional changes that may occur if the marker
the operation is tracking moves.
2013-04-02 14:24:36 -07:00
Garen Torikian
7ab79d05f0 Merge master 2013-04-02 14:12:20 -07:00
Kevin Sawicki
d2f2011ea3 Skip leading space after colon in nak output
This was causing a spec to fail since the line text now had a leading
space for all results since the separator before the line text is now
': ' instead of just ':'.
2013-04-02 13:50:48 -07:00
Kevin Sawicki
f3e1a72882 Only populate list from timeout when still on DOM 2013-04-02 13:14:56 -07:00
Kevin Sawicki
995ae4c9e2 Merge branch 'absolute-paths-in-fuzzy-finder' 2013-04-02 09:28:53 -07:00
probablycorey
bd3eb02b1b Remove sortable list class
Because sortable list was only being used by tab bar view, I got rid
of the class hierarchy.
2013-04-01 17:10:48 -07:00
probablycorey
7e2ea8aff1 Allow tabs to be moved to the beginning and end of the tab bar
Closes #409 (409, puts grease on the run! http://www.dailymotion.com/video/xxsbbb_formula-409-1990-puts-grease-on-the-run-commercial-2_tv#.UVocOZbF30Y)
2013-04-01 16:46:57 -07:00
Garen Torikian
6f982c7c4c Fix spec 2013-03-31 01:11:19 -07:00
Garen Torikian
4cd181022d Restore old UI 2013-03-31 01:02:53 -07:00
Garen Torikian
f48355ce10 Merge branch 'nak-nostream' into nak-powered-search 2013-03-31 00:45:14 -07:00
Garen Torikian
5e5437502f reset 2013-03-31 00:45:05 -07:00
Garen Torikian
7f8e2aba1b Stash changes 2013-03-31 00:22:27 -07:00
Kevin Sawicki
19162db3ce Clip TextBuffer.characterIndexForPosition() position 2013-03-30 00:47:19 -04:00
Kevin Sawicki
da090b57d4 Use line ending length for mapping positions/characters
Previously the line ending length was hard-coded to one which
would cause TextBuffer.scanInRange() to return incorrect results
since one character per line wasn't being accounted for.

Closes #428
2013-03-30 00:30:54 -04:00
probablycorey
d3920cdc05 Click and drag on the gutter selects lines correctly
Closes #352
2013-03-29 17:58:27 -07:00
probablycorey
a1e1bee334 Allow theme's package.cson to leave off stylesheet extension 2013-03-29 15:02:44 -07:00
Corey Johnson & Nathan Sobo
7d9e64a52d Mock getMaxTokensPerLine instead of overwriting member var 2013-03-29 11:22:01 -07:00
Corey Johnson & Nathan Sobo
a9175665fa 💄 2013-03-29 11:22:01 -07:00
Kevin Sawicki
3773061cb5 Remove unneeded empty array fallback 2013-03-29 14:15:20 -04:00
Garen Torikian
082acf4386 Stash filestream work 2013-03-29 09:35:40 -07:00
Kevin Sawicki
95218ca9f5 Remove commented out logging 2013-03-28 22:29:05 -04:00
Kevin Sawicki
bd48cfced0 Don't track ctrl-click as the start of a selection
Closes #396
2013-03-28 22:06:56 -04:00
probablycorey
aab50d3c2c Only parse the first 100 tokens of a line
This fixes the UI thread lockup when there is a gigantic line in a
file (like minified js). I took a stab at making line tokeninization
async on the atom/async-single-line-tokenization branch, but it was
still too slow.

Closes #150
2013-03-28 17:14:45 -07:00
Garen Torikian
9e3935f349 Fix scan specs 2013-03-28 12:09:14 -07:00
Garen Torikian
b298f63e4c Merge master 2013-03-27 19:47:14 -07:00
Garen Torikian
af78a6b50f Remove unneeded quotes 2013-03-27 19:40:20 -07:00
Chris Wanstrath
764a7bf257 Merge branch 'master' into absolute-paths-in-fuzzy-finder
Conflicts:
	src/packages/fuzzy-finder/lib/load-paths-handler.coffee
2013-03-27 19:10:50 -07:00
Kevin Sawicki
d54f2e6eab Only track selections that start with a left-click
Closes #396
2013-03-27 21:06:56 -04:00
probablycorey
72f57ad993 Remove old grammar view files 2013-03-27 17:34:14 -07:00
probablycorey
5308e03096 Move GrammarView into GrammarSelector package 2013-03-27 17:02:13 -07:00
Garen Torikian
6a08827830 Properly append and count matches 2013-03-27 16:18:25 -07:00
probablycorey
fd7772a653 Reset scrollLeft when setSoftWrapColumn is called
When the scroll view is scrolled and overflow-x is set to 
'hidden' the scroll view renders wrong. Setting scrollLeft to 0 fixes
this problem. I'm unhappy with this solution, but it was a
simple way to get the scroll view to update its layout.

Closes #137
2013-03-27 15:13:55 -07:00
Kevin Sawicki
1d84274973 Return existing selections from addSelection()
Previously if a selection was added and then merged
away the selection-added event would still fire even
though the selection was already destroyed.

Now the existing selection that intersects with the
range is returned when the merge destroys the new selection.

Closes #374
2013-03-27 17:59:55 -04:00
Kevin Sawicki
d14ddf6f38 Remove unused require 2013-03-27 14:28:17 -04:00