Commit Graph

363 Commits

Author SHA1 Message Date
Nathan Sobo
1ee6384332 Add TextEditorMarkerLayer 2015-11-09 00:35:31 -07:00
Nathan Sobo
b1a5b58fa2 Rename Marker to TextEditorMarker to resolve ambiguity w/ TextBuffer API
We expose both kinds of markers in Atom, and the docs were actually
wrong when we refer to Markers from TextBuffer because it linked to the
TextEditor layer’s Marker implementation. This will clarify the
difference.
2015-11-09 00:35:30 -07:00
Nathan Sobo
78513f4528 Remove duplicated method definition 2015-11-09 00:35:28 -07:00
Nathan Sobo
a3ff0ad75a 🎨 Rename method 2015-11-09 00:35:28 -07:00
Nathan Sobo
acf142863c Add TextEditor::decorateMarkerLayer 2015-11-09 00:35:27 -07:00
Nathan Sobo
92ed7c8b15 Don’t return Decoration objects from model to view
Preparation for LayerDecorations, in which individual decoration objects
won’t exist for every marker.
2015-11-09 00:35:27 -07:00
Max Brunsfeld
cdaac9dfcc wip 2015-11-09 00:35:18 -07:00
Max Brunsfeld
b58752da38 Keep model's logical scroll position up to date
* Remove scrollRow and scrollColumn properties from the presenter
* Assign presenter's scrollTop and scrollLeft based on model's first visible
  screen row and column, once the presenter has the required measurements.
2015-11-06 11:16:56 -08:00
Max Brunsfeld
7d46fe6c28 🔥 Unused properties on TextEditor.prototype 2015-11-06 09:56:58 -08:00
joshaber
a8da39b90c Merge branch 'master' into dh-async-repo 2015-11-06 11:43:37 -05:00
abe33
5b192ea295 🎨 Fix typo in moveLineUp comment 2015-11-05 20:36:22 +01:00
abe33
80553028c1 🐛 Fix top of a wrapped line not visible when moving it up 2015-11-04 19:14:44 +01:00
abe33
aa7f87bd62 🐛 Fix auto indent no longer applied when moving lines 2015-11-04 18:56:13 +01:00
Max Brunsfeld
3412251963 Merge pull request #9104 from joseramonc/master
autoindent lines with moveLineUp/moveLineDown
2015-11-03 10:41:29 -08:00
abe33
dacd08badf 🐛 Fix moving multiple selection with folds creates new folds 2015-11-03 00:48:22 +01:00
abe33
668a2dd6cf 🐛 Fix moving a multiple selection with a fold creating new folds 2015-11-02 23:43:43 +01:00
abe33
9d21c773c1 🐛 Fix moving single selection intersecting a fold 2015-11-02 21:46:02 +01:00
abe33
57556ffc42 Merge branch 'master' of github.com:atom/atom into cn-move-lines-up-and-down-with-multiple-selections 2015-11-02 18:39:04 +01:00
Nathan Sobo
152a479909 Merge pull request #9024 2015-11-02 11:26:21 -06:00
Daniel Hengeveld
02d8ead883 Checkout head asyncly
This is the first tentative step in actually using the nodegit wrapper.
2015-10-22 15:49:21 +02:00
Antonio Scandurra
5fc521fedc Add deprecated method to TextEditor 2015-10-20 08:37:15 +02:00
Antonio Scandurra
b03aa4bf40 Merge branch 'master' into as-cjk-soft-wrap
# Conflicts:
#	spec/display-buffer-spec.coffee
2015-10-16 10:23:44 +02:00
Antonio Scandurra
4766c98bbe Treat Korean characters as different kinds of chars 2015-10-15 21:02:21 +02:00
Antonio Scandurra
c616e86a00 Take into account half width chars as well 2015-10-15 19:24:00 +02:00
Antonio Scandurra
4c66341624 Measure double width char widths 2015-10-15 18:08:35 +02:00
Nathan Sobo
f9a269ed99 Prompt about checking out head revision in TextEditor, not GitRepository
This allows us not to inject confirm or ApplicationDelegate into
Project, GitRepositoryProvider, and GitRepository.
2015-10-13 19:11:55 -06:00
abe33
45a3dbca4e 🐛 Fix folds not preserved when moving multiple selections down
When two or more selections span the rows immediately before a fold,
the `did-change` event dispatched on the deletion will trigger a merge
of the selections, which in turn trigger an unfold at the buffer
position of the new selection, which is now the position of the fold.
Consolidating the selections at the begin of the transaction will
prevent the merge and will keep the fold untouched.
2015-10-12 22:05:25 +02:00
abe33
4d44016eb1 🎨 Remove unnecessary branching 2015-10-12 19:40:23 +02:00
abe33
9ee89a1f31 🎨 Fix bad indentation 2015-10-11 18:15:22 +02:00
abe33
09ffa8bec9 🐛 Fix moving multiple selections down locked at wrapped line 2015-10-11 18:15:06 +02:00
abe33
f4f4b9fdef Merge branch 'master' into pr/8232 2015-10-11 14:23:36 +02:00
joseramonc
84e723a723 autoindent lines in moveLineUp/moveLineDown
#7546
2015-10-10 13:15:05 -05:00
Nathan Sobo
4c51d29868 Merge remote-tracking branch 'origin/master' into ns-alternative-test-env 2015-10-07 16:10:29 -05:00
Antonio Scandurra
b5fc710f15 Don't use atom.clipboard global in Selection 2015-10-07 15:25:05 -05:00
Max Brunsfeld
d8b08d3240 Don't use atom.config global in LanguageMode 2015-10-07 15:25:00 -05:00
Nathan Sobo
122bf72c75 Don’t use atom.packages global in TokenizedBuffer 2015-10-07 15:25:00 -05:00
Nathan Sobo
b2359f44a6 Don’t use atom.grammars global in TokenizedBuffer 2015-10-07 15:25:00 -05:00
Nathan Sobo
dc0709ef9e Don’t use atom.assert global in DisplayBuffer 2015-10-07 15:24:59 -05:00
Nathan Sobo
edd666b845 Don’t use atom.config global in DisplayBuffer 2015-10-07 15:24:59 -05:00
Nathan Sobo
706ef8e8ce Don’t use atom.config global in Cursor 2015-10-07 15:24:59 -05:00
Nathan Sobo
332bad6598 Assign project when deserializing TextEditors 2015-10-07 15:24:59 -05:00
Nathan Sobo
95fbff033d Throw when editor dependencies are undefined 2015-10-07 15:24:59 -05:00
Nathan Sobo
b729a9bb37 Parameterize project on TextEditor 2015-10-07 15:24:59 -05:00
Nathan Sobo
8d7a08d07f Parameterize view registry on TextEditor 2015-10-07 15:24:59 -05:00
Nathan Sobo
e803801145 Parameterize clipboard on TextEditor 2015-10-07 15:24:59 -05:00
Nathan Sobo
ad57dca1f7 Remove dead registerEditor parameter 2015-10-07 15:24:58 -05:00
Nathan Sobo
979963a25c Parameterize notification manager on TextEditor 2015-10-07 15:24:58 -05:00
Nathan Sobo
51abab930d Parameterize config on editor instead of using global atom.config 2015-10-07 15:24:58 -05:00
Nathan Sobo
e0d426b817 Register deserializers, view providers, and commands in Atom constructor
Previously, these registrations were scattered all over the codebase and
required that `global.atom` be defined, which creating weird ordering
issues. Registering them all from the global makes the relationships
clearer and means we don’t have to assign a global to set up a fully-
functional environment.
2015-10-07 15:24:52 -05:00
Antonio Scandurra
3df6ed8405 Merge branch 'master' into as-double-reflow-measurements 2015-10-03 15:53:34 +02:00