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

Side by Side Diff: pkg/analyzer_experimental/lib/src/generated/resolver.dart

Issue 25123003: Quick fix for analyzer_experimental field/pproperties problem. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « pkg/analyzer_experimental/lib/src/generated/engine.dart ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // This code was auto-generated, is not intended to be edited, and is subject to 1 // This code was auto-generated, is not intended to be edited, and is subject to
2 // significant change. Please see the README file for more information. 2 // significant change. Please see the README file for more information.
3 library engine.resolver; 3 library engine.resolver;
4 import 'dart:collection'; 4 import 'dart:collection';
5 import 'java_core.dart'; 5 import 'java_core.dart';
6 import 'java_engine.dart'; 6 import 'java_engine.dart';
7 import 'instrumentation.dart'; 7 import 'instrumentation.dart';
8 import 'source.dart'; 8 import 'source.dart';
9 import 'error.dart'; 9 import 'error.dart';
10 import 'scanner.dart' as sc; 10 import 'scanner.dart' as sc;
(...skipping 10961 matching lines...) Expand 10 before | Expand all | Expand 10 after
10972 String libName1 = "", libName2 = ""; 10972 String libName1 = "", libName2 = "";
10973 List<Element> conflictingMembers = ((foundElement as MultiplyDefinedElemen tImpl)).conflictingElements; 10973 List<Element> conflictingMembers = ((foundElement as MultiplyDefinedElemen tImpl)).conflictingElements;
10974 LibraryElement enclosingLibrary = conflictingMembers[0].getAncestor(Librar yElement); 10974 LibraryElement enclosingLibrary = conflictingMembers[0].getAncestor(Librar yElement);
10975 if (enclosingLibrary != null) { 10975 if (enclosingLibrary != null) {
10976 libName1 = enclosingLibrary.definingCompilationUnit.displayName; 10976 libName1 = enclosingLibrary.definingCompilationUnit.displayName;
10977 } 10977 }
10978 enclosingLibrary = conflictingMembers[1].getAncestor(LibraryElement); 10978 enclosingLibrary = conflictingMembers[1].getAncestor(LibraryElement);
10979 if (enclosingLibrary != null) { 10979 if (enclosingLibrary != null) {
10980 libName2 = enclosingLibrary.definingCompilationUnit.displayName; 10980 libName2 = enclosingLibrary.definingCompilationUnit.displayName;
10981 } 10981 }
10982 _errorListener.onError(new AnalysisError.con2(source, identifier.offset, i dentifier.length, StaticWarningCode.AMBIGUOUS_IMPORT, [foundEltName, libName1, l ibName2])); 10982 _errorListener.onError(new AnalysisError.con2(source2, identifier.offset, identifier.length, StaticWarningCode.AMBIGUOUS_IMPORT, [foundEltName, libName1, libName2]));
10983 return foundElement; 10983 return foundElement;
10984 } 10984 }
10985 if (foundElement != null) { 10985 if (foundElement != null) {
10986 defineWithoutChecking2(name, foundElement); 10986 defineWithoutChecking2(name, foundElement);
10987 } 10987 }
10988 return foundElement; 10988 return foundElement;
10989 } 10989 }
10990 10990
10991 /** 10991 /**
10992 * Create all of the namespaces associated with the libraries imported into th is library. The 10992 * Create all of the namespaces associated with the libraries imported into th is library. The
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
11050 } 11050 }
11051 AnalysisError getErrorForDuplicate(Element existing, Element duplicate) { 11051 AnalysisError getErrorForDuplicate(Element existing, Element duplicate) {
11052 if (existing is PrefixElement) { 11052 if (existing is PrefixElement) {
11053 int offset = duplicate.nameOffset; 11053 int offset = duplicate.nameOffset;
11054 if (duplicate is PropertyAccessorElement) { 11054 if (duplicate is PropertyAccessorElement) {
11055 PropertyAccessorElement accessor = duplicate as PropertyAccessorElement; 11055 PropertyAccessorElement accessor = duplicate as PropertyAccessorElement;
11056 if (accessor.isSynthetic) { 11056 if (accessor.isSynthetic) {
11057 offset = accessor.variable.nameOffset; 11057 offset = accessor.variable.nameOffset;
11058 } 11058 }
11059 } 11059 }
11060 return new AnalysisError.con2(source, offset, duplicate.displayName.length , CompileTimeErrorCode.PREFIX_COLLIDES_WITH_TOP_LEVEL_MEMBER, [existing.displayN ame]); 11060 return new AnalysisError.con2(source2, offset, duplicate.displayName.lengt h, CompileTimeErrorCode.PREFIX_COLLIDES_WITH_TOP_LEVEL_MEMBER, [existing.display Name]);
11061 } 11061 }
11062 return super.getErrorForDuplicate(existing, duplicate); 11062 return super.getErrorForDuplicate(existing, duplicate);
11063 } 11063 }
11064 11064
11065 /** 11065 /**
11066 * Add to this scope all of the public top-level names that are defined in the given compilation 11066 * Add to this scope all of the public top-level names that are defined in the given compilation
11067 * unit. 11067 * unit.
11068 * 11068 *
11069 * @param compilationUnit the compilation unit defining the top-level names to be added to this 11069 * @param compilationUnit the compilation unit defining the top-level names to be added to this
11070 * scope 11070 * scope
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
11470 * Return the error code to be used when reporting that a name being defined l ocally conflicts 11470 * Return the error code to be used when reporting that a name being defined l ocally conflicts
11471 * with another element of the same name in the local scope. 11471 * with another element of the same name in the local scope.
11472 * 11472 *
11473 * @param existing the first element to be declared with the conflicting name 11473 * @param existing the first element to be declared with the conflicting name
11474 * @param duplicate another element declared with the conflicting name 11474 * @param duplicate another element declared with the conflicting name
11475 * @return the error code used to report duplicate names within a scope 11475 * @return the error code used to report duplicate names within a scope
11476 */ 11476 */
11477 AnalysisError getErrorForDuplicate(Element existing, Element duplicate) { 11477 AnalysisError getErrorForDuplicate(Element existing, Element duplicate) {
11478 Source source = duplicate.source; 11478 Source source = duplicate.source;
11479 if (source == null) { 11479 if (source == null) {
11480 source = source; 11480 source = source2;
11481 } 11481 }
11482 return new AnalysisError.con2(source, duplicate.nameOffset, duplicate.displa yName.length, CompileTimeErrorCode.DUPLICATE_DEFINITION, [existing.displayName]) ; 11482 return new AnalysisError.con2(source, duplicate.nameOffset, duplicate.displa yName.length, CompileTimeErrorCode.DUPLICATE_DEFINITION, [existing.displayName]) ;
11483 } 11483 }
11484 11484
11485 /** 11485 /**
11486 * Return the listener that is to be informed when an error is encountered. 11486 * Return the listener that is to be informed when an error is encountered.
11487 * 11487 *
11488 * @return the listener that is to be informed when an error is encountered 11488 * @return the listener that is to be informed when an error is encountered
11489 */ 11489 */
11490 AnalysisErrorListener get errorListener; 11490 AnalysisErrorListener get errorListener;
11491 11491
11492 /** 11492 /**
11493 * Return the source object representing the compilation unit with which error s related to this 11493 * Return the source object representing the compilation unit with which error s related to this
11494 * scope should be associated. 11494 * scope should be associated.
11495 * 11495 *
11496 * @return the source object with which errors should be associated 11496 * @return the source object with which errors should be associated
11497 */ 11497 */
11498 Source get source => definingLibrary.definingCompilationUnit.source; 11498 Source get source2 => definingLibrary.definingCompilationUnit.source;
11499 11499
11500 /** 11500 /**
11501 * Return the element with which the given name is associated, or `null` if th e name is not 11501 * Return the element with which the given name is associated, or `null` if th e name is not
11502 * defined within this scope. This method only returns elements that are direc tly defined within 11502 * defined within this scope. This method only returns elements that are direc tly defined within
11503 * this scope, not elements that are defined in an enclosing scope. 11503 * this scope, not elements that are defined in an enclosing scope.
11504 * 11504 *
11505 * @param name the name associated with the element to be returned 11505 * @param name the name associated with the element to be returned
11506 * @param referencingLibrary the library that contains the reference to the na me, used to 11506 * @param referencingLibrary the library that contains the reference to the na me, used to
11507 * implement library-level privacy 11507 * implement library-level privacy
11508 * @return the element with which the given name is associated 11508 * @return the element with which the given name is associated
(...skipping 4568 matching lines...) Expand 10 before | Expand all | Expand 10 after
16077 ResolverErrorCode.con2(String name, int ordinal, ErrorType type, String messag e, String correction) : super(name, ordinal) { 16077 ResolverErrorCode.con2(String name, int ordinal, ErrorType type, String messag e, String correction) : super(name, ordinal) {
16078 this._type = type; 16078 this._type = type;
16079 this._message = message; 16079 this._message = message;
16080 this.correction9 = correction; 16080 this.correction9 = correction;
16081 } 16081 }
16082 String get correction => correction9; 16082 String get correction => correction9;
16083 ErrorSeverity get errorSeverity => _type.severity; 16083 ErrorSeverity get errorSeverity => _type.severity;
16084 String get message => _message; 16084 String get message => _message;
16085 ErrorType get type => _type; 16085 ErrorType get type => _type;
16086 } 16086 }
OLDNEW
« no previous file with comments | « pkg/analyzer_experimental/lib/src/generated/engine.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698