anchor.diff:    }
   
     void test_parseGetter_nonStatic() {
  -    Comment comment = astFactory.documentationComment(new List<Token>(0));
  -    TypeName returnType =
  -        astFactory.typeName(astFactory.simpleIdentifier(null), null);
  -    createParser('get a;');
  -    MethodDeclaration method =
  -        parser.parseGetter(commentAndMetadata(comment), null, null, returnType);
  +    createParser('/// Doc\nT get a;');
  +    MethodDeclaration method = parser.parseClassMember('C');
       expectNotNullIfNoErrors(method);
       listener.assertNoErrors();
       expect(method.body, isNotNull);
  -    expect(method.documentationComment, comment);
  +    _expectCommentText(method.documentationComment, '/// Doc');
       expect(method.externalKeyword, isNull);
       expect(method.modifierKeyword, isNull);
       expect(method.name, isNotNull);
       expect(method.operatorKeyword, isNull);
       expect(method.parameters, isNull);
       expect(method.propertyKeyword, isNotNull);
  -    expect(method.returnType, returnType);
  +    expect((method.returnType as TypeName).name.name, 'T');
     }
   
     void test_parseGetter_static() {
  -    Comment comment = astFactory.documentationComment(new List<Token>(0));
  -    Token staticKeyword = TokenFactory.tokenFromKeyword(Keyword.STATIC);
  -    TypeName returnType =
  -        astFactory.typeName(astFactory.simpleIdentifier(null), null);
  -    createParser('get a => 42;');
  -    MethodDeclaration method = parser.parseGetter(
  -        commentAndMetadata(comment), null, staticKeyword, returnType);
  +    createParser('/// Doc\nstatic T get a => 42;');
  +    MethodDeclaration method = parser.parseClassMember('C');
       expectNotNullIfNoErrors(method);
       listener.assertNoErrors();
       expect(method.body, isNotNull);
  -    expect(method.documentationComment, comment);
  +    _expectCommentText(method.documentationComment, '/// Doc');
       expect(method.externalKeyword, isNull);
  -    expect(method.modifierKeyword, staticKeyword);
  +    expect(method.modifierKeyword.lexeme, 'static');
       expect(method.name, isNotNull);
       expect(method.operatorKeyword, isNull);
       expect(method.typeParameters, isNull);
       expect(method.parameters, isNull);
       expect(method.propertyKeyword, isNotNull);
  -    expect(method.returnType, returnType);
  +    expect((method.returnType as TypeName).name.name, 'T');
     }
   
     void test_parseIdentifierList_multiple() {
  
positive.code:   }
  
    void test_parseFunctionDeclaration_setter() {
      Comment comment = astFactory.documentationComment(new List<Token>(0));
      TypeName returnType =
          astFactory.typeName(astFactory.simpleIdentifier(null), null);
      createParser('set p(v) {}');
      FunctionDeclaration declaration = parser.parseFunctionDeclaration(
          commentAndMetadata(comment), null, returnType);
      expectNotNullIfNoErrors(declaration);
      listener.assertNoErrors();
      expect(declaration.documentationComment, comment);
      expect(declaration.returnType, returnType);
      expect(declaration.name, isNotNull);
      FunctionExpression expression = declaration.functionExpression;
      expect(expression, isNotNull);
  
negative.code:     expect(method.typeParameters, isNull);
      expect(method.parameters, isNotNull);
      expect(method.propertyKeyword, isNotNull);
      expect((method.returnType as TypeName).name.name, 'T');
    }
  
    void test_parseSetter_static() {
      createParser('/// Doc\nstatic T set a(var x) {}');
      MethodDeclaration method = parser.parseClassMember('C');
      expectNotNullIfNoErrors(method);
      listener.assertNoErrors();
      expect(method.body, isNotNull);
      _expectCommentText(method.documentationComment, '/// Doc');
      expect(method.externalKeyword, isNull);
      expect(method.modifierKeyword.lexeme, 'static');
      expect(method.name, isNotNull);
      expect(method.operatorKeyword, isNull);
      expect(method.typeParameters, isNull);
      expect(method.parameters, isNotNull);
      expect(method.propertyKeyword, isNotNull);
      expect((method.returnType as TypeName).name.name, 'T');
    }
  
    void test_parseShiftExpression_normal() {
  