averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[CodeComplete] Avoid let/var completions in a few cases

Browse Source 
Don't suggest `let` or `var` in e.g the sequence
expression of a `for` loop, or after a `return`.
We ought to do a better job of checking whether
we're in expression position before suggesting
these (as opposed to a pattern), but I'm leaving
that as future work for now.
This commit is contained in:
Hamish Knight
2023-08-03 14:17:54 +01:00
parent c2fc7ee9e7
commit a5d9b13ef0
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/IDE/CodeCompletion.cpp
View File

@@ -1016,13 +1016,19 @@ void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink,
addStmtKeywords(Sink, CurDeclContext, MaybeFuncBody);
addClosureSignatureKeywordsIfApplicable(Sink, CurDeclContext);
LLVM_FALLTHROUGH;
case CompletionKind::PostfixExprBeginning:
// We need to add 'let' and 'var' keywords in expression position here as
// we initially parse patterns as expressions.
// FIXME: We ought to be able to determine if we're in a pattern context and
// only enable 'let' and 'var' in that case.
addLetVarKeywords(Sink);
LLVM_FALLTHROUGH;
case CompletionKind::ReturnStmtExpr:
case CompletionKind::YieldStmtExpr:
case CompletionKind::PostfixExprBeginning:
case CompletionKind::ForEachSequence:
addSuperKeyword(Sink, CurDeclContext);
addLetVarKeywords(Sink);
addExprKeywords(Sink, CurDeclContext);
addAnyTypeKeyword(Sink, CurDeclContext->getASTContext().TheAnyType);
break;

24
test/IDE/complete_keywords.swift
View File

@@ -256,8 +256,11 @@
//
// let and var
//
// KW_EXPR-DAG: Keyword[let]/None: let{{; name=.+$}}
// KW_EXPR-DAG: Keyword[var]/None: var{{; name=.+$}}
// KW_LETVAR-DAG: Keyword[let]/None: let{{; name=.+$}}
// KW_LETVAR-DAG: Keyword[var]/None: var{{; name=.+$}}
//
// KW_LETVAR_NEG-NOT: Keyword[let]/None: let{{; name=.+$}}
// KW_LETVAR_NEG-NOT: Keyword[var]/None: var{{; name=.+$}}
//
// Literals
//
@@ -423,24 +426,29 @@ extension SubClass {
}
func inExpr1() {
(#^EXPR_1?check=KW_EXPR;check=KW_EXPR_NEG^#)
(#^EXPR_1?check=KW_EXPR;check=KW_LETVAR;check=KW_EXPR_NEG^#)
}
func inExpr2() {
let x = #^EXPR_2?check=KW_EXPR;check=KW_EXPR_NEG^#
let x = #^EXPR_2?check=KW_EXPR;check=KW_LETVAR;check=KW_EXPR_NEG^#
}
func inExpr3() {
if #^EXPR_3?check=KW_EXPR;check=KW_EXPR_NEG^# {}
if #^EXPR_3?check=KW_EXPR;check=KW_LETVAR;check=KW_EXPR_NEG^# {}
}
func inExpr4() {
let x = 1
x + #^EXPR_4?check=KW_EXPR;check=KW_EXPR_NEG^#
x + #^EXPR_4?check=KW_EXPR;check=KW_LETVAR;check=KW_EXPR_NEG^#
}
func inExpr5() {
var x: Int
x = #^EXPR_5?check=KW_EXPR;check=KW_EXPR_NEG^#
x = #^EXPR_5?check=KW_EXPR;check=KW_LETVAR;check=KW_EXPR_NEG^#
}
func inExpr6() -> Int {
return #^EXPR_6?check=KW_EXPR;check=KW_EXPR_NEG^#
// Make sure we don't recommend 'let' and 'var' here.
return #^EXPR_6?check=KW_EXPR;check=KW_EXPR_NEG;check=KW_LETVAR_NEG^#
}
func inExpr7() {
// Make sure we don't recommend 'let' and 'var' here.
for x in #^EXPR_7?check=KW_EXPR;check=KW_EXPR_NEG;check=KW_LETVAR_NEG^#
}
func inSwitch(val: Int) {