Regexp fix to unbork check in LibraryNames.

See flutter/flutter#1996 for context. Net-net, `pointycastle.impl.ec_domain_parameters.gostr3410_2001_cryptopro_a` was killing our previous regexp. Kudos to Bob and Natalie for their regexp-fu! BUG= R=rnystrom@google.com Review URL: https://codereview.chromium.org//1719553002 .
dart-lang · Feb 20, 2016 · ce7aa0e · ce7aa0e
1 parent f0d8b3a
commit ce7aa0e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/src/util.dart b/lib/src/util.dart
@@ -20,7 +20,7 @@ final _lowerCamelCase = new RegExp(r'^[_]?[a-z][a-z0-9]*([A-Z][a-z0-9]*)*$');
 final _lowerCaseUnderScore = new RegExp(r'^([a-z]+([_]?[a-z0-9]+)*)+$');
 
 final _lowerCaseUnderScoreWithDots =
-    new RegExp(r'^([a-z]+([_]?[a-z0-9]+)?)+(.([a-z]+([_]?[a-z0-9]+)?))*$');
+    new RegExp(r'^[a-z][_a-z0-9]*(\.[a-z][_a-z0-9]*)*$');
 
 final _pubspec = new RegExp(r'^[_]?pubspec\.yaml$');
 

diff --git a/test/rule_test.dart b/test/rule_test.dart
@@ -178,7 +178,10 @@ defineRuleUnitTests() {
         'foo.bar',
         'foo_bar_baz',
         'foo',
+        'foo_',
         'foo.bar_baz.bang',
+        //See: https://github.com/flutter/flutter/pull/1996
+        'pointycastle.impl.ec_domain_parameters.gostr3410_2001_cryptopro_a',
         'a.b',
         'a.b.c',
         'p2.src.acme'
@@ -189,7 +192,6 @@ defineRuleUnitTests() {
         'Foo',
         'fooBar.',
         '.foo_Bar',
-        'foo_',
         '_f',
         'F_B',
         'JS',