| Index: editor/util/plugins/com.google.dart.java2dart/resources/java_engine.dart
|
| diff --git a/editor/util/plugins/com.google.dart.java2dart/resources/java_engine.dart b/editor/util/plugins/com.google.dart.java2dart/resources/java_engine.dart
|
| index 741568776eeb30a0f65520520ca3d7406299ea16..aef442561715f03abb643eaebaf5f567c2ddd8aa 100644
|
| --- a/editor/util/plugins/com.google.dart.java2dart/resources/java_engine.dart
|
| +++ b/editor/util/plugins/com.google.dart.java2dart/resources/java_engine.dart
|
| @@ -4,7 +4,7 @@ import 'java_core.dart';
|
|
|
| class StringUtilities {
|
| static const String EMPTY = '';
|
| - static const List<String> EMPTY_ARRAY = const <String> [];
|
| + static const List<String> EMPTY_ARRAY = const <String>[];
|
| static String intern(String s) => s;
|
| static bool isTagName(String s) {
|
| if (s == null || s.length == 0) {
|
| @@ -43,50 +43,37 @@ class StringUtilities {
|
| }
|
| static endsWith3(String str, int c1, int c2, int c3) {
|
| var length = str.length;
|
| - return length >= 3 &&
|
| - str.codeUnitAt(length - 3) == c1 &&
|
| - str.codeUnitAt(length - 2) == c2 &&
|
| - str.codeUnitAt(length - 1) == c3;
|
| + return length >= 3 && str.codeUnitAt(length - 3) == c1 && str.codeUnitAt(
|
| + length - 2) == c2 && str.codeUnitAt(length - 1) == c3;
|
| }
|
|
|
| static startsWithChar(String str, int c) {
|
| return str.length != 0 && str.codeUnitAt(0) == c;
|
| }
|
| static startsWith2(String str, int start, int c1, int c2) {
|
| - return str.length - start >= 2 &&
|
| - str.codeUnitAt(start) == c1 &&
|
| + return str.length - start >= 2 && str.codeUnitAt(start) == c1 &&
|
| str.codeUnitAt(start + 1) == c2;
|
| }
|
| static startsWith3(String str, int start, int c1, int c2, int c3) {
|
| - return str.length - start >= 3 &&
|
| - str.codeUnitAt(start) == c1 &&
|
| - str.codeUnitAt(start + 1) == c2 &&
|
| - str.codeUnitAt(start + 2) == c3;
|
| + return str.length - start >= 3 && str.codeUnitAt(start) == c1 &&
|
| + str.codeUnitAt(start + 1) == c2 && str.codeUnitAt(start + 2) == c3;
|
| }
|
| static startsWith4(String str, int start, int c1, int c2, int c3, int c4) {
|
| - return str.length - start >= 4 &&
|
| - str.codeUnitAt(start) == c1 &&
|
| - str.codeUnitAt(start + 1) == c2 &&
|
| - str.codeUnitAt(start + 2) == c3 &&
|
| + return str.length - start >= 4 && str.codeUnitAt(start) == c1 &&
|
| + str.codeUnitAt(start + 1) == c2 && str.codeUnitAt(start + 2) == c3 &&
|
| str.codeUnitAt(start + 3) == c4;
|
| }
|
| - static startsWith5(String str, int start, int c1, int c2, int c3, int c4,
|
| - int c5) {
|
| - return str.length - start >= 5 &&
|
| - str.codeUnitAt(start) == c1 &&
|
| - str.codeUnitAt(start + 1) == c2 &&
|
| - str.codeUnitAt(start + 2) == c3 &&
|
| - str.codeUnitAt(start + 3) == c4 &&
|
| - str.codeUnitAt(start + 4) == c5;
|
| - }
|
| - static startsWith6(String str, int start, int c1, int c2, int c3, int c4,
|
| - int c5, int c6) {
|
| - return str.length - start >= 6 &&
|
| - str.codeUnitAt(start) == c1 &&
|
| - str.codeUnitAt(start + 1) == c2 &&
|
| - str.codeUnitAt(start + 2) == c3 &&
|
| - str.codeUnitAt(start + 3) == c4 &&
|
| - str.codeUnitAt(start + 4) == c5 &&
|
| + static startsWith5(String str, int start, int c1, int c2, int c3, int c4, int
|
| + c5) {
|
| + return str.length - start >= 5 && str.codeUnitAt(start) == c1 &&
|
| + str.codeUnitAt(start + 1) == c2 && str.codeUnitAt(start + 2) == c3 &&
|
| + str.codeUnitAt(start + 3) == c4 && str.codeUnitAt(start + 4) == c5;
|
| + }
|
| + static startsWith6(String str, int start, int c1, int c2, int c3, int c4, int
|
| + c5, int c6) {
|
| + return str.length - start >= 6 && str.codeUnitAt(start) == c1 &&
|
| + str.codeUnitAt(start + 1) == c2 && str.codeUnitAt(start + 2) == c3 &&
|
| + str.codeUnitAt(start + 3) == c4 && str.codeUnitAt(start + 4) == c5 &&
|
| str.codeUnitAt(start + 5) == c6;
|
| }
|
| static int indexOf1(String str, int start, int c) {
|
| @@ -111,29 +98,26 @@ class StringUtilities {
|
| }
|
| return -1;
|
| }
|
| - static int indexOf4(String string, int start, int c1, int c2, int c3, int c4) {
|
| + static int indexOf4(String string, int start, int c1, int c2, int c3, int c4)
|
| + {
|
| int index = start;
|
| int last = string.length - 3;
|
| while (index < last) {
|
| - if (string.codeUnitAt(index) == c1 &&
|
| - string.codeUnitAt(index + 1) == c2 &&
|
| - string.codeUnitAt(index + 2) == c3 &&
|
| - string.codeUnitAt(index + 3) == c4) {
|
| + if (string.codeUnitAt(index) == c1 && string.codeUnitAt(index + 1) == c2
|
| + && string.codeUnitAt(index + 2) == c3 && string.codeUnitAt(index + 3) == c4) {
|
| return index;
|
| }
|
| index++;
|
| }
|
| return -1;
|
| }
|
| - static int indexOf5(String str, int start, int c1, int c2, int c3, int c4,
|
| - int c5) {
|
| + static int indexOf5(String str, int start, int c1, int c2, int c3, int c4, int
|
| + c5) {
|
| int index = start;
|
| int last = str.length - 4;
|
| while (index < last) {
|
| - if (str.codeUnitAt(index) == c1 &&
|
| - str.codeUnitAt(index + 1) == c2 &&
|
| - str.codeUnitAt(index + 2) == c3 &&
|
| - str.codeUnitAt(index + 3) == c4 &&
|
| + if (str.codeUnitAt(index) == c1 && str.codeUnitAt(index + 1) == c2 &&
|
| + str.codeUnitAt(index + 2) == c3 && str.codeUnitAt(index + 3) == c4 &&
|
| str.codeUnitAt(index + 4) == c5) {
|
| return index;
|
| }
|
| @@ -151,6 +135,24 @@ class StringUtilities {
|
| }
|
| return str.substring(0, pos);
|
| }
|
| +
|
| + /**
|
| + * Return the index of the first not letter/digit character in the [string]
|
| + * that is at or after the [startIndex]. Return the length of the [string] if
|
| + * all characters to the end are letters/digits.
|
| + */
|
| + static int indexOfFirstNotLetterDigit(String string, int startIndex) {
|
| + int index = startIndex;
|
| + int last = string.length;
|
| + while (index < last) {
|
| + int c = string.codeUnitAt(index);
|
| + if (!Character.isLetterOrDigit(c)) {
|
| + return index;
|
| + }
|
| + index++;
|
| + }
|
| + return last;
|
| + }
|
| }
|
|
|
| class FileNameUtilities {
|
|
|