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

Unified Diff: pkg/analyzer/lib/src/generated/gn.dart

Issue 2933753002: Run the sorter to reduce code churn (Closed)
Patch Set: Created 3 years, 6 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 | « pkg/analyzer/lib/src/dart/scanner/scanner.dart ('k') | pkg/analyzer/lib/src/generated/resolver.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/generated/gn.dart
diff --git a/pkg/analyzer/lib/src/generated/gn.dart b/pkg/analyzer/lib/src/generated/gn.dart
index 126f2cfba646db8e68c0117a59d1885afeb37815..fd6ce42e5f60fc33a2a5659b053211e585a48c0f 100644
--- a/pkg/analyzer/lib/src/generated/gn.dart
+++ b/pkg/analyzer/lib/src/generated/gn.dart
@@ -65,6 +65,36 @@ class GnWorkspace extends Workspace {
Packages get packages => _packages ??= _createPackages();
+ @override
+ UriResolver get packageUriResolver =>
+ new PackageMapUriResolver(provider, packageMap);
+
+ @override
+ SourceFactory createSourceFactory(DartSdk sdk) {
+ List<UriResolver> resolvers = <UriResolver>[];
+ if (sdk != null) {
+ resolvers.add(new DartUriResolver(sdk));
+ }
+ resolvers.add(packageUriResolver);
+ resolvers.add(new ResourceUriResolver(provider));
+ return new SourceFactory(resolvers, packages, provider);
+ }
+
+ /**
+ * Return the file with the given [absolutePath].
+ *
+ * Return `null` if the given [absolutePath] is not in the workspace [root].
+ */
+ File findFile(String absolutePath) {
+ try {
+ File writableFile = provider.getFile(absolutePath);
+ if (writableFile.exists) {
+ return writableFile;
+ }
+ } catch (_) {}
+ return null;
+ }
+
/**
* Creates an alternate representation for available packages.
*/
@@ -122,34 +152,45 @@ class GnWorkspace extends Workspace {
}
}
- @override
- UriResolver get packageUriResolver =>
- new PackageMapUriResolver(provider, packageMap);
-
- @override
- SourceFactory createSourceFactory(DartSdk sdk) {
- List<UriResolver> resolvers = <UriResolver>[];
- if (sdk != null) {
- resolvers.add(new DartUriResolver(sdk));
- }
- resolvers.add(packageUriResolver);
- resolvers.add(new ResourceUriResolver(provider));
- return new SourceFactory(resolvers, packages, provider);
- }
-
/**
- * Return the file with the given [absolutePath].
+ * Find the GN workspace that contains the given [path].
*
- * Return `null` if the given [absolutePath] is not in the workspace [root].
+ * Return `null` if a workspace could not be found.
*/
- File findFile(String absolutePath) {
- try {
- File writableFile = provider.getFile(absolutePath);
- if (writableFile.exists) {
- return writableFile;
+ static GnWorkspace find(ResourceProvider provider, String path) {
+ Context context = provider.pathContext;
+
+ // Ensure that the path is absolute and normalized.
+ if (!context.isAbsolute(path)) {
+ throw new ArgumentError('Not an absolute path: $path');
+ }
+ path = context.normalize(path);
+
+ Folder folder = provider.getFolder(path);
+ while (true) {
+ Folder parent = folder.parent;
+ if (parent == null) {
+ return null;
}
- } catch (_) {}
- return null;
+
+ // Found the .jiri_root file, must be a non-git workspace.
+ if (folder.getChildAssumingFolder(_jiriRootName).exists) {
+ String root = folder.path;
+ List<String> packagesFiles =
+ _findPackagesFile(provider, root, path, forHost: false);
+ if (packagesFiles.isEmpty) {
+ packagesFiles =
+ _findPackagesFile(provider, root, path, forHost: true);
+ }
+ if (packagesFiles.isEmpty) {
+ return null;
+ }
+ return new GnWorkspace._(provider, path, packagesFiles);
+ }
+
+ // Go up the folder.
+ folder = parent;
+ }
}
/**
@@ -207,45 +248,4 @@ class GnWorkspace extends Workspace {
.map((File file) => file.path)
.toList();
}
-
- /**
- * Find the GN workspace that contains the given [path].
- *
- * Return `null` if a workspace could not be found.
- */
- static GnWorkspace find(ResourceProvider provider, String path) {
- Context context = provider.pathContext;
-
- // Ensure that the path is absolute and normalized.
- if (!context.isAbsolute(path)) {
- throw new ArgumentError('Not an absolute path: $path');
- }
- path = context.normalize(path);
-
- Folder folder = provider.getFolder(path);
- while (true) {
- Folder parent = folder.parent;
- if (parent == null) {
- return null;
- }
-
- // Found the .jiri_root file, must be a non-git workspace.
- if (folder.getChildAssumingFolder(_jiriRootName).exists) {
- String root = folder.path;
- List<String> packagesFiles =
- _findPackagesFile(provider, root, path, forHost: false);
- if (packagesFiles.isEmpty) {
- packagesFiles =
- _findPackagesFile(provider, root, path, forHost: true);
- }
- if (packagesFiles.isEmpty) {
- return null;
- }
- return new GnWorkspace._(provider, path, packagesFiles);
- }
-
- // Go up the folder.
- folder = parent;
- }
- }
}
« no previous file with comments | « pkg/analyzer/lib/src/dart/scanner/scanner.dart ('k') | pkg/analyzer/lib/src/generated/resolver.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698