Index: pkg/analyzer/lib/src/generated/element.dart |
diff --git a/pkg/analyzer/lib/src/generated/element.dart b/pkg/analyzer/lib/src/generated/element.dart |
index 6c6040ddcbc7cb4a069e031c8f23cdb7a9fbd555..b9fec42a110be7e1f9718c572345c08e39d7d6c8 100644 |
--- a/pkg/analyzer/lib/src/generated/element.dart |
+++ b/pkg/analyzer/lib/src/generated/element.dart |
@@ -4144,9 +4144,6 @@ class FieldElementImpl extends PropertyInducingElementImpl |
enclosingElement != null ? enclosingElement.isEnum : false; |
@override |
- bool get isStatic => hasModifier(Modifier.STATIC); |
- |
- @override |
ElementKind get kind => ElementKind.FIELD; |
/** |
@@ -4261,9 +4258,6 @@ class FieldMember extends VariableMember implements FieldElement { |
bool get isEnumConstant => baseElement.isEnumConstant; |
@override |
- bool get isStatic => baseElement.isStatic; |
- |
- @override |
DartType get propagatedType => substituteFor(baseElement.propagatedType); |
@override |
@@ -9532,13 +9526,6 @@ abstract class PropertyInducingElement implements VariableElement { |
PropertyAccessorElement get getter; |
/** |
- * Return `true` if this element is a static element. A static element is an |
- * element that is not associated with a particular instance, but rather with |
- * an entire library or class. |
- */ |
- bool get isStatic; |
- |
- /** |
* Return the propagated type of this variable, or `null` if type propagation |
* has not been performed, for example because the variable is not final. |
*/ |
@@ -10537,6 +10524,13 @@ abstract class VariableElement implements Element, ConstantEvaluationTarget { |
bool get isPotentiallyMutatedInScope; |
/** |
+ * Return `true` if this element is a static element. A static element is an |
+ * element that is not associated with a particular instance, but rather with |
+ * an entire library or class. |
Paul Berry
2015/08/27 18:56:07
Since our notion of what "isStatic" means differs
Brian Wilkerson
2015/08/27 20:43:54
I inserted the rest of the quote from the DLS (wit
Paul Berry
2015/08/27 21:23:14
Wow, I didn't realize the language spec actually d
|
+ */ |
+ bool get isStatic; |
+ |
+ /** |
* Return the declared type of this variable, or `null` if the variable did |
* not have a declared type (such as if it was declared using the keyword |
* 'var'). |
@@ -10645,6 +10639,9 @@ abstract class VariableElementImpl extends ElementImpl |
bool get isPotentiallyMutatedInScope => false; |
@override |
+ bool get isStatic => hasModifier(Modifier.STATIC); |
+ |
+ @override |
void appendTo(StringBuffer buffer) { |
buffer.write(type); |
buffer.write(" "); |
@@ -10701,6 +10698,9 @@ abstract class VariableMember extends Member implements VariableElement { |
baseElement.isPotentiallyMutatedInScope; |
@override |
+ bool get isStatic => baseElement.isStatic; |
+ |
+ @override |
DartType get type => substituteFor(baseElement.type); |
@override |