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

Unified Diff: pkg/analyzer_cli/lib/src/analyzer_impl.dart

Issue 2657903006: Implement using AnalysisDriver in analyzer_cli. Disabled. (Closed)
Patch Set: 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 | « pkg/analyzer/lib/src/dart/analysis/driver.dart ('k') | pkg/analyzer_cli/lib/src/driver.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer_cli/lib/src/analyzer_impl.dart
diff --git a/pkg/analyzer_cli/lib/src/analyzer_impl.dart b/pkg/analyzer_cli/lib/src/analyzer_impl.dart
index 22654ef5621b016c012f46d8e1ec994529fbf086..186ed823c6c0dbcfc148149a5fd5df9e1a54256f 100644
--- a/pkg/analyzer_cli/lib/src/analyzer_impl.dart
+++ b/pkg/analyzer_cli/lib/src/analyzer_impl.dart
@@ -12,8 +12,9 @@ import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/error/error.dart';
import 'package:analyzer/exception/exception.dart';
import 'package:analyzer/source/error_processor.dart';
+import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/error/codes.dart';
-import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/generated/engine.dart' hide AnalysisResult;
import 'package:analyzer/src/generated/java_io.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/generated/source_io.dart';
@@ -40,6 +41,7 @@ class AnalyzerImpl {
final AnalysisOptions analysisOptions;
final AnalysisContext context;
+ final AnalysisDriver analysisDriver;
/// Accumulated analysis statistics.
final AnalysisStats stats;
@@ -63,8 +65,8 @@ class AnalyzerImpl {
/// specified the "--package-warnings" option.
String _selfPackageName;
- AnalyzerImpl(this.analysisOptions, this.context, this.librarySource,
- this.options, this.stats, this.startTime);
+ AnalyzerImpl(this.analysisOptions, this.context, this.analysisDriver,
+ this.librarySource, this.options, this.stats, this.startTime);
/// Returns the maximal [ErrorSeverity] of the recorded errors.
ErrorSeverity get maxErrorSeverity {
@@ -128,8 +130,15 @@ class AnalyzerImpl {
PerformanceTag previous = _prepareErrorsTag.makeCurrent();
try {
for (Source source in sources) {
- context.computeErrors(source);
- errorInfos.add(context.getErrors(source));
+ if (analysisDriver != null) {
+ String path = source.fullName;
+ AnalysisResult analysisResult = await analysisDriver.getResult(path);
+ errorInfos.add(new AnalysisErrorInfoImpl(
+ analysisResult.errors, analysisResult.lineInfo));
+ } else {
+ context.computeErrors(source);
+ errorInfos.add(context.getErrors(source));
+ }
}
} finally {
previous.makeCurrent();
@@ -161,6 +170,7 @@ class AnalyzerImpl {
"${librarySource.fullName} is a part and can not be analyzed.");
return ErrorSeverity.ERROR;
}
+
LibraryElement libraryElement = await _resolveLibrary();
prepareSources(libraryElement);
await prepareErrors();
@@ -249,7 +259,14 @@ class AnalyzerImpl {
Future<LibraryElement> _resolveLibrary() async {
PerformanceTag previous = _resolveLibraryTag.makeCurrent();
try {
- return context.computeLibraryElement(librarySource);
+ if (analysisDriver != null) {
+ String path = librarySource.fullName;
+ analysisDriver.priorityFiles = [path];
+ AnalysisResult analysisResult = await analysisDriver.getResult(path);
+ return analysisResult.unit.element.library;
+ } else {
+ return context.computeLibraryElement(librarySource);
+ }
} finally {
previous.makeCurrent();
}
« no previous file with comments | « pkg/analyzer/lib/src/dart/analysis/driver.dart ('k') | pkg/analyzer_cli/lib/src/driver.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698