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

Unified Diff: pkg/analyzer/lib/src/context/builder.dart

Issue 2651613003: Added support for GN workspaces. (Closed)
Patch Set: Tests Created 3 years, 11 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/gn.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/context/builder.dart
diff --git a/pkg/analyzer/lib/src/context/builder.dart b/pkg/analyzer/lib/src/context/builder.dart
index aad53cfdde47479da00382605de164cd7c689fcc..b308352e723db7c9e34ae3b682162ddf8fa2593d 100644
--- a/pkg/analyzer/lib/src/context/builder.dart
+++ b/pkg/analyzer/lib/src/context/builder.dart
@@ -17,6 +17,7 @@ import 'package:analyzer/src/command_line/arguments.dart'
import 'package:analyzer/src/dart/sdk/sdk.dart';
import 'package:analyzer/src/generated/bazel.dart';
import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/generated/gn.dart';
import 'package:analyzer/src/generated/sdk.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/summary/package_bundle_reader.dart';
@@ -208,6 +209,17 @@ class ContextBuilder {
return new SourceFactory(resolvers, null, resourceProvider);
}
+ GnWorkspace gnWorkspace = GnWorkspace.find(resourceProvider, rootPath);
+ if (gnWorkspace != null) {
+ DartSdk sdk = findSdk(gnWorkspace.packageMap, options);
+ List<UriResolver> resolvers = <UriResolver>[
+ new DartUriResolver(sdk),
+ new GnPackageUriResolver(gnWorkspace),
+ new GnFileUriResolver(gnWorkspace)
+ ];
+ return new SourceFactory(resolvers, null, resourceProvider);
+ }
+
Packages packages = createPackageMap(rootPath);
Map<String, List<Folder>> packageMap = convertPackagesToMap(packages);
List<UriResolver> resolvers = <UriResolver>[
« no previous file with comments | « no previous file | pkg/analyzer/lib/src/generated/gn.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698