Commit Graph

123 Commits

Author SHA1 Message Date
Garen Torikian
e478d9b7a0 Add more corrections off of the #Internal syntax 2013-04-18 13:38:26 -07:00
Garen Torikian
4c56e8bb57 Merge branch 'master' into api/docs 2013-04-14 09:43:06 -07:00
Garen Torikian
8bd02358d2 Should I regret a lack of better commit messages? 2013-04-12 22:35:54 -05:00
Kevin Sawicki
7b42e975fb Include hidden files when running nak 2013-04-12 11:48:44 -07:00
Garen Torikian
7e5b6bf5c4 Massive updates 2013-04-11 21:11:12 -05:00
Garen Torikian
8bcb01383c Add Project 2013-04-10 18:16:54 -05:00
Garen Torikian
bd00c5d53d stash 2013-04-10 18:04:14 -05:00
Kevin Sawicki
7c9119c793 Add ImageEditSession.canOpen(path)
This returns whether the path specified is an image that can
be loaded internally by the image view.
2013-04-08 15:46:24 -07:00
Kevin Sawicki
6ce3f87448 Add initial image viewer
An image session will be opened by project.buildEditSession()
for known image extensions.

Closes #203
2013-04-08 15:36:35 -07:00
Kevin Sawicki
a5870cedd2 Use more generic core.excludeVcsIgnoredPaths config key 2013-04-03 11:45:55 -07:00
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
Kevin Sawicki
34ca5ce949 nak no longer includes a space after the colon 2013-04-02 16:49:33 -07: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
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
7f8e2aba1b Stash changes 2013-03-31 00:22:27 -07: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
Garen Torikian
9e3935f349 Fix scan specs 2013-03-28 12:09: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
Garen Torikian
6a08827830 Properly append and count matches 2013-03-27 16:18:25 -07:00
Garen Torikian
7233d9d64b Start figuring out where the pieces go 2013-03-27 01:06:34 -07:00
Garen Torikian
02873f5116 drop in nak for search 2013-03-26 15:02:48 -07:00
Corey Johnson & Nathan Sobo
db4420e068 Move grammar overrides to syntax (no serialization yet) 2013-03-22 17:35:35 -06:00
Nathan Sobo
a2f72882d7 Rename grammarForFilePath to selectGrammar
The old name was misleading because it the decision is based on the
file contents in some circumstances.
2013-03-22 17:35:27 -06:00
John Barnette
694b499b21 Only relativize stuff under the project root 2013-03-14 16:53:33 -07:00
Kevin Sawicki
8dbcb44d06 Rename traverseTree to traverseTreeSync
Also rename traverseTreeAsync to traverseTree
2013-03-13 14:40:31 -07:00
Kevin Sawicki & Nathan Sobo
1d1ba5f6d1 Use node's require instead of internal require 2013-03-12 10:38:05 -07:00
Kevin Sawicki
2212222c47 Use underscore node module 2013-03-11 11:22:36 -07:00
Kevin Sawicki
acf5f4ce5e Remove fs/$native.getAllFilePathsAsync()
This was previously only used by project.getFilePath()
which should have been using fs.traverseTree() instead.
2013-03-07 17:48:36 -08:00
Kevin Sawicki
c22d14c5b0 Use child_process.spawn from Project.scan 2013-03-07 17:36:21 -08:00
Nathan Sobo
beaeac4425 Rename buildEditSessionForPath to buildEditSession
Since this is the more external method, having a shorter name
is more convenient. The former `buildEditSession` method took a
Buffer, and is now called `buildEditSessionForBuffer`.
2013-03-07 09:28:51 -08:00
Kevin Sawicki
4fe6db240b Consolidate Git status checking
Now the status bar and tree view both listen for
status change events and use the cached information
available from the git object to update their views.
2013-03-04 21:43:33 -08:00
Kevin Sawicki
2ec4d558ba Make project's Git repository a window global
This allows it to operate independently of the
project and mirror the availability of the root view
and project.
2013-03-04 21:43:33 -08:00
Corey Johnson & Kevin Sawicki
f8563a1509 💄 2013-02-26 09:04:02 -08:00
Kevin Sawicki
6047590544 Register deserializer for Project class 2013-02-19 21:53:48 -08:00
Nathan Sobo
6e191aba5b Move matching bracket insertion to bracket-matcher package 2013-02-08 09:51:31 -07:00
Kevin Sawicki
2c4a57c293 Guard against possibly null repo 2013-01-21 16:22:34 -08:00
Corey Johnson
c3a2b99b69 Merge pull request #124 from github/auto-indent-config
Auto-indent config
2013-01-10 11:02:54 -08:00
Kevin Sawicki & Nathan Sobo
caffda6027 Add Git.destroy() that frees native repository 2013-01-09 17:07:29 -08:00
Corey Johnson
261a8aae2d Remove @autoIndent from Project and EditSession 2013-01-09 15:22:37 -08:00
Kevin Sawicki
8d0d62b486 Add Git.open that returns null on exceptions 2013-01-08 21:15:42 -08:00