Commit Graph

14579 Commits

Author SHA1 Message Date
Max Brunsfeld
a44d5833a8 Move grammar override logic into TextEditorRegistry
Signed-off-by: Nathan Sobo <nathan@github.com>
2016-07-26 15:00:20 -07:00
Max Brunsfeld
455d3213ed Return token objects from tokensForScreenRow
Include the text of each token alongside its array of scopes.

Signed-off-by: Nathan Sobo <nathan@github.com>
2016-07-26 12:39:41 -07:00
Max Brunsfeld
20b54505f3 Move logic for assigning grammars to editors into TextEditorRegistry 2016-07-26 10:50:57 -07:00
Max Brunsfeld
4eb2f6631a 👕 Fix lint errors 2016-07-15 13:32:23 -07:00
Max Brunsfeld
4ad801b216 Merge branch 'master' into ns-mb-detangle-editor 2016-07-15 09:39:32 -07:00
Max Brunsfeld
678d5b4c24 Remove usage of repository.async in Workspace
Signed-off-by: Nathan Sobo <nathan@github.com>
2016-07-13 15:41:10 -07:00
Max Brunsfeld
a973e1ae9e Put back GitRepository::isDestroyed() method 2016-07-13 14:04:58 -07:00
Max Brunsfeld
58e7892492 Remove GitRepositoryAsync
Signed-off-by: Nathan Sobo <nathan@github.com>
2016-07-13 14:03:29 -07:00
Max Brunsfeld
7b11c31e07 Remove synchronous GitRepository's dependency on GitRepositoryAsync
Signed-off-by: Nathan Sobo <nathan@github.com>
2016-07-13 14:02:05 -07:00
Lee Dohm
d922d182f3 Merge pull request #12158 from atom/update-12086
Improve incompatible native module error message
2016-07-12 17:18:23 -07:00
Lee Dohm
9f6f903592 Add enhanced wording @thomasjo recommended 2016-07-12 15:31:49 -07:00
Max Brunsfeld
c0cbb59666 Don't use config in TokenizedBuffer 2016-07-12 14:31:05 -07:00
Max Brunsfeld
5adb087ab1 Move config handling out of LanguageMode 2016-07-12 14:19:35 -07:00
Max Brunsfeld
6fe4ce56c7 Call maintainConfig in buildTextEditor 2016-07-12 14:16:55 -07:00
Max Brunsfeld
58ec44f8ec Move handling of nonWordCharacters setting into TextEditorRegistry 2016-07-12 11:30:41 -07:00
Damien Guard
ce6d45f72a 🎨 Fix fat-arrow linter warning 2016-07-12 10:03:55 -07:00
Antonio Scandurra
a30250b830 Merge pull request #11942 from ssorallen/notification-docs
Complete documentation for Notification creation
2016-07-12 10:07:25 +02:00
Max Brunsfeld
5167dbca6f Move handling of undoGroupingInterval to TextEditorRegistry 2016-07-11 17:47:40 -07:00
Max Brunsfeld
9ab474a673 Move handling of scrollPastEnd setting to TextEditorRegistry 2016-07-11 17:41:06 -07:00
Max Brunsfeld
7a50aa9f9f Move handling of auto indent settings to TextEditorRegistry 2016-07-11 17:37:51 -07:00
Max Brunsfeld
6f764f86cf Move handling of backUpBeforeSaving to TextEditorRegistry 2016-07-11 17:16:41 -07:00
Max Brunsfeld
58e0f66a90 Supply default settings in TextEditor 2016-07-11 15:10:42 -07:00
Max Brunsfeld
1ecc61bebf 🐎 Avoid building unnecessary scope chains 2016-07-11 13:51:08 -07:00
Max Brunsfeld
d70c8d029b Use local config reference in TextEditorRegistry 2016-07-11 13:20:13 -07:00
Max Brunsfeld
596cc13f6a Don't use config in TextEditor::getSoftWrapColumn 2016-07-11 13:07:44 -07:00
Max Brunsfeld
eb97c61655 Remove .dispose calls for deleted subscriptions 2016-07-11 13:07:11 -07:00
Max Brunsfeld
5acab853cd Remove all config observation from text editor 2016-07-11 12:43:18 -07:00
Max Brunsfeld
54a9f3004d TokenizedBuffer: emit 'did-tokenize' event even when chunking is stubbed out 2016-07-11 12:42:47 -07:00
Max Brunsfeld
d91895961e Move more config observation out of text editor 2016-07-08 17:54:24 -07:00
Max Brunsfeld
eec1b70967 Start moving config observation out of editor into editor registry
Signed-off-by: Nathan Sobo <nathan@github.com>
2016-07-08 17:41:59 -07:00
Katrina Uychaco
66b2bb4441 Merge pull request #12119 from atom/ku-tear-down-ipc-response-handler
Tear down ipc response handler when atom environment is destroyed
2016-07-08 16:37:44 -07:00
Katrina Uychaco
9bf329cef2 Tear down ipc response handler when atom environment is destroyed
Signed-off-by: Nathan Sobo <nathan@github.com>
2016-07-07 15:53:07 -07:00
Nathan Sobo
e9650f611f Use grammar instead of registry to resolve scope names 2016-07-06 13:12:19 -06:00
Nathan Sobo
a5613cd7e4 Convert text-editor-registry and tests to JS
Signed-off-by: Max Brunsfeld <maxbrunsfeld@github.com>
2016-07-06 12:54:30 -06:00
Glavin Wiechert
4986a64815 Improve incompatible native module error message
Close #6771
2016-07-04 09:46:09 -03:00
Lee Dohm
04ff1b5b57 Merge pull request #12028 from Floobits/node_env_fix
Don't erase NODE_ENV from environment.
2016-06-30 16:47:37 -07:00
Ross Allen
7e75b861d8 Describe whitespace in detail and description
`detail` is rendered as preformatted text in core themes. `description`
is rendered as Markdown.
2016-06-30 15:57:22 -07:00
Lee Dohm
438aac6244 Merge pull request #12031 from Jonahss/getTitle-docs
📝 Mention how models must implement getTitle() [ci skip]
2016-06-28 17:54:45 -07:00
Jonah
7b16e40fa8 📝 better docs for workspace.addOpener 2016-06-28 17:52:53 -07:00
Damien Guard
22922dec96 CrashReporter should not run on UI thread on Win/Linux 2016-06-27 16:31:01 -07:00
Thomas Johansen
35ceb66a5b Merge pull request #11875 from atom/sm-move-bootstrap-to-npm
Merge Bootstrap + Core styles

Closes #11839 
Closes #11858
2016-06-24 07:54:16 +02:00
Damien Guard
511587c3d0 Merge pull request #11929 from atom/windows-multiple-versions
Allow different versions of Atom to run simultaneously on Win32
2016-06-23 10:59:19 -07:00
Geoff Greer
76e59a25f4 Don't erase NODE_ENV from environment. Atom sets this to 'production' earlier, but some code paths can cause it to be un-set. This degrades performance and sometimes crashes React. Fixes #12024. 2016-06-22 20:09:25 -07:00
Jonah Stiennon
03257b17e2 📝 Mention how models must implement getTitle() [ci skip] 2016-06-22 15:38:51 -07:00
Ross Allen
752359b332 Clarify buttonClass and description 2016-06-21 08:22:05 -07:00
Antonio Scandurra
a5fdf3e18a Merge pull request #12008 from atom/as-ns-recreate-destroyed-repo
Recreate Repository if the same project is added after being removed
2016-06-21 11:40:49 +02:00
Antonio Scandurra
95932081b2 Recreate repository if the same project is added after being removed
:pear:ed with @nathansobo.
2016-06-20 17:06:50 +02:00
Antonio Scandurra
c6f9d1d222 Add GitRepository.prototype.isDestroyed 2016-06-20 17:05:56 +02:00
Leo Lamprecht
0ceacf5c13 OSX -> macOS 2016-06-20 11:29:10 +02:00
Thomas Johansen
b2f7c9d52d 🔥 Remove all bootstrap remnants 2016-06-19 16:20:44 +02:00