Skip to content
This repository was archived by the owner on Nov 20, 2024. It is now read-only.

Commit 183a56a

Browse files
authored
Ignore '$' in identifiers; we use in generated code. (#290)
* Ignore '$' in identifiers; we use in generated code. * Update camel_case_types.dart test case.
1 parent da3ec6a commit 183a56a

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

lib/src/linter.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ typedef Printer(String msg);
2828
/// Describes a String in valid camel case format.
2929
class CamelCaseString {
3030
static final _camelCaseMatcher = new RegExp(r'[A-Z][a-z]*');
31-
static final _camelCaseTester = new RegExp(r'^([_$]*)([A-Z]+[a-z0-9]*)+$');
31+
static final _camelCaseTester = new RegExp(r'^([_$]*)([A-Z?$]+[a-z0-9]*)+$');
3232

3333
final String value;
3434
CamelCaseString(this.value) {

lib/src/util.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import 'package:path/path.dart' as p;
1717

1818
final _identifier = new RegExp(r'^([_a-zA-Z]+([_a-zA-Z0-9])*)$');
1919

20-
final _lowerCamelCase = new RegExp(r'^[_]*[a-z][a-z0-9]*([A-Z][a-z0-9]*)*$');
20+
final _lowerCamelCase = new RegExp(r'^[_]*[a-z][a-z0-9?$]*([A-Z][a-z0-9?$]*)*$');
2121

2222
final _lowerCaseUnderScore = new RegExp(r'^([a-z]+([_]?[a-z0-9]+)*)+$');
2323

test/rule_test.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,9 @@ defineRuleUnitTests() {
145145
'F',
146146
'FB',
147147
'F1',
148-
'FooBar1'
148+
'FooBar1',
149+
'Foo\$Generated',
150+
'Foo\$Generated\$Bar'
149151
];
150152
testEach(good, isUpperCamelCase, isTrue);
151153
var bad = ['fooBar', 'foo', 'f', '_f', 'F_B'];
@@ -166,7 +168,7 @@ defineRuleUnitTests() {
166168
'JS',
167169
'JSON',
168170
'1',
169-
'1b'
171+
'1b',
170172
];
171173
testEach(bad, isLowerCaseUnderScore, isFalse);
172174
});
@@ -202,7 +204,9 @@ defineRuleUnitTests() {
202204
'_',
203205
'F',
204206
'__x',
205-
'___x'
207+
'___x',
208+
'foo\$Generated',
209+
'foo\$Generated\$Bar'
206210
];
207211
testEach(good, isLowerCamelCase, isTrue);
208212

test/rules/camel_case_types.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ typedef bool predicate(); //LINT [14:9]
1717
class fooBar // LINT
1818
{}
1919

20-
class Foo$Bar //LINT
20+
class Foo$Bar //OK
2121
{}
2222

2323
class Foo_Bar //LINT

0 commit comments

Comments
 (0)