Max Brunsfeld
686c72eebe
Merge pull request #6978 from mostafaeweda/initial-paths-2
...
Initial paths shouldn't be normalized on save and restore [2]
2015-05-29 10:28:56 -07:00
Nathan Sobo
447dfd8bec
If a keystroke is bound to ‘unset!’, omit it in the application menu
...
Fixes atom/atom-keymap#79
This is more general than I would like. If the keystroke is unset in
any context, we err on the side of caution and don’t add it to the
application menu for any command. Since our application menu isn’t
context aware, this should be good enough for now and solve the 80%
case. Someday we should make the application menu update / gray out
options when the focused element changes.
2015-05-28 22:59:10 +02:00
Nathan Sobo
31cf19a205
Use previous definition of scope selector match to fix API breakage
...
I switched to first-mate Selector because I didn’t want to replicate
the poorly-defined Token::matchesScopeSelector method now that tokens
are not stored on lines. However, the first-mate semantics are stricter
and that broke the API. Perhaps using selector-kit here would be better,
but I just wanted to put back exactly to how it was for now.
/cc @ypresto
2015-05-28 10:38:35 +02:00
Mostafa Eweda
4c9e6c5a27
Revert "Merge pull request #6977 from atom/revert-6813-local-initial-paths"
...
This reverts commit 0c66802278
, reversing
changes made to bdce576ab9
.
2015-05-27 11:18:15 -07:00
Max Brunsfeld
0dcdfa1e89
Revert "Initial paths shouldn't be normalized on save and restore (could contain uris)"
2015-05-27 10:26:59 -07:00
Max Brunsfeld
8dff5bbe4c
Merge pull request #6813 from mostafaeweda/local-initial-paths
...
Initial paths shouldn't be normalized on save and restore (could contain uris)
2015-05-26 15:48:58 -07:00
Machiste Quintana
8ca1cf2c98
👕 Fix linter errors in text-editor-spec
2015-05-22 19:50:04 -04:00
Machiste Quintana
82958d5aa0
WIP: 👕 Fix even more linter errors
2015-05-22 17:03:06 -04:00
Machiste Quintana
d5bcc0433d
WIP: 👕 Fix linter errors
2015-05-22 16:29:12 -04:00
Nathan Sobo
865015e47d
Correctly compute bufferDelta for last soft wrap line segment
...
Fixes #6885
2015-05-21 19:56:53 +02:00
Nathan Sobo
2379b3803f
Revert "Revert "Merge pull request #6757 from atom/ns-less-memory-for-tokens""
...
This reverts commit 7cb0bc3bc2
.
2015-05-21 19:56:52 +02:00
Nathan Sobo
7cb0bc3bc2
Revert "Merge pull request #6757 from atom/ns-less-memory-for-tokens"
...
This reverts commit 0cd1f110b5
, reversing
changes made to d75d202d33
.
Conflicts:
package.json
2015-05-21 16:25:23 +02:00
Nathan Sobo
0cd1f110b5
Merge pull request #6757 from atom/ns-less-memory-for-tokens
...
Use 70% less memory for TokenizedLines by using a different representation
2015-05-20 19:47:52 +02:00
Mostafa Eweda
e7064bfc9d
Fix tests + add integration test
2015-05-19 19:13:19 -07:00
Mostafa Eweda
c3552c95bc
Address comments + add tests
2015-05-19 19:05:45 -07:00
Max Brunsfeld
2bfbb7619e
Fix bug w/ markers mutated inside of change listeners
2015-05-19 17:48:53 -07:00
Max Brunsfeld
a1cc35b270
Fix DisplayBuffer spec
...
Marker updates now happen after all buffer changes
2015-05-19 15:18:20 -07:00
Nathan Sobo
adb4988c02
Merge remote-tracking branch 'origin/master' into ns-less-memory-for-tokens
2015-05-19 01:52:10 +02:00
Kevin Sawicki
33ac25479b
🎨 Correct indentation
2015-05-18 15:39:57 -07:00
Kevin Sawicki
00505188fa
Add spec for grammar score tie-breaking
2015-05-18 15:30:14 -07:00
Kevin Sawicki
4378255ab6
syntax2 -> grammars2
2015-05-18 15:30:14 -07:00
Kevin Sawicki
84c4ee4c79
atom.syntax -> atom.grammars
2015-05-18 15:30:14 -07:00
Nathan Sobo
3dcf9a4c66
Merge remote-tracking branch 'origin/master' into ns-less-memory-for-tokens
2015-05-16 03:05:11 +02:00
Kevin Sawicki
3a51c44b55
👕 Use skinny arrow for afterEach
2015-05-14 17:03:48 -07:00
Max Brunsfeld
d9e4aa16d2
Run package specs from the active item's project folder
2015-05-14 16:18:54 -07:00
jssln
f6b15ee678
Merge pull request #6776 from jssln/gutterPolish
...
Refactor `state.gutters` in TextEditorPresenter; pass minimal state to gutter components
2015-05-14 15:43:39 -07:00
Max Brunsfeld
855d327d35
Merge pull request #6760 from atom/mb-text-buffer-6
...
Upgrade text-buffer for marker performance improvements
2015-05-14 14:29:35 -07:00
Nathan Sobo
870b4739e7
Merge branch 'master' into ns-less-memory-for-tokens
2015-05-14 21:44:31 +02:00
Kevin Sawicki
c53e6b3a17
Merge branch 'master' into jl-all-your-normalizes
2015-05-14 11:21:21 -07:00
Kevin Sawicki
ccaf6220ce
Add missing fs-plus require
2015-05-14 10:39:07 -07:00
Kevin Sawicki
b2ee37ab29
Unfocus spec
2015-05-14 10:01:06 -07:00
Nathan Sobo
e694b18ae2
Merge branch 'master' into ns-less-memory-for-tokens
...
Conflicts:
spec/tokenized-buffer-spec.coffee
src/tokenized-buffer.coffee
2015-05-14 18:55:16 +02:00
Kevin Sawicki
c4d7df9e99
Prevent global variables from leaking out of index.js
2015-05-14 09:54:35 -07:00
Jessica Lord
319cff8010
merge
2015-05-14 09:48:03 -07:00
Nathan Sobo
ac5a5d5ba0
Remove unused TokenizedBuffer methods that relied on tokens shim
2015-05-14 17:51:46 +02:00
Max Brunsfeld
19d905606b
Avoid double computation of screen lines when opening files
...
Previously, instantiating a TextEditor would always compute compute
screen lines twice: once when the DisplayBuffer was instantiated,
and once when the 'invisibles' property was set on the DisplayBuffer.
2015-05-13 19:59:25 -07:00
Jess Lin
57d0887346
[Gutter] Move line number gutter tests to be under .gutters in TextEditorPresenter specs
2015-05-13 16:47:42 -07:00
Jess Lin
e34dfc636c
[Gutter] Fix custom decorations tests in TextEditorPresenter specs
2015-05-13 16:47:42 -07:00
Jess Lin
cd806ee764
[Gutter] Fix former .sortedDescription tests in TextEditorPresenter specs
2015-05-13 16:47:42 -07:00
Jess Lin
b6055f3a67
[Gutter] Fix shared gutter styles tests in TextEditorPresenter specs
2015-05-13 16:47:42 -07:00
Jess Lin
fdb696f4dc
[Gutter] Fix line-number gutter tests in TextEditorPresenter specs
2015-05-13 16:47:42 -07:00
Nathan Sobo
173bc82e42
Don’t include tokens in presenter state for lines
2015-05-14 01:46:32 +02:00
Nathan Sobo
00b30f7db8
Remove some dead code
2015-05-13 22:03:26 +02:00
Nathan Sobo
bf6754981b
decodeContent -> decodeTokens
2015-05-13 21:17:46 +02:00
Nathan Sobo
2765753791
Don’t assume same token instances in spec now that we use shims
2015-05-13 21:17:46 +02:00
Nathan Sobo
b8895cdaaf
Update spec based on new interface for Grammar::tokenizeLine
2015-05-13 21:17:45 +02:00
Nathan Sobo
a8d01bcec1
Fix bufferRangeForScopeAtPosition with new tags array scheme
2015-05-13 21:17:45 +02:00
Nathan Sobo
6eb61d977d
Delete spec that’s no longer relevant
2015-05-13 21:17:45 +02:00
Jess Lin
a84c79c650
[Gutter] Fix GutterContainerComponent spec
2015-05-13 12:04:47 -07:00
Jess Lin
27319c4300
[Gutter] Fix CustomGutterComponent spec
2015-05-13 11:48:25 -07:00