Skip to content

remove calls to deprecated methods #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2015
Merged

remove calls to deprecated methods #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions lib/markdown_processor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,28 +110,29 @@ NodeList<CommentReference> _getCommentRefs(ModelElement modelElement) {
if (modelElement.documentation == null && modelElement.canOverride()) {
var melement = modelElement.overriddenElement;
if (melement != null &&
melement.element.node != null &&
melement.element.node is AnnotatedNode) {
var docComment =
(melement.element.node as AnnotatedNode).documentationComment;
melement.element.computeNode() != null &&
melement.element.computeNode() is AnnotatedNode) {
var docComment = (melement.element.computeNode() as AnnotatedNode)
.documentationComment;
if (docComment != null) return docComment.references;
return null;
}
}
if (modelElement.element.node is AnnotatedNode) {
if ((modelElement.element.node as AnnotatedNode).documentationComment !=
if (modelElement.element.computeNode() is AnnotatedNode) {
if ((modelElement.element.computeNode() as AnnotatedNode)
.documentationComment !=
null) {
return (modelElement.element.node as AnnotatedNode)
return (modelElement.element.computeNode() as AnnotatedNode)
.documentationComment
.references;
}
} else if (modelElement.element is LibraryElement) {
// handle anonymous libraries
if (modelElement.element.node == null ||
modelElement.element.node.parent == null) {
if (modelElement.element.computeNode() == null ||
modelElement.element.computeNode().parent == null) {
return null;
}
var node = modelElement.element.node.parent.parent;
var node = modelElement.element.computeNode().parent.parent;
if (node is AnnotatedNode) {
if ((node as AnnotatedNode).documentationComment != null) {
return (node as AnnotatedNode).documentationComment.references;
Expand Down
17 changes: 11 additions & 6 deletions lib/src/model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,11 @@ abstract class ModelElement implements Comparable {
List<String> get annotations {
// Check https://code.google.com/p/dart/issues/detail?id=23181
// If that is fixed, this code might get a lot easier
if (element.node != null && element.node is AnnotatedNode) {
return (element.node as AnnotatedNode).metadata.map((Annotation a) {
if (element.computeNode() != null &&
element.computeNode() is AnnotatedNode) {
return (element.computeNode() as AnnotatedNode)
.metadata
.map((Annotation a) {
var annotationString = a.toSource().substring(1); // remove the @
var e = a.element;
if (e != null && (e is ConstructorElement)) {
Expand Down Expand Up @@ -1244,7 +1247,7 @@ class Enum extends Class {
abstract class SourceCodeMixin {
String get sourceCode {
String contents = element.source.contents.data;
var node = element.node; // TODO: computeNode once we go to 0.25.2
var node = element.computeNode(); // TODO: computeNode once we go to 0.25.2
// find the start of the line, so that we can line up all the indents
int i = node.offset;
while (i > 0) {
Expand Down Expand Up @@ -1369,8 +1372,8 @@ class Field extends ModelElement {
String get constantValue {
if (_constantValue != null) return _constantValue;

if (_field.node == null) return null;
var v = _field.node.toSource();
if (_field.computeNode() == null) return null;
var v = _field.computeNode().toSource();
if (v == null) return null;
var string = v.substring(v.indexOf('=') + 1, v.length).trim();
_constantValue = string.replaceAll(modelType.name, modelType.linkedName);
Expand Down Expand Up @@ -1617,7 +1620,9 @@ class TopLevelVariable extends ModelElement {
}

String get constantValue {
var v = (_variable as ConstTopLevelVariableElementImpl).node.toSource();
var v = (_variable as ConstTopLevelVariableElementImpl)
.computeNode()
.toSource();
if (v == null) return '';
var string = v.substring(v.indexOf('=') + 1, v.length).trim();
return string.replaceAll(modelType.name, modelType.linkedName);
Expand Down