Merge pull request #17251 from CodaFi/throw-magnon

CodaFi · web-flow · commit b5772967e551 · 2018-06-15T14:19:12.000-07:00
[Gardening] 'throw' is not an expression keyword
diff --git a/include/swift/Syntax/TokenKinds.def b/include/swift/Syntax/TokenKinds.def
@@ -191,6 +191,7 @@ STMT_KEYWORD(case)
 STMT_KEYWORD(default)
 STMT_KEYWORD(where)
 STMT_KEYWORD(catch)
+STMT_KEYWORD(throw)
 
 // Expression keywords.
 EXPR_KEYWORD(as)
@@ -202,7 +203,6 @@ EXPR_KEYWORD(rethrows)
 EXPR_KEYWORD(super)
 EXPR_KEYWORD(self)
 EXPR_KEYWORD(Self)
-EXPR_KEYWORD(throw)
 EXPR_KEYWORD(true)
 EXPR_KEYWORD(try)
 EXPR_KEYWORD(throws)
diff --git a/lib/IDE/CodeCompletion.cpp b/lib/IDE/CodeCompletion.cpp
@@ -4887,9 +4887,6 @@ static void addStmtKeywords(CodeCompletionResultSink &Sink, bool MaybeFuncBody)
   };
 #define STMT_KEYWORD(kw) AddKeyword(#kw, CodeCompletionKeywordKind::kw_##kw);
 #include "swift/Syntax/TokenKinds.def"
-
-  // Throw is not marked as a STMT_KEYWORD.
-  AddKeyword("throw", CodeCompletionKeywordKind::kw_throw);
 }
 
 static void addLetVarKeywords(CodeCompletionResultSink &Sink) {

Original file line number	Diff line number	Diff line change
`@@ -4887,9 +4887,6 @@ static void addStmtKeywords(CodeCompletionResultSink &Sink, bool MaybeFuncBody)`
`4887`	`4887`	`};`
`4888`	`4888`	`#define STMT_KEYWORD(kw) AddKeyword(#kw, CodeCompletionKeywordKind::kw_##kw);`
`4889`	`4889`	`#include "swift/Syntax/TokenKinds.def"`
`4890`		`-`
`4891`		`- // Throw is not marked as a STMT_KEYWORD.`
`4892`		`- AddKeyword("throw", CodeCompletionKeywordKind::kw_throw);`
`4893`	`4890`	`}`
`4894`	`4891`
`4895`	`4892`	`static void addLetVarKeywords(CodeCompletionResultSink &Sink) {`