dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Quick fix for analyzer_experimental field/pproperties problem.

Browse Source 
TBR

R=danrubel@google.com
BUG=

Review URL: https://codereview.chromium.org//25123003

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@28027 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
scheglov@google.com
2013-09-27 21:34:49 +00:00
parent db2516d7c2
commit 681ad9549e
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/analyzer_experimental/lib/src/generated/engine.dart
+8 -8
View File
@@ -4107,7 +4107,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
*/
DartEntry recordGenerateDartHintsTask(GenerateDartHintsTask task) {
Source librarySource = task.libraryElement.source;
AnalysisException thrownException = task.exception;
AnalysisException thrownException = task.thrownException;
DartEntry libraryEntry = null;
Map<Source, TimestampedData<List<AnalysisError>>> hintMap = task.hintMap;
if (hintMap == null) {
@@ -4191,7 +4191,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
*/
DartEntry recordParseDartTaskResults(ParseDartTask task) {
Source source = task.source;
AnalysisException thrownException = task.exception;
AnalysisException thrownException = task.thrownException;
DartEntry dartEntry = null;
{
SourceEntry sourceEntry = _cache.get(source);
@@ -4258,7 +4258,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
*/
HtmlEntry recordParseHtmlTaskResults(ParseHtmlTask task) {
Source source = task.source;
AnalysisException thrownException = task.exception;
AnalysisException thrownException = task.thrownException;
HtmlEntry htmlEntry = null;
{
SourceEntry sourceEntry = _cache.get(source);
@@ -4332,7 +4332,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
*/
DartEntry recordResolveDartLibraryTaskResults(ResolveDartLibraryTask task) {
LibraryResolver resolver = task.libraryResolver;
AnalysisException thrownException = task.exception;
AnalysisException thrownException = task.thrownException;
DartEntry unitEntry = null;
Source unitSource = task.unitSource;
if (resolver != null) {
@@ -4424,7 +4424,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
SourceEntry recordResolveDartUnitTaskResults(ResolveDartUnitTask task) {
Source unitSource = task.source;
Source librarySource = task.librarySource;
AnalysisException thrownException = task.exception;
AnalysisException thrownException = task.thrownException;
DartEntry dartEntry = null;
{
SourceEntry sourceEntry = _cache.get(unitSource);
@@ -4482,7 +4482,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
*/
SourceEntry recordResolveHtmlTaskResults(ResolveHtmlTask task) {
Source source = task.source;
AnalysisException thrownException = task.exception;
AnalysisException thrownException = task.thrownException;
HtmlEntry htmlEntry = null;
{
SourceEntry sourceEntry = _cache.get(source);
@@ -5932,7 +5932,7 @@ abstract class AnalysisTask {
* The exception that was thrown while performing this task, or `null` if the task completed
* successfully.
*/
AnalysisException exception;
AnalysisException thrownException;
/**
* Initialize a newly created task to perform analysis within the given context.
@@ -5963,7 +5963,7 @@ abstract class AnalysisTask {
try {
safelyPerform();
} on AnalysisException catch (exception) {
exception = exception;
thrownException = exception;
AnalysisEngine.instance.logger.logInformation2("Task failed: ${taskDescription}", exception);
}
return accept(visitor);
pkg/analyzer_experimental/lib/src/generated/resolver.dart
+4 -4
View File
@@ -10979,7 +10979,7 @@ class LibraryImportScope extends Scope {
if (enclosingLibrary != null) {
libName2 = enclosingLibrary.definingCompilationUnit.displayName;
}
_errorListener.onError(new AnalysisError.con2(source, identifier.offset, identifier.length, StaticWarningCode.AMBIGUOUS_IMPORT, [foundEltName, libName1, libName2]));
_errorListener.onError(new AnalysisError.con2(source2, identifier.offset, identifier.length, StaticWarningCode.AMBIGUOUS_IMPORT, [foundEltName, libName1, libName2]));
return foundElement;
}
if (foundElement != null) {
@@ -11057,7 +11057,7 @@ class LibraryScope extends EnclosedScope {
offset = accessor.variable.nameOffset;
}
}
return new AnalysisError.con2(source, offset, duplicate.displayName.length, CompileTimeErrorCode.PREFIX_COLLIDES_WITH_TOP_LEVEL_MEMBER, [existing.displayName]);
return new AnalysisError.con2(source2, offset, duplicate.displayName.length, CompileTimeErrorCode.PREFIX_COLLIDES_WITH_TOP_LEVEL_MEMBER, [existing.displayName]);
}
return super.getErrorForDuplicate(existing, duplicate);
}
@@ -11477,7 +11477,7 @@ abstract class Scope {
AnalysisError getErrorForDuplicate(Element existing, Element duplicate) {
Source source = duplicate.source;
if (source == null) {
source = source;
source = source2;
}
return new AnalysisError.con2(source, duplicate.nameOffset, duplicate.displayName.length, CompileTimeErrorCode.DUPLICATE_DEFINITION, [existing.displayName]);
}
@@ -11495,7 +11495,7 @@ abstract class Scope {
*
* @return the source object with which errors should be associated
*/
Source get source => definingLibrary.definingCompilationUnit.source;
Source get source2 => definingLibrary.definingCompilationUnit.source;
/**
* Return the element with which the given name is associated, or `null` if the name is not