Commit Graph

34189 Commits

Author SHA1 Message Date
Damien Guard
61df0bd6d9
No longer used on appveyor 2018-01-12 15:24:21 -08:00
David Wilson
3f7a29b86c
Merge pull request #16542 from atom/dw-preserve-editor-settings
Preserve some TextEditor settings when language mode changes
2018-01-12 13:52:47 -08:00
David Wilson
dbd4a0a4c0 Preserve TextEditor settings when language mode changes
This change fixes #13829 which reports that the `softWrapped` setting of
an untitled TextEditor is lost when the buffer is saved to a file.  This
is caused by logic that updates TextEditor settings when the buffer's
language mode changes.

The fix is to preserve any TextEditor settings that would not change when
switching between the previous and current language mode of the buffer.
2018-01-12 13:51:35 -08:00
Antonio Scandurra
7f408e7791 ⬆️ settings-view 2018-01-12 14:43:26 +01:00
Antonio Scandurra
f44c353591 ⬆️ text-buffer
Fixes #15924
Refs atom/text-buffer#285
2018-01-12 09:30:54 +01:00
Max Brunsfeld
30e4929db2 ⬆️ language-javascript 2018-01-11 16:13:22 -08:00
Max Brunsfeld
582fa6b092 ⬆️ autocomplete-plus, languages
For editor.nonWordCharacters, autocomplete.extraWordCharacters tweak
2018-01-11 15:15:17 -08:00
Jason Rudolph
d20eaf3965
Merge pull request #16533 from atom/run-appveyor-installer-task-on-master-branch
Teach AppVeyor to run installer task for master branch
2018-01-11 10:40:56 -05:00
Jason Rudolph
992ebe352d
Be kind to build queue: Skip installer for non-release/non-master branch 2018-01-11 09:01:59 -05:00
Jason Rudolph
9165488f38
Remove debugging logic 2018-01-11 08:56:43 -05:00
Jason Rudolph
9188b98b8e
Fix syntax ... maybe 🙏 2018-01-11 08:28:34 -05:00
Jason Rudolph
f5356eea99
Echo AppVeyor env vars earlier 2018-01-11 08:21:49 -05:00
Jason Rudolph
cdb21a063f
Echo AppVeyor env vars for debugging 2018-01-11 08:06:38 -05:00
Damien Guard
63d3a47ea8
Do not sign PRs 2018-01-10 15:58:04 -08:00
Damien Guard
5e64206f90
Appveyor double-ampersand nonsense 2018-01-10 15:45:57 -08:00
Damien Guard
4422318584
Build the right things on appveyor 2018-01-10 15:41:21 -08:00
Jason Rudolph
058c13e252
Teach AppVeyor to run installer task for master branch 2018-01-10 17:24:43 -05:00
David Wilson
2cb66ae9e1
Merge pull request #15498 from MoritzKn/refactor-install-script
Refactor install script for linux (install dev channel parallel, use icon themes)
2018-01-10 10:50:23 -08:00
Antonio Scandurra
64f46256e3
Merge pull request #16530 from atom/as-fix-state-loading-race-condition
Fix race condition between opening new files and restoring window state
2018-01-10 14:33:25 +01:00
Antonio Scandurra
a5c0223592 Fix race condition between opening new files and restoring window state
This commit fixes a race condition in the
`attemptRestoreProjectStateForPaths` function that could cause a file to
be opened more than once within the same workspace pane.

In particular, when opening some file into an empty window, Atom tries
to recover the state for the project containing the file (if there is
one). However, we were previously not waiting until the
`AtomEnvironment`'s state had been fully deserialized before trying to
load the requested file into the workspace. If the same file also
existed in the serialized representation of the workspace, it could end
up being opened twice.

With this commit we will now wait until the environment has been fully
deserialized before honoring the user's request of loading new files
into an empty window. Also, tests have been restructured to test more
thoroughly this interaction.
2018-01-10 13:22:09 +01:00
Antonio Scandurra
e85b8738d1 Allow destroying AtomEnvironment instances that haven't been initialized 2018-01-10 13:11:25 +01:00
Antonio Scandurra
3e93c61173 ⬆️ find-and-replace 2018-01-10 11:20:16 +01:00
Antonio Scandurra
1280a3dce5 ⬆️ spell-check 2018-01-10 10:48:57 +01:00
Max Brunsfeld
59f2b21d6c
Merge pull request #16524 from atom/mb-fix-tree-sitter-slowness
Fix two tree-sitter performance problems
2018-01-09 21:29:55 -08:00
Max Brunsfeld
4084922cb4 Optimize TreeSitterHighlightIterator.seek 2018-01-09 17:38:10 -08:00
Max Brunsfeld
a9a58a7bb2 ⬆️ tree-sitter to fix an error recovery hang 2018-01-09 17:22:21 -08:00
Wliu
26df68c9f6
Merge pull request #16245 from atom/wl-async-save-dialog
Make showSaveDialog async
2018-01-09 18:56:18 -05:00
Wliu
c84eeb3ae0
Merge branch 'master' into wl-async-save-dialog 2018-01-09 17:20:57 -05:00
Wliu
cd123456ca
Merge pull request #16229 from atom/wl-async-confirm
Make atom.confirm async
2018-01-09 17:19:51 -05:00
Michelle Tilley
5748f2367c
Merge pull request #16521 from atom/dg-remove-protocol-handler-if-set-to-never-on-startup
If protocol handler set to never, unregister it on Windows
2018-01-09 13:34:41 -08:00
Michelle Tilley
fd50e02162
👕 2018-01-09 12:19:33 -08:00
Wliu
18ee2e6f11
Oops 2018-01-09 14:56:09 -05:00
Michelle Tilley
233e519007
Add winreg to snapshot ignore list 2018-01-09 11:52:18 -08:00
Damien Guard
7afa03345a
If protocol handler set top never, unregister it on Windows 2018-01-09 11:38:05 -08:00
Nathan Sobo
b5c939d5ce
Merge pull request #16518 from atom/ns-as-fix-add-selection
Don't add fully-contained selections above/below
2018-01-09 10:10:13 -07:00
Antonio Scandurra
450d6b12fa Don't add fully-contained selections above/below
This is slower than it needs to be and creates behavioral problems when
selections get merged in some cases.

Signed-off-by: Nathan Sobo <nathan@github.com>
2018-01-09 16:47:26 +01:00
Antonio Scandurra
aea7041c4c
Merge pull request #16515 from atom/move-highlights-behind-text
Render highlights behind lines
2018-01-09 16:28:02 +01:00
Antonio Scandurra
c48ba79f3c Prevent selection of non-text content in editor
Signed-off-by: Nathan Sobo <nathan@github.com>
2018-01-09 15:16:17 +01:00
Antonio Scandurra
3d21ac0742 Render highlights behind lines
This fixes a bug most likely introduced with #16511 by ensuring that UI
elements (such as selections) never cover up the text.

Signed-off-by: Nathan Sobo <nathan@github.com>
2018-01-09 15:15:54 +01:00
Nathan Sobo
dced608f47
Merge pull request #14931 from UziTech/atom-commands-onDidFinish
atom.commands.onDidFinish
2018-01-09 06:12:45 -07:00
Nathan Sobo
3cec3019f5
Merge pull request #16512 from atom/ns-upgrade-text-buffer
Upgrade text-buffer to 13.11.0
2018-01-09 06:08:45 -07:00
Tony Brix
54d011450f listener calls are reversed 2018-01-08 20:02:34 -06:00
Tony Brix
aabbea6542 jasmine.useRealClock() 2018-01-08 19:41:34 -06:00
Michelle Tilley
268068e9bd
⬆️ settings-view@0.253.4 2018-01-08 17:39:32 -08:00
Michelle Tilley
bf4635ca75
Merge pull request #16513 from atom/mkt-update-protocol-handler
Update protocol client installation
2018-01-08 17:37:45 -08:00
Nathan Sobo
8b408bce1c ⬆️ text-buffer 2018-01-08 17:54:06 -07:00
Max Brunsfeld
3f710a1398 Merge pull request #12783 from vedharish/editor_delete_line 2018-01-08 15:58:22 -08:00
Michelle Tilley
8bc7e8a28f
Update protocol client installation 2018-01-08 15:18:43 -08:00
Nathan Sobo
dbb262b196
Merge pull request #16511 from atom/move-highlights
Move highlights container within lines container for theme compatibility
2018-01-08 16:15:06 -07:00
Tony Brix
ec07003d39 fix timeout 2018-01-08 17:14:49 -06:00