Commit Graph

6537 Commits

Author SHA1 Message Date
Daniel Hengeveld
1cde8f8020 Annotate waitsFor in a couple flaky specs 2016-01-12 17:31:28 -05:00
Daniel Hengeveld
9fe2470a05 Merge remote-tracking branch 'remotes/origin/dh-async-repo' into dh-async-repo-relativize-symlinks 2016-01-12 15:59:32 -05:00
Daniel Hengeveld
a9f9cd5b8f Add specs to cover ::relativizeToWorkingDirectory
Yay, this uncovered a problem with the implementation.
2016-01-12 15:32:59 -05:00
joshaber
1d18ccc2f1 Merge branch 'master' into dh-async-repo 2016-01-12 10:20:00 -05:00
joshaber
bd8b26ab46 Don't use require.resolve. 2016-01-12 10:19:55 -05:00
joshaber
c22a68435a Make sure the editor disappears quickly. 2016-01-11 21:36:23 -05:00
Max Brunsfeld
b01e97be59 Explicitly guard against decorating destroyed markers
Signed-off-by: Nathan Sobo <nathan@github.com>
2016-01-11 14:01:55 -08:00
joshaber
b661d41b2d Use the promise from refreshStatus to know when we're done. 2016-01-11 15:16:54 -05:00
joshaber
07be6d5c6e Merge branch 'master' into dh-async-repo 2016-01-11 14:14:19 -05:00
Nathan Sobo
db74f4a8f0 Merge pull request #10178 from atom/ku-pending-editor
Open file in pending state on single click
2016-01-08 14:45:14 -07:00
Katrina Uychaco
5738b14eda 🎨 2016-01-08 13:39:46 -08:00
joshaber
2dd5cb6081 Merge branch 'master' into dh-async-repo 2016-01-07 20:55:28 -05:00
joshaber
92839a1f4f Test .isSubmodule. 2016-01-07 16:48:28 -05:00
joshaber
d2d5966ee1 More tests for the submodule cases. 2016-01-07 16:37:05 -05:00
joshaber
a79a528fd1 Make .getRepo() submodule-aware. 2016-01-07 16:13:46 -05:00
Max Brunsfeld
ec66a66bb3 Merge pull request #9990 from scv119/test
Add a core config `core.automaticallyUpdate` to disable Atom autoupdate.
2016-01-07 11:05:43 -08:00
joshaber
dcb9371c13 Test it. 2016-01-07 13:07:36 -05:00
joshaber
0bef58a8a4 Added a fixture that has submodules. 2016-01-07 13:05:36 -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
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
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
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
Antonio Scandurra
2e7048d8c6 Merge pull request #10028 from atom/ns-remove-presenter-flags
Remove non-essential update guard flags from TextEditorPresenter
2015-12-14 11:43:19 +01:00
Nathan Sobo
3d8058a9a4 Remove failing redundant assertions
The expectNoStateUpdate is sufficient to test the issue in question. Now
that most flags are removed, we can’t count on this part of the state
not being updated when we request a state recompilation.
2015-12-11 14:02:57 -07:00
Nathan Sobo
5cfd3423bf Use internal scroll assignment methods when committing logical positions
This prevents an addition pending assignment and cuts directly to
adjusting the positions.
2015-12-11 13:34:46 -07:00
joshaber
311728453e Merge branch 'master' into dh-async-repo 2015-12-11 14:48:13 -05:00
Antonio Scandurra
fa48b2fbe0 Make v8 version part of the key 2015-12-11 17:47:04 +01:00
joshaber
b9f5853729 Const. 2015-12-11 10:05:10 -05:00