Commit Graph

6799 Commits

Author SHA1 Message Date
Wliu
d855613340 Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35 2016-01-05 17:25:51 -05:00
joshaber
e060cfe03b Merge branch 'master' into dh-async-repo 2016-01-05 15:50:43 -05:00
joshaber
757bbae1e2 s//openNodeGitRepository/openRepository. 2016-01-05 15:26:16 -05:00
joshaber
d224efb00d Just test the x coordinate, I suppose. 2016-01-05 14:40:09 -05:00
joshaber
740e8c660a Put it with its friends. 2016-01-05 14:08:09 -05:00
joshaber
f64878208f Really don't need this to be its own command. 2016-01-05 14:07:50 -05:00
Antonio Scandurra
11a15dce37 Ignore errors when loading an invalid blob store 2016-01-05 19:55:53 +01:00
Katrina Uychaco
67d49955f1 Add tests for pending pane items 2016-01-05 10:38:13 -08:00
joshaber
2a29e7d1f4 Revert "Revert "Integration test for new window offset.""
This reverts commit c8c8bc941e.
2016-01-05 12:48:34 -05:00
joshaber
b8b2c88a0a Merge branch 'master' into dh-async-repo 2016-01-05 12:36:34 -05:00
Antonio Scandurra
1376afe17e 🎨 2016-01-05 10:57:32 +01:00
Antonio Scandurra
c7a7f0c6dd 🐛 Ignore setting dimensions for destroyed decorations 2016-01-05 10:56:29 +01:00
Antonio Scandurra
0d28018127 🔥 Remove redundant setup in specs 2016-01-05 10:39:01 +01:00
Antonio Scandurra
4f0218c0a2 📝 Fix mistyped spec description 2016-01-05 10:35:33 +01:00
Chen Shen
f774e1ce21 add unittest 2016-01-04 17:41:42 -08:00
Nathan Sobo
6669703677 Force a sync render when measuring if we don’t have a DOM node for a row 2016-01-04 16:40:56 -07:00
Nathan Sobo
9f6fbacddd Don’t clip screen positions in yardstick
By clipping positions only in the TextEditorComponent, we can ensure
that we check for the presence of a rendered line for the clipped row
value.
2016-01-04 16:32:38 -07:00
joshaber
6bf9d7eb7d Added .openNodeGitRepository 2016-01-04 16:17:16 -05:00
joshaber
b234f8481d We don't actually use repo. 2016-01-04 16:12:22 -05:00
joshaber
50e1095ae1 Merge branch 'master' into dh-async-repo 2015-12-28 13:04:22 -05:00
Katrina Uychaco
def62fc6c7 Fix test: modified buffer terminates pending state 2015-12-24 21:42:00 -08:00
Katrina Uychaco
217e07530f Add test: modified buffer terminates pending state
Test not yet passing. ::insertText is not triggering terminatePendingState. Not sure why...
2015-12-24 18:43:57 -08:00
Katrina Uychaco
fa86d2d156 Add tests for pending status 2015-12-24 17:57:08 -08:00
Antonio Scandurra
e885497ebd Merge branch 'master' into as-block-decorations 2015-12-20 12:15:08 +01:00
Antonio Scandurra
eab70d9a95 Invalidate spliced block decorations' dimensions 2015-12-19 15:38:34 +01:00
Antonio Scandurra
5dfecf39ab Take margin top and margin bottom into account 2015-12-19 13:18:36 +01:00
Antonio Scandurra
dfb095b754 🔥 Remove TextEditor.prototype.addBlockDecorationForScreenRow 2015-12-19 13:00:47 +01:00
Antonio Scandurra
07234c5109 Resize all block decorations when width changes 2015-12-19 12:50:58 +01:00
Antonio Scandurra
5e0863c119 Write specs for moving markers manually 2015-12-19 12:02:49 +01:00
Antonio Scandurra
5fa9d3bc40 Splice LineTopIndex when DisplayBuffer changes
We invalidate whole screen lines accordingly to `DisplayBuffer`, so that we can
catch if there was any screen-only transformation and move block decorations
accordingly.
2015-12-19 11:21:50 +01:00
Wliu
3ebff4b322 Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-35 2015-12-18 20:02:22 -05:00
Antonio Scandurra
db9f67b9a5 🔥 Remove maxRow parameter 2015-12-18 15:41:46 +01:00
Antonio Scandurra
087dc3b4fd Back to green specs 🤘 2015-12-18 15:18:04 +01:00
Antonio Scandurra
877eea3bd0 Finish integrating LineTopIndex 2015-12-18 11:07:10 +01:00
Antonio Scandurra
6a403e441e Start integrating tree-based LineTopIndex 2015-12-18 10:41:21 +01:00
Antonio Scandurra
3256c8b503 💚 Adjust TextEditorComponent specs for block decorations 2015-12-18 10:06:04 +01:00
Antonio Scandurra
8c1f0b0e21 Merge branch 'master' into as-block-decorations
# Conflicts:
#	spec/fake-lines-yardstick.coffee
#	spec/lines-yardstick-spec.coffee
#	spec/text-editor-presenter-spec.coffee
#	src/lines-yardstick.coffee
#	src/text-editor-component.coffee
#	src/text-editor-presenter.coffee
2015-12-18 09:59:12 +01:00
Max Brunsfeld
f670dd8ff2 Merge branch 'stable' into beta
Conflicts:
	package.json
2015-12-16 10:21:29 -08:00
Nathan Sobo
473e8856a8 Merge pull request #10017 from atom/as-sha1-v8-cache
Cache v8 code by source file's SHA1
2015-12-16 10:19:01 -08:00
Antonio Scandurra
19ff676c7b Serialize grammar for untitled buffers 2015-12-16 10:35:23 +01:00
joshaber
a04813453d Merge branch 'master' into dh-async-repo 2015-12-15 17:14:25 -05:00
Antonio Scandurra
8db49fc08d Document existing behavior 2015-12-15 17:20:01 +01:00
Antonio Scandurra
14f959e13d Merge pull request #9997 from atom/as-cjk-wrap-boundary
Wrap line at boundary if it includes a CJK character
2015-12-15 12:09:52 +01:00
joshaber
4024ea956c Fix the test. 2015-12-14 23:58:04 -05:00
joshaber
b464916c56 Merge branch 'master' into dh-async-repo 2015-12-14 23:29:39 -05:00
joshaber
4c0f10360b Merge branch 'master' into dh-async-repo 2015-12-14 23:29:11 -05:00
Max Brunsfeld
a16b99fa58 Merge pull request #10062 from atom/mb-emit-state-update-on-model-scroll
Emit state update when model's scroll position is changed
2015-12-14 17:38:36 -08:00
Max Brunsfeld
02ab7179ce Emit state update when model's scroll position is changed 2015-12-14 16:56:53 -08:00
Wliu
f4f5e47aab One more remote update 2015-12-14 17:35:50 -05:00
Antonio Scandurra
4b6a218bb9 Start to move stuff back into TextEditorPresenter 2015-12-14 15:53:01 +01:00