Skip to content

Commit

Permalink
Updated everything to the lastest version
Browse files Browse the repository at this point in the history
  • Loading branch information
lcagustini committed Mar 4, 2019
1 parent 5f79e48 commit ed302c5
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 63 deletions.
96 changes: 36 additions & 60 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions langs/s/syntax.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"s_constant": "[#+\\-*/]?\\b0x[0-9a-fA-F]*\\b|[#+\\-*/]?\\b0b[01]*\\b|[#+\\-*/]?\\b0[0-7]*\\b|[#+\\-*/]?\\b[1-9][0-9]*\\b|\"[^\"]+\"|#\\b\\w+\\b",
"s_constant": "[#+\\-*/]?\\b0x[0-9a-fA-F]*\\b|[#+\\-*/]?\\b0b[01]*\\b|[#+\\-*/]?\\b0[0-7]*\\b|[#+\\-*/]?\\b[1-9][0-9]*\\b|\"[^\"]+\"|#[_\\-()\\\\]*\\b[a-zA-Z_\\-()\\\\]+\\b",
"s_keyword": "(?i)\\badc\\b|\\badd\\b|\\band\\b|\\basr\\b|\\bbic\\b|\\bbl\\b|\\bbx\\b|\\bcmn\\b|\\bcmp\\b|\\beor\\b|\\bldmia\\b|\\bldr\\b|\\bldrb\\b|\\bldrh\\b|\\bldrsb\\b|\\bldrsh\\b|\\blsl\\b|\\blsr\\b|\\bmov\\b|\\bmul\\b|\\bmvn\\b|\\bneg\\b|\\borr\\b|\\bpop\\b|\\bpush\\b|\\bror\\b|\\bsbc\\b|\\bstmia\\b|\\bstr\\b|\\bstrb\\b|\\bstrh\\b|\\bstrsb\\b|\\bstrsh\\b|\\bsub\\b|\\bswi\\b|\\btst\\b|\\bbeq\\b|\\bbne\\b|\\bbcs\\b|\\bbcc\\b|\\bbhs\\b|\\bblo\\b|\\bbmi\\b|\\bbpl\\b|\\bbvs\\b|\\bbvc\\b|\\bbhi\\b|\\bbls\\b|\\bbge\\b|\\bblt\\b|\\bbgt\\b|\\bble\\b|\\bbal\\b|\\bbne\\b|\\bb\\b",
"s_secondary_word": "(?i)\\br1[0-4]\\b|\\br[0-9]\\b|\\bsp\\b|\\blr\\b|\\bpc\\b|\\bcpsr\\b",
"s_preproc": "^\\s*\\.[A-Za-z_]+",
"s_data_type": "=\\.+|[0-9A-Za-z_\\.]+:",
"s_data_type": "=.+|[0-9A-Za-z_\\.\\-\\\\()]+:",
"s_comment": "@.*"
}

Expand Down
4 changes: 3 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,9 @@ fn main() {
let mut space_amount = halves[0].len() - halves[0].trim_start().len();
let mut space_string = "".to_owned();

if editor.text.raw[editor.cursor.get_absolute_y()].trim().ends_with("{") {
if editor.text.raw[editor.cursor.get_absolute_y()].trim().ends_with("{") ||
editor.text.raw[editor.cursor.get_absolute_y()].trim().ends_with(":") ||
editor.text.raw[editor.cursor.get_absolute_y()].trim().ends_with("(") {
space_amount += 4;
}

Expand Down

0 comments on commit ed302c5

Please sign in to comment.