| Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/SimpleIdentifier.java
|
| diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/SimpleIdentifier.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/SimpleIdentifier.java
|
| index 7e3d639d6eaff30dc0b1d875f254abf518924452..3ad5a71e11f48817d0d42c0e6abdd3cf59b2b6f2 100644
|
| --- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/SimpleIdentifier.java
|
| +++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/SimpleIdentifier.java
|
| @@ -78,7 +78,10 @@ public class SimpleIdentifier extends Identifier {
|
| }
|
|
|
| @Override
|
| - public Element getElement() {
|
| + public Element getBestElement() {
|
| + if (propagatedElement == null) {
|
| + return staticElement;
|
| + }
|
| return propagatedElement;
|
| }
|
|
|
| @@ -93,6 +96,11 @@ public class SimpleIdentifier extends Identifier {
|
| }
|
|
|
| @Override
|
| + public Element getPropagatedElement() {
|
| + return propagatedElement;
|
| + }
|
| +
|
| + @Override
|
| public Element getStaticElement() {
|
| return staticElement;
|
| }
|
| @@ -237,7 +245,7 @@ public class SimpleIdentifier extends Identifier {
|
| *
|
| * @param element the element to be associated with this identifier
|
| */
|
| - public void setElement(Element element) {
|
| + public void setPropagatedElement(Element element) {
|
| propagatedElement = validateElement(element);
|
| }
|
|
|
|
|