Merge pull request #77312 from ahoppen/common-in

ahoppen · web-flow · commit 2c1ada6f71ee · 2024-10-30T22:13:54.000-07:00
diff --git a/lib/IDE/CodeCompletion.cpp b/lib/IDE/CodeCompletion.cpp
@@ -960,7 +960,9 @@ addClosureSignatureKeywordsIfApplicable(CodeCompletionResultSink &Sink,
   if (closure->getInLoc().isValid())
     return;
 
-  addKeyword(Sink, "in", CodeCompletionKeywordKind::kw_in);
+  addKeyword(Sink, "in", CodeCompletionKeywordKind::kw_in,
+             /*TypeAnnotation=*/"",
+             CodeCompletionFlairBit::CommonKeywordAtCurrentPosition);
 }
 
 void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink,
diff --git a/test/IDE/complete_keywords.swift b/test/IDE/complete_keywords.swift
@@ -3,7 +3,7 @@
 // KW_RETURN: Keyword[return]/None: return{{; name=.+$}}
 // KW_NO_RETURN-NOT: Keyword[return]
 
-// KW_IN: Keyword[in]/None: in{{; name=.+$}}
+// KW_IN: Keyword[in]/None/Flair[CommonKeyword]: in{{; name=.+$}}
 // KW_NO_IN-NOT: Keyword[in]
 
 // KW_NO_INOUT-NOT: Keyword[inout]
diff --git a/test/IDE/complete_rdar80489548.swift b/test/IDE/complete_rdar80489548.swift
@@ -1,6 +1,6 @@
 // RUN: %batch-code-completion
 
-// KW_IN: Keyword[in]/None: in{{; name=.+$}}
+// KW_IN: Keyword[in]/None/Flair[CommonKeyword]: in{{; name=.+$}}
 // KW_NO_IN-NOT: Keyword[in]
 
 func test(value: [Int]) {

Original file line number	Diff line number	Diff line change
`@@ -960,7 +960,9 @@ addClosureSignatureKeywordsIfApplicable(CodeCompletionResultSink &Sink,`
`960`	`960`	`if (closure->getInLoc().isValid())`
`961`	`961`	`return;`
`962`	`962`
`963`		`- addKeyword(Sink, "in", CodeCompletionKeywordKind::kw_in);`
	`963`	`+ addKeyword(Sink, "in", CodeCompletionKeywordKind::kw_in,`
	`964`	`+ /TypeAnnotation=/"",`
	`965`	`+ CodeCompletionFlairBit::CommonKeywordAtCurrentPosition);`
`964`	`966`	`}`
`965`	`967`
`966`	`968`	`void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink,`