[SE-0096] Remove support for dynamicType member

Author: CodaFi

include/swift/AST/DiagnosticsParse.def

@@ -1114,8 +1114,6 @@ ERROR(expr_typeof_expected_expr,PointsToFirstBadToken,
       "expected an expression within 'type(of: ...)'", ())
 ERROR(expr_typeof_expected_rparen,PointsToFirstBadToken,
       "expected ')' to complete 'type(of: ...)' expression", ())
-WARNING(expr_dynamictype_deprecated,PointsToFirstBadToken,
-      "'.dynamicType' is deprecated. Use 'type(of: ...)' instead", ())
 
 //------------------------------------------------------------------------------
 // Attribute-parsing diagnostics

include/swift/Parse/Tokens.def

@@ -147,9 +147,6 @@ KEYWORD(__COLUMN__)
 KEYWORD(__FUNCTION__)
 KEYWORD(__DSO_HANDLE__)
 
-// FIXME(SE-0096): REMOVE ME
-KEYWORD(dynamicType)
-
 // Pattern keywords.
 KEYWORD(_)
 

lib/Parse/ParseExpr.cpp

@@ -1418,35 +1418,12 @@ ParserResult<Expr> Parser::parseExprPostfix(Diag<> ID, bool isExprBasic) {
         continue;
       }
 
-      // Handle "x.dynamicType" - A metatype expr.
-      // Deprecated in SE-0096: `x.dynamicType` becomes `type(of: x)`
-      //
-      // FIXME(SE-0096): This will go away along with the keyword soon.
-      if (Tok.is(tok::kw_dynamicType)) {
-        // Fix-it
-        auto range = Result.get()->getSourceRange();
-        auto dynamicTypeExprRange = SourceRange(TokLoc, consumeToken());
-        diagnose(TokLoc, diag::expr_dynamictype_deprecated)
-          .highlight(dynamicTypeExprRange)
-          .fixItReplace(dynamicTypeExprRange, ")")
-          .fixItInsert(range.Start, "type(of: ");
-
-        // HACK: Arbitrary.
-        auto loc = range.Start;
-        auto dt = new (Context) DynamicTypeExpr(loc, loc, Result.get(), loc, Type());
-        dt->setImplicit();
-        Result = makeParserResult(dt);
-        continue;
-      }
-
-
       // Handle "x.self" expr.
       if (Tok.is(tok::kw_self)) {
         Result = makeParserResult(
           new (Context) DotSelfExpr(Result.get(), TokLoc, consumeToken()));
         continue;
       }
-      
 
       // If we have '.<keyword><code_complete>', try to recover by creating
       // an identifier with the same spelling as the keyword.

lib/Parse/ParseType.cpp

@@ -78,7 +78,6 @@ ParserResult<TypeRepr> Parser::parseTypeSimple(Diag<> MessageID,
     consumeToken(tok::code_complete);
     return makeParserCodeCompletionResult<TypeRepr>();
   case tok::kw_super:
-  case tok::kw_dynamicType:
   case tok::kw_self:
     // These keywords don't start a decl or a statement, and thus should be
     // safe to skip over.

tools/swift-ide-test/KnownObjCMethods.def

@@ -88,7 +88,7 @@ CLASS_METHOD(NSObject, (0, "class"), Unavailable("use 'self' instead"))
 
 // NSObject protocol
 PROTOCOL_INSTANCE_METHOD(NSObject, (0, "class"),
-                         Unavailable("use 'dynamicType' instead"))
+                         Unavailable("use 'type(of:)' instead"))
 
 START_MODULE(Foundation)
 INSTANCE_METHOD(NSArray, (0, "init"), DesignatedInit)

utils/vim/syntax/swift.vim

@@ -55,7 +55,6 @@ syn keyword swiftDefinitionModifier
 
 syn keyword swiftIdentifierKeyword
       \ Self
-      \ dynamicType
       \ metatype
       \ self
       \ super