Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Unified Diff: pkg/analyzer/lib/source/sdk_ext.dart

Issue 1230273002: Analyzer code cleanup. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/analyzer/lib/src/generated/incremental_resolver.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/source/sdk_ext.dart
diff --git a/pkg/analyzer/lib/source/sdk_ext.dart b/pkg/analyzer/lib/source/sdk_ext.dart
index e5dc32bb87ec911d63461a3a1dbc1b4133268259..696e181998c719f4b22b7531cad4006083200977 100644
--- a/pkg/analyzer/lib/source/sdk_ext.dart
+++ b/pkg/analyzer/lib/source/sdk_ext.dart
@@ -4,15 +4,12 @@
library source.sdk_ext;
-import 'dart:async';
-import 'dart:collection';
import 'dart:convert';
import 'dart:core' hide Resource;
import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/source/package_map_resolver.dart';
-import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/generated/java_io.dart' show JavaFile;
+import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/generated/source_io.dart' show FileBasedSource;
import 'package:path/path.dart' as pathos;
@@ -41,58 +38,16 @@ class SdkExtUriResolver extends UriResolver {
packageMap.forEach(_processPackage);
}
- /// Programmatically add a new SDK extension given a JSON description
- /// ([sdkExtJSON]) and a lib directory ([libDir]).
- void addSdkExt(String sdkExtJSON, Folder libDir) {
- _processSdkExt(sdkExtJSON, libDir);
- }
-
- /// Return the path mapping for [libName] or null if there is none.
- String operator[](String libName) => _urlMappings[libName];
-
/// Number of sdk extensions.
int get length => _urlMappings.length;
- /// Resolve a 'part' statement inside an sdk extension.
- Source _resolvePart(Uri libraryEntry, String partPath, Uri importUri) {
- // Library part.
- var directory = pathos.dirname(libraryEntry.path);
- var partUri = new Uri.file(pathos.join(directory, partPath));
- assert(partUri.isAbsolute);
- JavaFile javaFile = new JavaFile.fromUri(partUri);
- return new FileBasedSource(javaFile, importUri);
- }
-
- /// Resolve an import of an sdk extension.
- Source _resolveEntry(Uri libraryEntry, Uri importUri) {
- // Library entry.
- JavaFile javaFile = new JavaFile.fromUri(libraryEntry);
- return new FileBasedSource(javaFile, importUri);
- }
-
- /// Return the library name of [importUri].
- String _libraryName(Uri importUri) {
- var uri = importUri.toString();
- int index = uri.indexOf('/');
- if (index >= 0) {
- return uri.substring(0, index);
- }
- return uri;
- }
-
- /// Return the part path of [importUri].
- String _partPath(Uri importUri) {
- var uri = importUri.toString();
- int index = uri.indexOf('/');
- if (index >= 0) {
- return uri.substring(index + 1);
- }
- return null;
- }
+ /// Return the path mapping for [libName] or null if there is none.
+ String operator[](String libName) => _urlMappings[libName];
- /// Returns true if [libraryName] is a registered sdk extension.
- bool _registeredSdkExtension(String libraryName) {
- return _urlMappings[libraryName] != null;
+ /// Programmatically add a new SDK extension given a JSON description
+ /// ([sdkExtJSON]) and a lib directory ([libDir]).
+ void addSdkExt(String sdkExtJSON, Folder libDir) {
+ _processSdkExt(sdkExtJSON, libDir);
}
@override
@@ -128,6 +83,26 @@ class SdkExtUriResolver extends UriResolver {
return null;
}
+ /// Return the library name of [importUri].
+ String _libraryName(Uri importUri) {
+ var uri = importUri.toString();
+ int index = uri.indexOf('/');
+ if (index >= 0) {
+ return uri.substring(0, index);
+ }
+ return uri;
+ }
+
+ /// Return the part path of [importUri].
+ String _partPath(Uri importUri) {
+ var uri = importUri.toString();
+ int index = uri.indexOf('/');
+ if (index >= 0) {
+ return uri.substring(index + 1);
+ }
+ return null;
+ }
+
/// Given a package [name] and a list of folders ([libDirs]),
/// add any found sdk extensions.
void _processPackage(String name, List<Folder> libDirs) {
@@ -139,18 +114,6 @@ class SdkExtUriResolver extends UriResolver {
}
}
- /// Read the contents of [libDir]/[SDK_EXT_NAME] as a string.
- /// Returns null if the file doesn't exist.
- String _readDotSdkExt(Folder libDir) {
- var file = libDir.getChild(SDK_EXT_NAME);
- try {
- return file.readAsStringSync();
- } on FileSystemException catch (e) {
- // File can't be read.
- return null;
- }
- }
-
/// Given the JSON for an SDK extension ([sdkExtJSON]) and a folder
/// ([libDir]), setup the uri mapping.
void _processSdkExt(String sdkExtJSON, Folder libDir) {
@@ -176,4 +139,38 @@ class SdkExtUriResolver extends UriResolver {
var value = libDir.canonicalizePath(file);
_urlMappings[key] = value;
}
+
+ /// Read the contents of [libDir]/[SDK_EXT_NAME] as a string.
+ /// Returns null if the file doesn't exist.
+ String _readDotSdkExt(Folder libDir) {
+ var file = libDir.getChild(SDK_EXT_NAME);
+ try {
+ return file.readAsStringSync();
+ } on FileSystemException {
+ // File can't be read.
+ return null;
+ }
+ }
+
+ /// Returns true if [libraryName] is a registered sdk extension.
+ bool _registeredSdkExtension(String libraryName) {
+ return _urlMappings[libraryName] != null;
+ }
+
+ /// Resolve an import of an sdk extension.
+ Source _resolveEntry(Uri libraryEntry, Uri importUri) {
+ // Library entry.
+ JavaFile javaFile = new JavaFile.fromUri(libraryEntry);
+ return new FileBasedSource(javaFile, importUri);
+ }
+
+ /// Resolve a 'part' statement inside an sdk extension.
+ Source _resolvePart(Uri libraryEntry, String partPath, Uri importUri) {
+ // Library part.
+ var directory = pathos.dirname(libraryEntry.path);
+ var partUri = new Uri.file(pathos.join(directory, partPath));
+ assert(partUri.isAbsolute);
+ JavaFile javaFile = new JavaFile.fromUri(partUri);
+ return new FileBasedSource(javaFile, importUri);
+ }
}
« no previous file with comments | « no previous file | pkg/analyzer/lib/src/generated/incremental_resolver.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698