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

Revert "Preserve whitespace and comments during lexing as Trivia"

Browse Source 
This reverts commit d6e2b58382.
This commit is contained in:
David Farler
2016-11-18 12:22:53 -08:00
parent 44f15558d6
commit f450f0ccdf
56 changed files with 1048 additions and 1816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/IDE/REPLCodeCompletion.cpp
View File

@@ -22,7 +22,6 @@
#include "swift/Parse/DelayedParsingCallbacks.h"
#include "swift/Parse/Parser.h"
#include "swift/IDE/CodeCompletion.h"
#include "swift/Syntax/Token.h"
#include "swift/Subsystems.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/MemoryBuffer.h"
@@ -248,16 +247,15 @@ void REPLCompletions::populate(SourceFile &SF, StringRef EnteredCode) {
CompletionCallbacksFactory.get());
ASTContext &Ctx = SF.getASTContext();
auto Tokens = tokenize(Ctx.LangOpts, Ctx.SourceMgr, EOFRetention::DiscardEOF,
BufferID);
std::vector<Token> Tokens = tokenize(Ctx.LangOpts, Ctx.SourceMgr, BufferID);
if (!Tokens.empty() && Tokens.back().is(tok::code_complete))
Tokens.pop_back();
if (!Tokens.empty()) {
auto LastToken = Tokens.back();
if (LastToken.is(tok::identifier) || LastToken.isKeyword()){
Prefix = LastToken.getText().str();
Token &LastToken = Tokens.back();
if (LastToken.is(tok::identifier) || LastToken.isKeyword()) {
Prefix = LastToken.getText();
unsigned Offset = Ctx.SourceMgr.getLocOffsetInBuffer(LastToken.getLoc(),
BufferID);