diff --git a/Packages/User/Default (OSX).sublime-keymap b/Packages/User/Default (OSX).sublime-keymap index 0ee4ccc..49bdafc 100644 --- a/Packages/User/Default (OSX).sublime-keymap +++ b/Packages/User/Default (OSX).sublime-keymap @@ -80,7 +80,6 @@ ] }, - { "keys": ["super+alt+n"], "command": "advanced_new_file_new"}, // swap lines in vim diff --git a/Packages/User/Default (Windows).sublime-keymap b/Packages/User/Default (Windows).sublime-keymap index 05e09de..8a4833f 100644 --- a/Packages/User/Default (Windows).sublime-keymap +++ b/Packages/User/Default (Windows).sublime-keymap @@ -110,6 +110,53 @@ { "keys": ["ctrl+up"], "command": "select_lines", "args": {"forward": false} }, { "keys": ["ctrl+down"], "command": "select_lines", "args": {"forward": true} }, + // enable emmet tab in jsx file + { + "keys": ["tab"], + "command": "expand_abbreviation_by_tab", + + // put comma-separated syntax selectors for which + // you want to expandEmmet abbreviations into "operand" key + // instead of SCOPE_SELECTOR. + // Examples: source.js, text.html - source + "context": [ + { + "operand": "meta.group.braces.round.js, text.html", + "operator": "equal", + "match_all": true, + "key": "selector" + }, + + // run only if there's no selected text + { + "match_all": true, + "key": "selection_empty" + }, + + // don't work if there are active tabstops + { + "operator": "equal", + "operand": false, + "match_all": true, + "key": "has_next_field" + }, + + // don't work if completion popup is visible and you + // want to insert completion with Tab. If you want to + // expand Emmet with Tab even if popup is visible -- + // remove this section + { + "operand": false, + "operator": "equal", + "match_all": true, + "key": "auto_complete_visible" + }, + { + "match_all": true, + "key": "is_abbreviation" + } + ] + }, //vim cyrilic keys { "keys": ["ctrl+х"], "command": "exit_insert_mode", diff --git a/Packages/User/Preferences.sublime-settings b/Packages/User/Preferences.sublime-settings index bc1fed9..cbcbc12 100644 --- a/Packages/User/Preferences.sublime-settings +++ b/Packages/User/Preferences.sublime-settings @@ -1,5 +1,6 @@ { "always_show_minimap_viewport": true, + "atomic_save": true, "bold_folder_labels": true, "caret_extra_bottom": 3, "caret_extra_top": 3, @@ -9,7 +10,6 @@ "color_scheme_option": 0, "drag_text": false, "draw_centered": true, - "atomic_save": true, "draw_white_space": "all", "enable_tab_scrolling": false, "ensure_newline_at_eof_on_save": true,