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

Unified Diff: pkg/analyzer2dart/lib/src/driver.dart

Issue 526823002: Use ResourceProvider instead of specialized setRealRoot/setFakeRoot. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 4 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/analyzer2dart/bin/analyzer2dart.dart ('k') | pkg/analyzer2dart/test/driver_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer2dart/lib/src/driver.dart
diff --git a/pkg/analyzer2dart/lib/src/driver.dart b/pkg/analyzer2dart/lib/src/driver.dart
index 27488138357b9da9c8a7428cb443a06d2977ea6e..ea00e06be08a7428567a648985ca5ac93bc99659 100644
--- a/pkg/analyzer2dart/lib/src/driver.dart
+++ b/pkg/analyzer2dart/lib/src/driver.dart
@@ -4,9 +4,9 @@
library analyzer2dart.driver;
+import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/generated/element.dart';
import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/java_io.dart';
import 'package:analyzer/src/generated/sdk.dart';
import 'package:analyzer/src/generated/source_io.dart';
@@ -17,9 +17,11 @@ import 'tree_shaker.dart';
* Top level driver for Analyzer2Dart.
*/
class Driver {
- AnalysisContext context;
+ final ResourceProvider resourceProvider;
+ final AnalysisContext context;
- Driver(DartSdk sdk) : context = AnalysisEngine.instance.createAnalysisContext() {
+ Driver(this.resourceProvider, DartSdk sdk)
+ : context = AnalysisEngine.instance.createAnalysisContext() {
// Set up the source factory.
// TODO(paulberry): do we want to use ExplicitPackageUriResolver?
List<UriResolver> uriResolvers = [
@@ -58,29 +60,14 @@ class Driver {
* Add the given file as the root of analysis, and return the corresponding
* source.
*/
- Source setRealRoot(String path) {
- // Tell the analysis server about the root
+ Source setRoot(String path) {
+ File file = resourceProvider.getResource(path);
+ Source source = file.createSource();
+ // add the Source
ChangeSet changeSet = new ChangeSet();
- JavaFile javaFile = new JavaFile(path);
- Source source = new FileBasedSource.con1(javaFile);
changeSet.addedSource(source);
context.applyChanges(changeSet);
- return source;
- }
-
- /**
- * Add the given file contents as the root of analysis. For unit testing.
- */
- Source setFakeRoot(String contents) {
- String path = 'root.dart';
- // Tell the analysis server about the root
- ChangeSet changeSet = new ChangeSet();
- JavaFile javaFile = new JavaFile(path);
- Source source = new FileBasedSource.con1(javaFile);
- changeSet.addedSource(source);
- changeSet.changedContent(source, contents);
- context.applyChanges(changeSet);
+ // return the Source
return source;
}
}
-
« no previous file with comments | « pkg/analyzer2dart/bin/analyzer2dart.dart ('k') | pkg/analyzer2dart/test/driver_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698