Skip to content

Commit e63fca0

Browse files
amakeamake
committed
Bump deps
1 parent c9967ff commit e63fca0

File tree

11 files changed

+216
-169
lines changed

11 files changed

+216
-169
lines changed

‎lib/src/file_link/grammar.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ class OrgFileLinkGrammarDefinition extends GrammarDefinition {
1010

1111
Parser scheme() =>
1212
(string('file:') | string('attachment:') | anyOf('/.').and())
13-
.flatten('Expected link scheme');
13+
.flatten(message: 'Expected link scheme');
1414

15-
Parser body() =>
16-
any().starLazy(string('::') | endOfInput()).flatten('Expected link body');
15+
Parser body() => any()
16+
.starLazy(string('::') | endOfInput())
17+
.flatten(message: 'Expected link body');
1718

18-
Parser extra() => any().starString('Expected link extra');
19+
Parser extra() => any().starString(message: 'Expected link extra');
1920
}

‎lib/src/org/grammar.dart‎

Lines changed: 116 additions & 93 deletions
Large diffs are not rendered by default.

‎lib/src/org/parser.dart‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ class OrgContentParserDefinition extends OrgContentGrammarDefinition {
317317
@override
318318
Parser macroReference() => super
319319
.macroReference()
320-
.flatten('Macro reference expected')
320+
.flatten(message: 'Macro reference expected')
321321
.map((value) => OrgMacroReference(value));
322322

323323
@override
@@ -437,12 +437,14 @@ class OrgContentParserDefinition extends OrgContentGrammarDefinition {
437437
super.srcBlockLanguageToken().castList<String>().pick(1);
438438

439439
@override
440-
Parser namedBlockStart(String name) =>
441-
super.namedBlockStart(name).flatten('Named block "$name" start expected');
440+
Parser namedBlockStart(String name) => super
441+
.namedBlockStart(name)
442+
.flatten(message: 'Named block "$name" start expected');
442443

443444
@override
444-
Parser namedBlockEnd(String name) =>
445-
super.namedBlockEnd(name).flatten('Named block "$name" end expected');
445+
Parser namedBlockEnd(String name) => super
446+
.namedBlockEnd(name)
447+
.flatten(message: 'Named block "$name" end expected');
446448

447449
@override
448450
Parser namedGreaterBlock(String name) =>
@@ -483,8 +485,9 @@ class OrgContentParserDefinition extends OrgContentGrammarDefinition {
483485
});
484486

485487
@override
486-
Parser dynamicBlockStart() =>
487-
super.dynamicBlockStart().flatten('Dynamic block start expected');
488+
Parser dynamicBlockStart() => super
489+
.dynamicBlockStart()
490+
.flatten(message: 'Dynamic block start expected');
488491

489492
@override
490493
Parser dynamicBlockContent() =>
@@ -555,7 +558,7 @@ class OrgContentParserDefinition extends OrgContentGrammarDefinition {
555558
@override
556559
Parser timestampDiary() => super
557560
.timestampDiary()
558-
.flatten('Diary timestamp expected')
561+
.flatten(message: 'Diary timestamp expected')
559562
.map((value) => OrgDiaryTimestamp(value));
560563

561564
@override
@@ -585,7 +588,7 @@ class OrgContentParserDefinition extends OrgContentGrammarDefinition {
585588

586589
@override
587590
Parser repeaterOrDelay() =>
588-
super.repeaterOrDelay().flatten('Repeater or delay expected');
591+
super.repeaterOrDelay().flatten(message: 'Repeater or delay expected');
589592

590593
@override
591594
Parser timestampTimeRange(bool active) =>
@@ -717,15 +720,17 @@ class OrgContentParserDefinition extends OrgContentGrammarDefinition {
717720
.map((elems) => OrgContent(elems));
718721

719722
@override
720-
Parser listOrderedBullet() =>
721-
super.listOrderedBullet().flatten('Ordered list bullet expected');
723+
Parser listOrderedBullet() => super
724+
.listOrderedBullet()
725+
.flatten(message: 'Ordered list bullet expected');
722726

723727
@override
724728
Parser listCounterSet() =>
725-
super.listCounterSet().flatten('Counter set expected');
729+
super.listCounterSet().flatten(message: 'Counter set expected');
726730

727731
@override
728-
Parser listCheckBox() => super.listCheckBox().flatten('Check box expected');
732+
Parser listCheckBox() =>
733+
super.listCheckBox().flatten(message: 'Check box expected');
729734

730735
@override
731736
Parser statsCookieFraction() =>
@@ -755,7 +760,8 @@ class OrgContentParserDefinition extends OrgContentGrammarDefinition {
755760
});
756761

757762
@override
758-
Parser drawerStart() => super.drawerStart().flatten('Drawer start expected');
763+
Parser drawerStart() =>
764+
super.drawerStart().flatten(message: 'Drawer start expected');
759765

760766
@override
761767
Parser drawerContent() => super
@@ -764,7 +770,8 @@ class OrgContentParserDefinition extends OrgContentGrammarDefinition {
764770
.map((elems) => OrgContent(elems));
765771

766772
@override
767-
Parser drawerEnd() => super.drawerEnd().flatten('Drawer end expected');
773+
Parser drawerEnd() =>
774+
super.drawerEnd().flatten(message: 'Drawer end expected');
768775

769776
@override
770777
Parser property() => super.property().map((values) {
@@ -777,7 +784,8 @@ class OrgContentParserDefinition extends OrgContentGrammarDefinition {
777784
});
778785

779786
@override
780-
Parser propertyKey() => super.propertyKey().flatten('Property key expected');
787+
Parser propertyKey() =>
788+
super.propertyKey().flatten(message: 'Property key expected');
781789

782790
@override
783791
Parser footnoteReferenceNamed() =>

‎lib/src/query/grammar.dart‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,16 @@ class OrgQueryGrammarDefinition extends GrammarDefinition {
4444
// TODO(aaron): Support regex element: {^boss.*}
4545
Parser element() => ref0(propertyExpression) | ref0(tag);
4646

47-
Parser tag() => (alnum() | anyOf('_@#%')).plus().flatten('Tag expected');
47+
Parser tag() =>
48+
(alnum() | anyOf('_@#%')).plus().flatten(message: 'Tag expected');
4849

4950
Parser propertyExpression() =>
5051
ref0(propertyName) & ref0(op) & ref0(propertyValue);
5152

5253
Parser propertyName() => insignificantWhitespace()
5354
.neg()
5455
.plusLazy(ref0(op))
55-
.flatten('Property name expected');
56+
.flatten(message: 'Property name expected');
5657

5758
Parser op() =>
5859
string('<=') |
@@ -72,6 +73,9 @@ class OrgQueryGrammarDefinition extends GrammarDefinition {
7273

7374
Parser stringValue() =>
7475
char('"') &
75-
char('"').neg().plusLazy(char('"')).flatten('String content expected') &
76+
char('"')
77+
.neg()
78+
.plusLazy(char('"'))
79+
.flatten(message: 'String content expected') &
7680
char('"');
7781
}

‎lib/src/todo/grammar.dart‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,15 @@ class TodoGrammar extends GrammarDefinition {
2020
whitespace()
2121
.neg()
2222
.plusLazy(ref0(annotation) | whitespace() | endOfInput())
23-
.flatten('state name expected')
23+
.flatten(message: 'state name expected')
2424
.where((result) => result != '|') &
2525
ref0(annotation).optional();
2626

2727
Parser annotation() =>
2828
char('(') &
29-
char(')').neg().plusGreedy(char(')')).flatten('annotation expected') &
29+
char(')')
30+
.neg()
31+
.plusGreedy(char(')'))
32+
.flatten(message: 'annotation expected') &
3033
char(')');
3134
}

‎lib/src/util/block.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import 'package:org_parser/src/util/util.dart';
22
import 'package:petitparser/petitparser.dart';
33

4-
final _start = stringIgnoreCase('#+begin_') &
5-
whitespace().neg().plusString('Block name expected') &
6-
lineTrailing().flatten('Trailing line content expected');
4+
final _start = string('#+begin_', ignoreCase: true) &
5+
whitespace().neg().plusString(message: 'Block name expected') &
6+
lineTrailing().flatten(message: 'Trailing line content expected');
77

8-
Parser blockParser([Parser? delegate]) =>
9-
BlockParser(delegate ?? any().starString('Block content expected'));
8+
Parser blockParser([Parser? delegate]) => BlockParser(
9+
delegate ?? any().starString(message: 'Block content expected'));
1010

1111
class BlockParser<R> extends DelegateParser<R, List<dynamic>> {
1212
BlockParser(super.delegate);

‎lib/src/util/indent.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:petitparser/petitparser.dart';
33
/// Returns a parser that applies [parser] to a uniformly indented region
44
/// starting at the current position.
55
Parser indentedRegion({Parser? parser}) => IndentedRegionParser(
6-
parser ?? any().starString('Region content expected'),
6+
parser ?? any().starString(message: 'Region content expected'),
77
);
88

99
/// A parser that applies [delegate] to a uniformly indented region

‎lib/src/util/latex.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:petitparser/petitparser.dart';
33
Parser<List<dynamic>> _latexBlockStart() =>
44
string(r'\begin{') &
55
(char('}').neg().plusLazy(char('}')))
6-
.flatten('LaTeX environment expected') &
6+
.flatten(message: 'LaTeX environment expected') &
77
char('}');
88

99
class LatexBlockParser extends DelegateParser<List<dynamic>, List<dynamic>> {

‎lib/src/util/local_variables.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import 'package:org_parser/src/util/util.dart';
22
import 'package:petitparser/petitparser.dart';
33

44
final _prefix = string('Local Variables:').neg().starString();
5-
final _suffix = any().starLazy(lineEnd()).flatten('Suffix expected');
6-
final _start = lineStart().flatten('Leading content expected') &
5+
final _suffix = any().starLazy(lineEnd()).flatten(message: 'Suffix expected');
6+
final _start = lineStart().flatten(message: 'Leading content expected') &
77
_prefix &
88
string('Local Variables:') &
99
insignificantWhitespace().starString() &
@@ -48,8 +48,8 @@ class LocalVariablesParser extends Parser<List<dynamic>> {
4848
string('End:')
4949
.neg()
5050
.starLazy(end)
51-
.flatten('Local variable line expected') &
52-
end.flatten('Trailing content expected'))
51+
.flatten(message: 'Local variable line expected') &
52+
end.flatten(message: 'Trailing content expected'))
5353
.drop1(0);
5454
}
5555

@@ -66,5 +66,5 @@ class LocalVariablesParser extends Parser<List<dynamic>> {
6666

6767
Parser<List<dynamic>> _rest(String prefix, String suffix) =>
6868
_internalLine(prefix, suffix).star() &
69-
_endLine(prefix, suffix).flatten('End line expected');
69+
_endLine(prefix, suffix).flatten(message: 'End line expected');
7070
}

0 commit comments

Comments
 (0)