github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
23,770 Commits 140 Branches 571 Tags
76c696f1a24178fffded7c4fa74b79bcede0cd57
Commit Graph

23770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Brunsfeld
76c696f1a2 Merge branch 'master' into mb-optimize-marker-observation 
Conflicts:
	src/text-editor-component.coffee
	src/text-editor-presenter.coffee
 2015-06-03 09:12:07 -07:00
Nathan Sobo
dac39bdcd5 Merge pull request #6733 from atom/as-tiled-rendering 
Render lines via tiles
 2015-06-03 00:18:41 +02:00
Kevin Sawicki
027a4c85fa Merge pull request #7067 from netbun/patch-1 
remove unnecessary line break
 2015-06-02 13:37:54 -07:00
My-khael Pierce
a1b4f89ddd remove unnecessary line break 2015-06-02 16:36:14 -04:00
Kevin Sawicki
81ff6678bd Prepare 0.206 2015-06-02 12:57:27 -07:00
Kevin Sawicki
b8d007906d Merge pull request #7056 from atom/ks-handle-text-editor-deserialize-read-errors 
Catch read errors during deserialization
v0.205.0 		2015-06-02 08:51:33 -07:00
Kevin Sawicki
82eb01d13e Move deserialize spec to text-editor-spec 2015-06-01 18:01:34 -07:00
Kevin Sawicki
34591d3542 Catch read errors during deserialization 
Prevents Atom from failing to open because of a read error with a
serialized editor.
 2015-06-01 17:54:43 -07:00
Nathan Sobo
52732e8cc2 Merge pull request #7053 from atom/ns-fix-tokenized-line-copy 
Include invisibles in TokenizedLine::copy
 2015-06-02 00:54:04 +02:00
Kevin Sawicki
35acbb8e13 Merge pull request #7054 from atom/wl-bump-language-sql 
Update language-sql to 0.16.0
 2015-06-01 15:49:25 -07:00
Wliu
86dd4773fb ⬆️ language-sql@0.16.0 2015-06-01 18:26:23 -04:00
Nathan Sobo
4812dcc355 Include invisibles in TokenizedLine::copy 2015-06-02 00:02:34 +02:00
Kevin Sawicki
2921a4cd1f Merge pull request #7051 from atom/ks-include-minor-deprecations-in-one-mode 
Include minor deprecations in 1.0 API mode
 2015-06-01 14:31:43 -07:00
Kevin Sawicki
66620f8510 Add TODO comment 2015-06-01 13:32:38 -07:00
Kevin Sawicki
703eaac7ca Keep around atom.config.unobserve no-op 2015-06-01 13:32:03 -07:00
Kevin Sawicki
fed19872b3 Keep old configDefaults support in api preview mode 2015-06-01 13:28:13 -07:00
Kevin Sawicki
558d10434a Keep old context menu format in api preview mode 2015-06-01 13:28:13 -07:00
Kevin Sawicki
3c647dc7af Keep activate events in api preview mode 2015-06-01 13:28:13 -07:00
Kevin Sawicki
7e34164c4b Keep old folder names in api preview mode 2015-06-01 13:28:13 -07:00
Ben Ogle
703a36b620 ⬆️ snippets to fix spec 2015-06-01 11:19:45 -07:00
Nathan Sobo
c3be0a4f9f Merge pull request #7020 from atom/ns-constrain-invisible-lengths 
Constrain length of invisible character strings in settings
 2015-06-01 20:17:27 +02:00
Nathan Sobo
e258dd2f8e Use maximumLength schema enforcer to constrain invisible characters 
Fixes #7014
 2015-06-01 18:45:38 +02:00
Nathan Sobo
e723b26eb0 Add maximumLength schema enforcer for strings 2015-06-01 18:45:38 +02:00
Nathan Sobo
b68902dd83 🎨 2015-06-01 18:45:38 +02:00
Kevin Sawicki
c700bf7682 Merge pull request #7039 from atom/wl-language-json-0.15.0 
Update language-json to 0.15.0
 2015-06-01 09:40:34 -07:00
Kevin Sawicki
01d97f7951 Merge pull request #7036 from atom/ld-context-menu-doc 
📝 Add returns Disposable to ContextMenuManager.add
 2015-06-01 09:39:55 -07:00
Kevin Sawicki
eaaa6b15e5 🚱 Prevent stdout/stderr data listener leaks 
Old listeners were not cleaned up before new ones were being added
causing the following console message:

warning: possible EventEmitter memory leak detected.

Refs #7033
 2015-06-01 09:38:10 -07:00
Wliu
c81409cf90 ⬆️ language-json@0.15.0 2015-05-31 11:15:48 -04:00
Lee Dohm
5884525648 📝 Add returns Disposable to ContextMenuManager.add 2015-05-31 05:27:38 -07:00
Max Brunsfeld
eed1ecbbdc Wait to observe buffer markers until Marker::onDidChange called 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2015-05-29 17:29:03 -07:00
Max Brunsfeld
6f553f234c Add TextEditor::observeMarkers, use it in presenter 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2015-05-29 17:21:23 -07:00
Max Brunsfeld
b59bec5f9d Add Set::isEqual method in specs 
This allows us to use the .toEqual matcher to compare Set
objects.
 2015-05-29 17:18:48 -07:00
Max Brunsfeld
224575fc46 Always fall back on default lineOverdrawMargin 2015-05-29 16:32:19 -07:00
Machisté N. Quintana
adc08d31d6 Merge pull request #6910 from atom/tj-document-commandname-standard 
📝 Document command name standard
 2015-05-29 16:45:59 -04:00
Ben Ogle
49c8a10c08 Fix text lint error 2015-05-29 13:22:03 -07:00
Nathan Sobo
604e41966d ⬆️ bracket-matcher 2015-05-29 22:13:22 +02:00
Thomas Johansen
97f817c542 📝 Add sentence about lowercasing command names 2015-05-29 21:51:27 +02:00
Nathan Sobo
5389156d76 ⬆️ first-mate to fix regression 2015-05-29 20:23:08 +02:00
Ben Ogle
fad99c69e6 Fix build issue: import ui vars. 2015-05-29 10:38:37 -07:00
Ben Ogle
3b9f8fa813 Merge pull request #6998 from atom/bo-style-text 
Style links and code blocks in text-* classes
 2015-05-29 10:33:27 -07:00
Ben Ogle
fd6e8fabb1 ⬆️ snippets to load bundled snippets first 2015-05-29 10:31:19 -07:00
Ben Ogle
68030e1793 ⬆️ autocomplete-snippets to fix exception 2015-05-29 10:30:56 -07:00
Max Brunsfeld
686c72eebe Merge pull request #6978 from mostafaeweda/initial-paths-2 
Initial paths shouldn't be normalized on save and restore [2]
 2015-05-29 10:28:56 -07:00
Antonio Scandurra
9b4d62b687 🐛 Update cursors after model changes 
/cc: @nathansobo
 2015-05-29 15:21:00 +02:00
Antonio Scandurra
b4dfb2a31b Merge branch 'master' into as-tiled-rendering 2015-05-29 14:19:25 +02:00
simurai
7c968542fa ⬆️ one-dark/light-ui@0.9.0 2015-05-29 15:13:50 +09:00
simurai
ba9c0c65c1 ⬆️ one-dark/light-syntax@0.7.0 2015-05-29 15:12:34 +09:00
Ben Ogle
98dc2f9d7f Style links and code blocks in text-* classes 2015-05-28 16:09:15 -07:00
Nathan Sobo
6552d2ce50 Merge pull request #6997 from atom/ns-omit-unset-keystrokes-from-application-menu 
If a keystroke is bound to ‘unset!’, omit it in the application menu
 2015-05-28 23:39:00 +02:00
Nathan Sobo
447dfd8bec If a keystroke is bound to ‘unset!’, omit it in the application menu 
Fixes atom/atom-keymap#79

This is more general than I would like. If the keystroke is unset in
any context, we err on the side of caution and don’t add it to the
application menu for any command. Since our application menu isn’t
context aware, this should be good enough for now and solve the 80%
case. Someday we should make the application menu update / gray out
options when the focused element changes.
 2015-05-28 22:59:10 +02:00