Skip to content

Update the syntax to fix nested languages and emphases #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Update the syntax to fix nested languages and emphases #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e07ece9
Update syntax to v2
eugenesvk Dec 8, 2022
095789a
Fix languages to stop at closing tag via the embed API
eugenesvk Dec 8, 2022
453f12c
Regroup tags
eugenesvk Dec 8, 2022
c5f649d
Update bold/italic tags
eugenesvk Dec 8, 2022
4369c68
Add underline/striketrhough tags
eugenesvk Dec 8, 2022
7ed5483
Update url/value tags
eugenesvk Dec 8, 2022
3cfdc6d
Update anchor
eugenesvk Dec 8, 2022
e37dc06
Add tests
eugenesvk Dec 8, 2022
3d752de
Add bold/unbold macro
eugenesvk Dec 8, 2022
4f384b9
Add italic/unitalicize macro
eugenesvk Dec 8, 2022
da3695f
Comment out default OSX keymap and remove old package name
eugenesvk Dec 8, 2022
b58fd1b
Add more advanced (Un)Bold/Italic keymap
eugenesvk Dec 8, 2022
7f00d82
Update ReadMe
eugenesvk Dec 8, 2022
943da3e
Remove json comments from the ReadMe
eugenesvk Dec 8, 2022
6242a73
Fix syntax value tag not closing
eugenesvk Dec 8, 2022
4d3d27c
Add test for value tags
eugenesvk Dec 8, 2022
4aaf0f9
Minor formatting changes in tests
eugenesvk Dec 8, 2022
98f8b7c
Add selected text to the Size snippet to match other snippets
eugenesvk Dec 9, 2022
ed4288f
Add Color/Wrap/Size macros
eugenesvk Dec 9, 2022
b497e16
Add Color/Size/Wrap to the keymap
eugenesvk Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
349 changes: 216 additions & 133 deletions BBCode.sublime-syntax
View file
Open in desktop

Large diffs are not rendered by default.

117 changes: 112 additions & 5 deletions Default (OSX).sublime-keymap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,114 @@
[
{ "keys": ["super+ctrl+b"], "command": "insert_snippet", "args": {"name": "Packages/BBCode Syntax/Bold.sublime-snippet"} },
{ "keys": ["super+ctrl+c"], "command": "insert_snippet", "args": {"name": "Packages/BBCode Syntax/Color.sublime-snippet"} },
{ "keys": ["super+ctrl+i"], "command": "insert_snippet", "args": {"name": "Packages/BBCode Syntax/Italic.sublime-snippet"} },
{ "keys": ["super+ctrl+2"], "command": "insert_snippet", "args": {"name": "Packages/BBCode Syntax/Size.sublime-snippet"} },
{ "keys": ["super+ctrl+w"], "command": "insert_snippet", "args": {"name": "Packages/BBCode Syntax/Wrap.sublime-snippet"} }
// BUG: preceding_text/following_text selectors fail since 'selection' is included, so can't reliably parse @ the start/end
// https://github.com/sublimehq/sublime_text/issues/4042
// // [BBCode] Text Formatting Bold
// // auto-pair if not within a word
// {"keys":["super+b"], "command":"insert_snippet","args":{"name":"Packages/BBCode/Bold.sublime-snippet"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - markup.bold - markup.bold_italic - meta.tag.any.bbcode", "match_all":true },
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true },
// {"key":"eol_selector", "operator":"not_equal", "operand":"string.quoted.single", "match_all":true },
// {"key":"preceding_text", "operator":"not_regex_contains", "operand":"['a-zA-Z0-9_*]$", "match_all":true },
// {"key":"following_text", "operator":"regex_contains", "operand":"^(?:\t| |\\)|]|\\}|$)", "match_all":true } ]},
// // Bold on Cmd + B (if caret is at the beginning, in the middle of or at the end of a word)
// {"keys":["super+b"], "command":"run_macro_file","args":{"file":"Packages/BBCode/macro/Transform Word - Bold.sublime-macro"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - markup.bold - markup.bold_italic - meta.tag.any.bbcode", "match_all":true },
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true },
// {"key":"preceding_text", "operator":"regex_contains", "operand":"\\w$", "match_all":true } ]},
// {"keys":["super+b"], "command":"run_macro_file","args":{"file":"Packages/BBCode/macro/Transform Word - Bold.sublime-macro"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - markup.bold - markup.bold_italic - meta.tag.any.bbcode", "match_all":true },
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true },
// {"key":"following_text", "operator":"regex_contains", "operand":"^\\w", "match_all":true } ]},
// // Transform selection to bold
// {"keys":["super+b"], "command":"insert_snippet","args":{"name":"Packages/BBCode/Bold.sublime-snippet"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - markup.bold - markup.bold_italic - meta.tag.any.bbcode", "match_all":true },
// {"key":"selection_empty", "operator":"equal", "operand":false, "match_all":true },
// {"key":"preceding_text", "operator":"not_regex_contains", "operand":"\\[b\\]$", "match_all":true },
// {"key":"following_text", "operator":"not_regex_contains", "operand":"^\\[\\/b\\]", "match_all":true } ]},
// // Unbold on Cmd + B if already bold
// {"keys":["super+b"], "command":"run_macro_file","args":{"file":"Packages/BBCode/macro/Transform Word - UnBold.sublime-macro"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode markup.bold - punctuation, text.bbcode markup.bold_italic - punctuation", "match_all":true } ]},

// // [BBCode] Text Formatting Italic
// // auto-pair if not within a word
// {"keys":["super+i"], "command":"insert_snippet","args":{"name":"Packages/BBCode/Italic.sublime-snippet"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - markup.italic - markup.bold_italic - meta.tag.any.bbcode", "match_all":true },
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true },
// {"key":"eol_selector", "operator":"not_equal", "operand":"string.quoted.single", "match_all":true },
// {"key":"preceding_text", "operator":"not_regex_contains", "operand":"['a-zA-Z0-9_*]$", "match_all":true },
// {"key":"following_text", "operator":"regex_contains", "operand":"^(?:\t| |\\)|]|\\}|$)", "match_all":true } ]},
// // Italics on Cmd + I (if caret is at the beginning, in the middle of or at the end of a word)
// {"keys":["super+i"], "command":"run_macro_file","args":{"file":"Packages/BBCode/macro/Transform Word - Italic.sublime-macro"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - markup.italic - markup.bold_italic - meta.tag.any.bbcode", "match_all":true },
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true },
// {"key":"preceding_text", "operator":"regex_contains", "operand":"\\w$", "match_all":true } ]},
// {"keys":["super+i"], "command":"run_macro_file","args":{"file":"Packages/BBCode/macro/Transform Word - Italic.sublime-macro"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - markup.italic - markup.bold_italic - meta.tag.any.bbcode", "match_all":true },
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true },
// {"key":"following_text", "operator":"regex_contains", "operand":"^\\w", "match_all":true } ]},
// // Unitalicize on Cmd + I if already italic
// {"keys":["super+i"], "command":"insert_snippet","args":{"name":"Packages/BBCode/Italic.sublime-snippet"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - markup.italic - markup.bold_italic - meta.tag.any.bbcode", "match_all":true },
// {"key":"selection_empty", "operator":"equal", "operand":false, "match_all":true },
// {"key":"preceding_text", "operator":"not_regex_contains", "operand":"\\[i\\]$", "match_all":true },
// {"key":"following_text", "operator":"not_regex_contains", "operand":"^\\[\\/i\\]", "match_all":true } ]},
// {"keys":["super+i"], "command":"run_macro_file","args":{"file":"Packages/BBCode/macro/Transform Word - UnItalicize.sublime-macro"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode markup.italic - punctuation, text.bbcode markup.bold_italic - punctuation", "match_all":true } ]},

// // [BBCode] Text Formatting Other: wrap, color, size tags
// // Wrap: auto-pair if outside a word
// {"keys":["super+ctrl+w"], "command":"insert_snippet","args":{"name":"Packages/BBCode/Wrap.sublime-snippet"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - meta.tag.any.bbcode", "match_all":true},
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true},
// {"key":"eol_selector", "operator":"not_equal", "operand":"string.quoted.single", "match_all":true},
// {"key":"preceding_text", "operator":"not_regex_contains", "operand":"['a-zA-Z0-9_*]$", "match_all":true},
// {"key":"following_text", "operator":"regex_contains", "operand":"^(?:\t| |\\)|]|\\}|$)", "match_all":true} ]},
// // Wrap if caret is @ word's beginning/middle/end
// {"keys":["super+ctrl+w"], "command":"run_macro_file","args":{"file":"Packages/BBCode/macro/Transform Word - Wrap.sublime-macro"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - meta.tag.any.bbcode", "match_all":true},
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true},
// {"key":"preceding_text", "operator":"regex_contains", "operand":"\\w$", "match_all":true} ]},
// // Wrap selection
// {"keys":["super+ctrl+b"], "command":"insert_snippet","args":{"name":"Packages/BBCode/Wrap.sublime-snippet"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - meta.tag.any.bbcode", "match_all":true},
// {"key":"selection_empty", "operator":"equal", "operand":false, "match_all":true},
// {"key":"preceding_text", "operator":"not_regex_contains", "operand":"\\[\\w\\]$", "match_all":true},
// {"key":"following_text", "operator":"not_regex_contains", "operand":"^\\[\\/\\w\\]", "match_all":true} ]},

// // Color: auto-pair if outside a word
// {"keys":["super+ctrl+c"], "command":"insert_snippet","args":{"name":"Packages/BBCode/Color.sublime-snippet"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - meta.tag.any.bbcode", "match_all":true},
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true},
// {"key":"eol_selector", "operator":"not_equal", "operand":"string.quoted.single", "match_all":true},
// {"key":"preceding_text", "operator":"not_regex_contains", "operand":"['a-zA-Z0-9_*]$", "match_all":true},
// {"key":"following_text", "operator":"regex_contains", "operand":"^(?:\t| |\\)|]|\\}|$)", "match_all":true} ]},
// // Color if caret is @ word's beginning/middle/end
// {"keys":["super+ctrl+c"], "command":"run_macro_file","args":{"file":"Packages/BBCode/macro/Transform Word - Color.sublime-macro"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - meta.tag.any.bbcode", "match_all":true},
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true},
// {"key":"preceding_text", "operator":"regex_contains", "operand":"\\w$", "match_all":true} ]},
// // Color selection
// {"keys":["super+ctrl+c"], "command":"insert_snippet","args":{"name":"Packages/BBCode/Color.sublime-snippet"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - meta.tag.any.bbcode", "match_all":true},
// {"key":"selection_empty", "operator":"equal", "operand":false, "match_all":true},
// {"key":"preceding_text", "operator":"not_regex_contains", "operand":"\\[\\w\\]$", "match_all":true},
// {"key":"following_text", "operator":"not_regex_contains", "operand":"^\\[\\/\\w\\]", "match_all":true} ]},

// // Size: auto-pair if outside a word
// {"keys":["super+ctrl+2"], "command":"insert_snippet","args":{"name":"Packages/BBCode/Size.sublime-snippet"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - meta.tag.any.bbcode", "match_all":true},
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true},
// {"key":"eol_selector", "operator":"not_equal", "operand":"string.quoted.single", "match_all":true},
// {"key":"preceding_text", "operator":"not_regex_contains", "operand":"['a-zA-Z0-9_*]$", "match_all":true},
// {"key":"following_text", "operator":"regex_contains", "operand":"^(?:\t| |\\)|]|\\}|$)", "match_all":true} ]},
// // Size if caret is @ word's beginning/middle/end
// {"keys":["super+ctrl+2"], "command":"run_macro_file","args":{"file":"Packages/BBCode/macro/Transform Word - Size.sublime-macro"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - meta.tag.any.bbcode", "match_all":true},
// {"key":"selection_empty", "operator":"equal", "operand":true, "match_all":true},
// {"key":"preceding_text", "operator":"regex_contains", "operand":"\\w$", "match_all":true} ]},
// // Size selection
// {"keys":["super+ctrl+2"], "command":"insert_snippet","args":{"name":"Packages/BBCode/Size.sublime-snippet"},"context":[
// {"key":"selector", "operator":"equal", "operand":"text.bbcode - meta.tag.any.bbcode", "match_all":true},
// {"key":"selection_empty", "operator":"equal", "operand":false, "match_all":true},
// {"key":"preceding_text", "operator":"not_regex_contains", "operand":"\\[\\w\\]$", "match_all":true},
// {"key":"following_text", "operator":"not_regex_contains", "operand":"^\\[\\/\\w\\]", "match_all":true} ]},
]
Loading