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

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

Issue 987413003: Don't suppress error/warning output for package being analyzed. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 9 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/analyzer_impl.dart
diff --git a/pkg/analyzer/lib/src/analyzer_impl.dart b/pkg/analyzer/lib/src/analyzer_impl.dart
index a9f72a31a3f122b8b418ade5ae2f97ac8c22e92f..2897e8bd54b66ce0f9c13415918651c3834eb001 100644
--- a/pkg/analyzer/lib/src/analyzer_impl.dart
+++ b/pkg/analyzer/lib/src/analyzer_impl.dart
@@ -61,6 +61,15 @@ class AnalyzerImpl {
final HashMap<Source, AnalysisErrorInfo> sourceErrorsMap =
new HashMap<Source, AnalysisErrorInfo>();
+ /**
+ * If the file specified on the command line is part of a package, the name
+ * of that package. Otherwise `null`. This allows us to analyze the file
+ * specified on the command line as though it is reached via a "package:"
+ * URI, but avoid suppressing its output in the event that the user has not
+ * specified the "--package-warnings" option.
+ */
+ String _selfPackageName;
+
AnalyzerImpl(String sourcePath, this.options, this.startTime, this.isBatch)
: sourcePath = _normalizeSourcePath(sourcePath) {
if (sdk == null) {
@@ -101,7 +110,7 @@ class AnalyzerImpl {
{
UriKind uriKind = library.source.uriKind;
// Optionally skip package: libraries.
- if (!options.showPackageWarnings && uriKind == UriKind.PACKAGE_URI) {
+ if (!options.showPackageWarnings && _isOtherPackage(library.source.uri)) {
return;
}
// Optionally skip SDK libraries.
@@ -210,6 +219,11 @@ class AnalyzerImpl {
librarySource = computeLibrarySource();
+ Uri libraryUri = librarySource.uri;
+ if (libraryUri.scheme == 'package' && libraryUri.pathSegments.length > 0) {
+ _selfPackageName = libraryUri.pathSegments[0];
+ }
+
// Create and add a ChangeSet
ChangeSet changeSet = new ChangeSet();
changeSet.addedSource(librarySource);
@@ -295,7 +309,7 @@ class AnalyzerImpl {
}
return options.showSdkWarnings;
}
- if (source.uri.scheme == 'package') {
+ if (_isOtherPackage(source.uri)) {
return options.showPackageWarnings;
}
return true;
@@ -342,6 +356,22 @@ class AnalyzerImpl {
return true;
}
+ /**
+ * Determine whether the given URI refers to a package other than the package
+ * being analyzed.
+ */
+ bool _isOtherPackage(Uri uri) {
+ if (uri.scheme != 'package') {
+ return false;
+ }
+ if (_selfPackageName != null &&
+ uri.pathSegments.length > 0 &&
+ uri.pathSegments[0] == _selfPackageName) {
+ return false;
+ }
+ return true;
+ }
+
_printColdPerf() {
// print cold VM performance numbers
int totalTime = JavaSystem.currentTimeMillis() - startTime;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698