From ed35b2d30b2d7f336d94bbab59f114a21064ad58 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sat, 9 Jan 2016 16:00:51 -0800 Subject: [PATCH] Fix long-broken Objective-C message ]-completions. --- Complete.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Complete.cpp b/Complete.cpp index fcf8f5d..57e4d38 100644 --- a/Complete.cpp +++ b/Complete.cpp @@ -179,17 +179,14 @@ _visible char **CYComplete(const char *word, const std::string &line, CYUTF8Stri if (string == NULL) CYThrow("string was actually %s", typeid(*value->value_).name()); - CYUTF8String completion; - if (string->size_ != 0) - completion = {string->value_, string->size_}; - else if (driver.mode_ == CYDriver::AutoMessage) - completion = "]"; - else - continue; - + CYUTF8String completion(string->value_, string->size_); + _assert(completion.size >= begin.size()); completion.data += begin.size(); completion.size -= begin.size(); + if (completion.size == 0 && driver.mode_ == CYDriver::AutoMessage) + completion = "]"; + if (CYStartsWith(completion, "$cy")) continue; completions.push_back(completion); -- 2.49.0