Skip to content

Commit 2fb5425

Browse files
committed
[IDE] Rename CodeCompletionTypeContextAnalyzer to ExprContextAnalyzer
NFC
1 parent b033f48 commit 2fb5425

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

lib/IDE/CodeCompletion.cpp

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4906,7 +4906,7 @@ static void addConditionalCompilationFlags(ASTContext &Ctx,
49064906

49074907
namespace {
49084908
class ExprParentFinder : public ASTWalker {
4909-
friend class CodeCompletionTypeContextAnalyzer;
4909+
friend class ExprContextAnalyzer;
49104910
Expr *ChildExpr;
49114911
llvm::function_ref<bool(ParentTy, ParentTy)> Predicate;
49124912

@@ -5161,7 +5161,7 @@ bool translateArgIndexToParamIndex(Expr *Args, unsigned &Position,
51615161

51625162
/// Given an expression and its context, the analyzer tries to figure out the
51635163
/// expected type of the expression by analyzing its context.
5164-
class CodeCompletionTypeContextAnalyzer {
5164+
class ExprContextAnalyzer {
51655165
DeclContext *DC;
51665166
Expr *ParsedExpr;
51675167
SourceManager &SM;
@@ -5239,7 +5239,7 @@ class CodeCompletionTypeContextAnalyzer {
52395239
}
52405240

52415241
public:
5242-
CodeCompletionTypeContextAnalyzer(DeclContext *DC, Expr *ParsedExpr) : DC(DC),
5242+
ExprContextAnalyzer(DeclContext *DC, Expr *ParsedExpr) : DC(DC),
52435243
ParsedExpr(ParsedExpr), SM(DC->getASTContext().SourceMgr),
52445244
Context(DC->getASTContext()),
52455245
Finder(ParsedExpr, [](ASTWalker::ParentTy Node, ASTWalker::ParentTy Parent) {
@@ -5542,8 +5542,7 @@ void CodeCompletionCallbacksImpl::doneParsing() {
55425542
if (isa<BindOptionalExpr>(ParsedExpr) || isa<ForceValueExpr>(ParsedExpr))
55435543
Lookup.setIsUnwrappedOptional(true);
55445544

5545-
::CodeCompletionTypeContextAnalyzer TypeAnalyzer(CurDeclContext,
5546-
ParsedExpr);
5545+
::ExprContextAnalyzer TypeAnalyzer(CurDeclContext, ParsedExpr);
55475546
if (TypeAnalyzer.Analyze()) {
55485547
Lookup.setExpectedTypes(TypeAnalyzer.getPossibleTypes());
55495548
}
@@ -5586,8 +5585,7 @@ void CodeCompletionCallbacksImpl::doneParsing() {
55865585

55875586
case CompletionKind::ForEachSequence:
55885587
case CompletionKind::PostfixExprBeginning: {
5589-
::CodeCompletionTypeContextAnalyzer Analyzer(CurDeclContext,
5590-
CodeCompleteTokenExpr);
5588+
::ExprContextAnalyzer Analyzer(CurDeclContext, CodeCompleteTokenExpr);
55915589
if (Analyzer.Analyze()) {
55925590
Lookup.setExpectedTypes(Analyzer.getPossibleTypes());
55935591
}
@@ -5613,8 +5611,7 @@ void CodeCompletionCallbacksImpl::doneParsing() {
56135611
case CompletionKind::PostfixExprParen: {
56145612
Lookup.setHaveLParen(true);
56155613

5616-
::CodeCompletionTypeContextAnalyzer TypeAnalyzer(CurDeclContext,
5617-
CodeCompleteTokenExpr);
5614+
::ExprContextAnalyzer TypeAnalyzer(CurDeclContext, CodeCompleteTokenExpr);
56185615
if (TypeAnalyzer.Analyze()) {
56195616
Lookup.setExpectedTypes(TypeAnalyzer.getPossibleTypes());
56205617
}
@@ -5738,8 +5735,7 @@ void CodeCompletionCallbacksImpl::doneParsing() {
57385735
}
57395736
case CompletionKind::UnresolvedMember: {
57405737
Lookup.setHaveDot(DotLoc);
5741-
::CodeCompletionTypeContextAnalyzer TypeAnalyzer(CurDeclContext,
5742-
CodeCompleteTokenExpr);
5738+
::ExprContextAnalyzer TypeAnalyzer(CurDeclContext, CodeCompleteTokenExpr);
57435739
if (TypeAnalyzer.Analyze())
57445740
Lookup.setExpectedTypes(TypeAnalyzer.getPossibleTypes());
57455741
Lookup.getUnresolvedMemberCompletions(TypeAnalyzer.getPossibleTypes());
@@ -5753,8 +5749,7 @@ void CodeCompletionCallbacksImpl::doneParsing() {
57535749
break;
57545750
}
57555751
case CompletionKind::CallArg : {
5756-
::CodeCompletionTypeContextAnalyzer Analyzer(CurDeclContext,
5757-
CodeCompleteTokenExpr);
5752+
::ExprContextAnalyzer Analyzer(CurDeclContext, CodeCompleteTokenExpr);
57585753
Analyzer.Analyze();
57595754
if (!Analyzer.getPossibleNames().empty()) {
57605755
Lookup.addArgNameCompletionResults(Analyzer.getPossibleNames());

0 commit comments

Comments
 (0)