Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift-ci
2018-02-06 10:29:36 -08:00
34 changed files with 398 additions and 295 deletions

View File

@@ -1195,10 +1195,14 @@ void SwiftLangSupport::codeCompleteOpen(
// Add any codecomplete.open specific flags.
std::vector<const char *> extendedArgs(args.begin(), args.end());
if (CCOpts.addInitsToTopLevel)
if (CCOpts.addInitsToTopLevel) {
extendedArgs.push_back("-Xfrontend");
extendedArgs.push_back("-code-complete-inits-in-postfix-expr");
if (CCOpts.callPatternHeuristics)
}
if (CCOpts.callPatternHeuristics) {
extendedArgs.push_back("-Xfrontend");
extendedArgs.push_back("-code-complete-call-pattern-heuristics");
}
// Invoke completion.
std::string error;