| Index: pkg/analyzer/lib/src/generated/source_io.dart
|
| diff --git a/pkg/analyzer/lib/src/generated/source_io.dart b/pkg/analyzer/lib/src/generated/source_io.dart
|
| index dd5a729120d0bf7bdc8c566619e629d4bcb9095a..e885cd8fdddf92d32dfcfaa8fb718ce795f2d10f 100644
|
| --- a/pkg/analyzer/lib/src/generated/source_io.dart
|
| +++ b/pkg/analyzer/lib/src/generated/source_io.dart
|
| @@ -141,10 +141,10 @@ class FileBasedSource extends Source {
|
| * @param uri the URI from which this source was originally derived
|
| */
|
| FileBasedSource.con2(Uri uri, JavaFile file)
|
| - : uri = uri, file = file,
|
| + : uri = uri,
|
| + file = file,
|
| id = _idTable.putIfAbsent(
|
| - '$uri@${file.getPath()}',
|
| - () => _idTable.length);
|
| + '$uri@${file.getPath()}', () => _idTable.length);
|
|
|
| @override
|
| TimestampedData<String> get contents {
|
| @@ -166,8 +166,7 @@ class FileBasedSource extends Source {
|
| */
|
| TimestampedData<String> get contentsFromFile {
|
| return new TimestampedData<String>(
|
| - file.lastModified(),
|
| - fileReadMode(file.readAsStringSync()));
|
| + file.lastModified(), fileReadMode(file.readAsStringSync()));
|
| }
|
|
|
| @override
|
| @@ -233,8 +232,8 @@ class FileBasedSource extends Source {
|
| }
|
| Uri result = baseUri.resolveUri(containedUri);
|
| if (isOpaque) {
|
| - result =
|
| - parseUriWithException("${result.scheme}:${result.path.substring(1)}");
|
| + result = parseUriWithException(
|
| + "${result.scheme}:${result.path.substring(1)}");
|
| }
|
| return result;
|
| } catch (exception, stackTrace) {
|
| @@ -384,26 +383,23 @@ class PackageUriResolver extends UriResolver {
|
| * but may be empty string)
|
| * @return the file (not `null`)
|
| */
|
| - JavaFile getCanonicalFile(JavaFile packagesDirectory, String pkgName,
|
| - String relPath) {
|
| + JavaFile getCanonicalFile(
|
| + JavaFile packagesDirectory, String pkgName, String relPath) {
|
| JavaFile pkgDir = new JavaFile.relative(packagesDirectory, pkgName);
|
| try {
|
| pkgDir = pkgDir.getCanonicalFile();
|
| } on JavaIOException catch (exception, stackTrace) {
|
| if (!exception.toString().contains("Required key not available")) {
|
| - AnalysisEngine.instance.logger.logError(
|
| - "Canonical failed: $pkgDir",
|
| + AnalysisEngine.instance.logger.logError("Canonical failed: $pkgDir",
|
| new CaughtException(exception, stackTrace));
|
| } else if (_CanLogRequiredKeyIoException) {
|
| _CanLogRequiredKeyIoException = false;
|
| - AnalysisEngine.instance.logger.logError(
|
| - "Canonical failed: $pkgDir",
|
| + AnalysisEngine.instance.logger.logError("Canonical failed: $pkgDir",
|
| new CaughtException(exception, stackTrace));
|
| }
|
| }
|
| - return new JavaFile.relative(
|
| - pkgDir,
|
| - relPath.replaceAll('/', new String.fromCharCode(JavaFile.separatorChar)));
|
| + return new JavaFile.relative(pkgDir, relPath.replaceAll(
|
| + '/', new String.fromCharCode(JavaFile.separatorChar)));
|
| }
|
|
|
| @override
|
| @@ -445,8 +441,7 @@ class PackageUriResolver extends UriResolver {
|
| }
|
| }
|
| return new FileBasedSource.con2(
|
| - uri,
|
| - getCanonicalFile(_packagesDirectories[0], pkgName, relPath));
|
| + uri, getCanonicalFile(_packagesDirectories[0], pkgName, relPath));
|
| }
|
|
|
| @override
|
| @@ -463,8 +458,7 @@ class PackageUriResolver extends UriResolver {
|
| return parseUriWithException(
|
| "$PACKAGE_SCHEME:${pkgFolder.getName()}$relPath");
|
| }
|
| - } catch (e) {
|
| - }
|
| + } catch (e) {}
|
| }
|
| }
|
| }
|
|
|