Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

lint: Use early exit/continue

Browse source
This commit is contained in:
Kurtis Rader 2016-10-30 14:16:32 -07:00
parent ca5a4ec1d5
commit 7779132595
1 changed files with 134 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/reader.cpp
View file

@ -1398,7 +1398,10 @@ static bool handle_completions(const std::vector<completion_t> &comp,
success = true; success = true;
} }
if (!done) { if (done) {
return success;
}
fuzzy_match_type_t best_match_type = get_best_match_type(comp); fuzzy_match_type_t best_match_type = get_best_match_type(comp);
// Determine whether we are going to replace the token or not. If any commands of the best // Determine whether we are going to replace the token or not. If any commands of the best
@ -1412,8 +1415,8 @@ static bool handle_completions(const std::vector<completion_t> &comp,
} }
} }
// Decide which completions survived. There may be a lot of them; it would be nice if we // Decide which completions survived. There may be a lot of them; it would be nice if we could
// could figure out how to avoid copying them here. // figure out how to avoid copying them here.
std::vector<completion_t> surviving_completions; std::vector<completion_t> surviving_completions;
for (size_t i = 0; i < comp.size(); i++) { for (size_t i = 0; i < comp.size(); i++) {
const completion_t &el = comp.at(i); const completion_t &el = comp.at(i);
@ -1483,7 +1486,10 @@ static bool handle_completions(const std::vector<completion_t> &comp,
} }
} }
if (continue_after_prefix_insertion || !use_prefix) { if (!continue_after_prefix_insertion && use_prefix) {
return success;
}
// We didn't get a common prefix, or we want to print the list anyways. // We didn't get a common prefix, or we want to print the list anyways.
size_t len, prefix_start = 0; size_t len, prefix_start = 0;
wcstring prefix; wcstring prefix;
@ -1493,8 +1499,7 @@ static bool handle_completions(const std::vector<completion_t> &comp,
len = el->position - prefix_start; len = el->position - prefix_start;
if (will_replace_token || match_type_requires_full_replacement(best_match_type)) { if (will_replace_token || match_type_requires_full_replacement(best_match_type)) {
// No prefix. prefix.clear(); // no prefix
prefix.clear();
} else if (len <= PREFIX_MAX_LEN) { } else if (len <= PREFIX_MAX_LEN) {
prefix.append(el->text, prefix_start, len); prefix.append(el->text, prefix_start, len);
} else { } else {
@ -1513,10 +1518,7 @@ static bool handle_completions(const std::vector<completion_t> &comp,
// Modify the command line to reflect the new pager. // Modify the command line to reflect the new pager.
data->pager_selection_changed(); data->pager_selection_changed();
reader_repaint_needed(); reader_repaint_needed();
success = false; return false;
}
}
return success;
} }
/// Return true if we believe ourselves to be orphaned. loop_count is how many times we've tried to /// Return true if we believe ourselves to be orphaned. loop_count is how many times we've tried to
@ -2652,7 +2654,9 @@ const wchar_t *reader_readline(int nchars) {
} }
case R_BACKWARD_KILL_LINE: { case R_BACKWARD_KILL_LINE: {
editable_line_t *el = data->active_edit_line(); editable_line_t *el = data->active_edit_line();
if (el->position > 0) { if (el->position <= 0) {
break;
}
const wchar_t *buff = el->text.c_str(); const wchar_t *buff = el->text.c_str();
const wchar_t *end = &buff[el->position]; const wchar_t *end = &buff[el->position];
const wchar_t *begin = end; const wchar_t *begin = end;
@ -2664,14 +2668,10 @@ const wchar_t *reader_readline(int nchars) {
// If we landed on a newline, don't delete it. // If we landed on a newline, don't delete it.
if (*begin == L'\n') begin++; if (*begin == L'\n') begin++;
assert(end >= begin); assert(end >= begin);
size_t len = maxi<size_t>(end - begin, 1); size_t len = maxi<size_t>(end - begin, 1);
begin = end - len; begin = end - len;
reader_kill(el, begin - buff, len, KILL_PREPEND, last_char != R_BACKWARD_KILL_LINE);
reader_kill(el, begin - buff, len, KILL_PREPEND,
last_char != R_BACKWARD_KILL_LINE);
}
break; break;
} }
case R_KILL_WHOLE_LINE: { case R_KILL_WHOLE_LINE: {