sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #10: it's maximizing not maximizeing

html_output
Stephan Seitz 2022-01-28 21:22:46 +07:00
parent ea9a194a33
commit 77fded65fb
5 changed files with 4199 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grammar.js
Unescape Escape View File

@ -238,7 +238,7 @@ module.exports = grammar(clojure, {
_for_part: $ => seq(repeat($._gap), $.for_clause_word, repeat($._gap), $._form), _for_part: $ => seq(repeat($._gap), $.for_clause_word, repeat($._gap), $._form),
accumulation_verb: _ => loopSymbol(/((collect|append|nconc|count|maximize|minimize)(ing)?|sum(ming)?)/), accumulation_verb: _ => loopSymbol(/((collect|append|nconc|count|maximize|minimize)(ing)?|sum(ming)?|maximizing|minimizing)/),
for_clause: $ => choice(seq(choice(loopSymbol('for'), loopSymbol('and'), loopSymbol('as')), repeat($._gap), field('variable', $._form), optional(field('type', seq(repeat($._gap), $._form))), for_clause: $ => choice(seq(choice(loopSymbol('for'), loopSymbol('and'), loopSymbol('as')), repeat($._gap), field('variable', $._form), optional(field('type', seq(repeat($._gap), $._form))),
repeat1($._for_part)), loopSymbol('and')), repeat1($._for_part)), loopSymbol('and')),
with_clause: $ => seq(loopSymbol('with'), repeat($._gap), choice($._form, seq($._form, repeat($._gap), field('type', $._form))), repeat($._gap), optSeq(loopSymbol("="), repeat($._gap)), optSeq($._form, repeat($._gap))), with_clause: $ => seq(loopSymbol('with'), repeat($._gap), choice($._form, seq($._form, repeat($._gap), field('type', $._form))), repeat($._gap), optSeq(loopSymbol("="), repeat($._gap)), optSeq($._form, repeat($._gap))),

2
src/grammar.json
Unescape Escape View File

@ -2550,7 +2550,7 @@
}, },
{ {
"type": "PATTERN", "type": "PATTERN",
"value": "((collect|append|nconc|count|maximize|minimize)(ing)?|sum(ming)?)" "value": "((collect|append|nconc|count|maximize|minimize)(ing)?|sum(ming)?|maximizing|minimizing)"
} }
] ]
}, },

4170
src/parser.c
View File

File diff suppressed because it is too large Load Diff

1
src/tree_sitter/parser.h
Unescape Escape View File

@ -123,6 +123,7 @@ struct TSLanguage {
unsigned (*serialize)(void *, char *); unsigned (*serialize)(void *, char *);
void (*deserialize)(void *, const char *, unsigned); void (*deserialize)(void *, const char *, unsigned);
} external_scanner; } external_scanner;
const TSStateId *primary_state_ids;
}; };
/* /*

26
test/corpus/basic.txt
Unescape Escape View File

@ -1316,3 +1316,29 @@ Chars #\(
(sym_lit) (sym_lit)
(char_lit) (char_lit)
(sym_lit))) (sym_lit)))
================================================================================
Issue #10
================================================================================
(loop for s in symbols
maximizing (length (symbol-name s)))
--------------------------------------------------------------------------------
(source
(list_lit
(loop_macro
(loop_clause
(for_clause
(sym_lit)
(for_clause_word)
(sym_lit)))
(loop_clause
(accumulation_clause
(accumulation_verb)
(list_lit
(sym_lit)
(list_lit
(sym_lit)
(sym_lit))))))))