Commit Graph

16862 Commits

Author SHA1 Message Date
Max Brunsfeld
2fa3b65364 Merge branch 'master' into mb-tree-sitter-parsers 2018-01-03 15:20:10 -08:00
Nathan Sobo
5743c41e03 Merge pull request #16282 from atom/io-electron-1.7
Upgrade electron to 1.7.10
2018-01-03 16:19:20 -07:00
Max Brunsfeld
6998c2df8c Merge branch 'master' into mb-tree-sitter-parsers 2018-01-03 14:53:06 -08:00
Max Brunsfeld
733d6381cc Fix handling of {undo: 'skip'} in TextEditor.insertText
Signed-off-by: Nathan Sobo <nathan@github.com>
2018-01-03 13:00:53 -08:00
Max Brunsfeld
629cb206ec Fix handling of empty tokens in TreeSitterHighlightIterator 2018-01-03 09:34:12 -08:00
Max Brunsfeld
aed6248b7b Merge branch 'master' into mb-tree-sitter-parsers 2017-12-29 16:21:54 -08:00
Morten Piibeleht
1964b0094b Make socketPath shorter
To work around the limited socket file length on macOS/BSD.
2017-12-28 13:06:52 +13:00
Morten Piibeleht
2b3e22a39d Allow independent Atom instances
By having an $ATOM_HOME-dependent part in the socket name, Atom
instances that have different homes will run in independent processes.

Fixes the current behaviour where starting Atom with a new $ATOM_HOME
"opens" an Atom window with settings and packages from the original
$ATOM_HOME. Useful for IDEs.
2017-12-28 13:02:25 +13:00
Max Brunsfeld
3482f8fe6f Merge pull request #16455 from fordhurley/fix-unique-editor-ids
Ensure that new editors get unique ids
2017-12-27 14:43:40 -08:00
Max Brunsfeld
798bbe3c32 Revert "Independent Atom instances (per $ATOM_HOME)" 2017-12-27 13:35:01 -08:00
Max Brunsfeld
0b6e994ac6 Merge branch 'master' into mb-tree-sitter-parsers 2017-12-27 12:35:51 -08:00
Ford Hurley
b5189e4e4a Delint 2017-12-27 15:16:13 -05:00
Ford Hurley
f96a0d922e Ensure that new editors get unique ids
This restores the behavior from when TextEditor was written in
coffeescript, and extended the Model class.
2017-12-27 13:42:40 -05:00
Max Brunsfeld
662d38135b Use zero as the minimum value of getGrammarPathScore
This way, we can determine if the grammar matches a buffer in any way by
checking for a positive score.
2017-12-26 14:14:22 -08:00
Mark Lee
2c2d9597a7 💚 remove trailing whitespace from text editor docs 2017-12-24 12:10:29 -08:00
Antonio Scandurra
69799d35b2 Delete Chrome 56 workarounds 2017-12-22 14:44:17 +01:00
Antonio Scandurra
8b3c3bcfcf Loosen containment rules on dummy scrollbar elements
This commit uses `content` containment (i.e. `layout paint style`) as
opposed to `strict` containment (i.e. `layout paint style size`) for
dummy scrollbar elements.

By removing `size` containment we are fixing a rendering bug that was
preventing the scrollbar from being sized correctly. This problem was
caught by a TextEditorComponent test
(https://circleci.com/gh/atom/atom/6393).
2017-12-22 14:29:22 +01:00
Antonio Scandurra
645252e0c2 👕 Fix linter error 2017-12-22 14:13:51 +01:00
Antonio Scandurra
c05615b8f8 Fix WorkspaceElement tests 2017-12-22 12:13:39 +01:00
Antonio Scandurra
011766768a Fix AtomEnvironment tests 2017-12-22 12:05:03 +01:00
Wliu
4ed59b3ee7 📝 Update TextEditor::scopeDescriptorForBufferPosition docs
[ci skip]
2017-12-21 21:20:31 -05:00
Ramon Jimenez
fb4f496994 Code style corrections 2017-12-21 18:34:56 -07:00
Ramon Jimenez
3eeb8c5c10 Modified increaseSize and decreaseSize methods from pane.js to pass 'one pane resizing' tests 2017-12-21 16:34:22 -07:00
Wliu
1d6549a8e3 Merge pull request #16328 from atom/wl-right-click-selections
Update auxiliary click logic for moving cursors
2017-12-21 12:18:41 -05:00
Damien Guard
016c321bba Merge pull request #15081 from mortenpi/multiple-instances
Independent Atom instances (per $ATOM_HOME)
2017-12-17 16:52:20 -08:00
Segev Finer
5490a8b258 Initialize ProtocolHandlerInstaller after initializing Config
This allows it to correctly read `core.uriHandlerRegistration` and
avoids popping the notification even if set to 'never'.

Fixes #16201
2017-12-16 23:34:37 +02:00
Max Brunsfeld
c844a253e0 Implement TreeSitterLanguageMode.scopeDescriptorForPosition 2017-12-15 17:15:39 -08:00
Max Brunsfeld
4adfba47cc Support legacyScopeName field on tree-sitter grammars
* Use the field for mapping scope names in GrammarRegistry.grammarForId
* Use the field for adapting legacy scoped settings to work with tree-sitter parsers

Signed-off-by: Nathan Sobo <nathan@github.com>
2017-12-15 16:57:36 -08:00
Max Brunsfeld
f4fa7f910e Merge branch 'master' into mb-tree-sitter-parsers 2017-12-15 09:45:21 -08:00
Max Brunsfeld
e09ee1c1fa Fix error in TreeSitterHighlightIterator.seek 2017-12-15 09:44:45 -08:00
Katrina Uychaco
2d6750cae3 Remove input enabled check for 'is-focused' class
vim-mode-plus relies on this behavior
2017-12-14 11:56:23 +01:00
Damien Guard
ca53cf9ec1 Remove the texteditor isModified/isReadOnly handling intended for unsavable edit buffers as causes issues with vim-mode-plus 2017-12-13 09:17:30 -08:00
Max Brunsfeld
43c6f4ccb0 Merge branch 'master' into mb-tree-sitter-parsers 2017-12-11 09:18:31 -08:00
Max Brunsfeld
e669152841 Merge pull request #16074 from UziTech/patch-4
Make notifications.clear public and emit event
2017-12-08 14:20:33 -08:00
Max Brunsfeld
3d11c17264 Fix exception in getFoldableRangeForNode 2017-12-07 17:42:52 -08:00
Max Brunsfeld
a7a53f4158 Allow multiple child types to be specified as fold start or end 2017-12-07 17:08:47 -08:00
Max Brunsfeld
ad492ef344 Merge branch 'master' into mb-tree-sitter-parsers 2017-12-07 17:07:18 -08:00
Max Brunsfeld
f712de65d0 Fix nesting level calculation for children of partially-folded nodes
Signed-off-by: Nathan Sobo <nathan@github.com>
2017-12-07 15:30:48 -08:00
Max Brunsfeld
136dc86584 Leave muli-character fold end tokens on their own line
Signed-off-by: Nathan Sobo <nathan@github.com>
2017-12-07 15:29:11 -08:00
GilTeixeira
2369219c87 Changed atom safe mode theme to One Dark. 2017-12-07 16:53:38 +00:00
Max Brunsfeld
725d7db7ae Merge branch 'master' into mb-tree-sitter-parsers 2017-12-06 14:56:09 -08:00
Max Brunsfeld
3f775b5505 Fix folding of internal nodes when fold end isn't specified 2017-12-06 11:09:44 -08:00
Max Brunsfeld
815b445d2e ⬆️ language packages 2017-12-05 17:58:39 -08:00
Max Brunsfeld
77fd29647a Cache foldability more intelligently
Signed-off-by: Nathan Sobo <nathan@github.com>
2017-12-05 17:01:49 -08:00
Max Brunsfeld
f3715779e5 Support contentRegExp field on grammars, to match more than one line
Signed-off-by: Nathan Sobo <nathan@github.com>
2017-12-05 16:26:24 -08:00
Wliu
db392502e4 Always move the cursor on middle-click 2017-12-05 23:54:43 +01:00
Wliu
69214dc26a On clicks, only move cursor if there is one cursor without a selection 2017-12-05 23:11:45 +01:00
Katrina Uychaco
b3cee41f28 Merge remote-tracking branch 'origin/master' into ku-add-readonly-editor-attribute 2017-12-05 14:02:39 -08:00
Max Brunsfeld
a475baf4b5 Rework fold API for tree-sitter grammars 2017-12-05 12:39:52 -08:00
Wliu
7f01a8e718 Add back and deprecate atom.showSaveDialogSync 2017-12-04 23:26:51 +01:00