mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 11:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

api: Do not truncate errors <1 MB. #6237

Browse Source 
Closes #5984
This commit is contained in:
Sander Bosma
2017-03-01 10:43:47 +01:00
committed by Justin M. Keyes
parent 4524053874
commit 5c9860a0a2
15 changed files with 209 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/nvim/api/buffer.c
View File

@@ -171,7 +171,7 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
end = normalize_index(buf, end, &oob);
if (strict_indexing && oob) {
api_set_error(err, Validation, _("Index out of bounds"));
_api_set_error(err, kErrorTypeValidation, _("Index out of bounds"));
return rv;
}
@@ -187,7 +187,7 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
int64_t lnum = start + (int64_t)i;
if (lnum > LONG_MAX) {
api_set_error(err, Validation, _("Line index is too high"));
_api_set_error(err, kErrorTypeValidation, _("Line index is too high"));
goto end;
}
@@ -283,14 +283,14 @@ void nvim_buf_set_lines(uint64_t channel_id,
end = normalize_index(buf, end, &oob);
if (strict_indexing && oob) {
api_set_error(err, Validation, _("Index out of bounds"));
_api_set_error(err, kErrorTypeValidation, _("Index out of bounds"));
return;
}
if (start > end) {
api_set_error(err,
Validation,
_api_set_error(err,
kErrorTypeValidation,
_("Argument \"start\" is higher than \"end\""));
return;
}
@@ -304,8 +304,8 @@ void nvim_buf_set_lines(uint64_t channel_id,
for (size_t i = 0; i < new_len; i++) {
if (replacement.items[i].type != kObjectTypeString) {
api_set_error(err,
Validation,
_api_set_error(err,
kErrorTypeValidation,
_("All items in the replacement array must be strings"));
goto end;
}
@@ -317,7 +317,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
lines[i] = xmallocz(l.size);
for (size_t j = 0; j < l.size; j++) {
if (l.data[j] == '\n' && channel_id != INTERNAL_CALL) {
api_set_error(err, Exception, _("string cannot contain newlines"));
_api_set_error(err, kErrorTypeException, _("string cannot contain newlines"));
new_len = i + 1;
goto end;
}
@@ -330,7 +330,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf);
if (u_save((linenr_T)(start - 1), (linenr_T)end) == FAIL) {
api_set_error(err, Exception, _("Failed to save undo information"));
_api_set_error(err, kErrorTypeException, _("Failed to save undo information"));
goto end;
}
@@ -340,7 +340,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
size_t to_delete = (new_len < old_len) ? (size_t)(old_len - new_len) : 0;
for (size_t i = 0; i < to_delete; i++) {
if (ml_delete((linenr_T)start, false) == FAIL) {
api_set_error(err, Exception, _("Failed to delete line"));
_api_set_error(err, kErrorTypeException, _("Failed to delete line"));
goto end;
}
}
@@ -357,12 +357,12 @@ void nvim_buf_set_lines(uint64_t channel_id,
int64_t lnum = start + (int64_t)i;
if (lnum > LONG_MAX) {
api_set_error(err, Validation, _("Index value is too high"));
_api_set_error(err, kErrorTypeValidation, _("Index value is too high"));
goto end;
}
if (ml_replace((linenr_T)lnum, (char_u *)lines[i], false) == FAIL) {
api_set_error(err, Exception, _("Failed to replace line"));
_api_set_error(err, kErrorTypeException, _("Failed to replace line"));
goto end;
}
// Mark lines that haven't been passed to the buffer as they need
@@ -375,12 +375,12 @@ void nvim_buf_set_lines(uint64_t channel_id,
int64_t lnum = start + (int64_t)i - 1;
if (lnum > LONG_MAX) {
api_set_error(err, Validation, _("Index value is too high"));
_api_set_error(err, kErrorTypeValidation, _("Index value is too high"));
goto end;
}
if (ml_append((linenr_T)lnum, (char_u *)lines[i], 0, false) == FAIL) {
api_set_error(err, Exception, _("Failed to insert line"));
_api_set_error(err, kErrorTypeException, _("Failed to insert line"));
goto end;
}
@@ -627,7 +627,7 @@ void nvim_buf_set_name(Buffer buffer, String name, Error *err)
}
if (ren_ret == FAIL) {
api_set_error(err, Exception, _("Failed to rename buffer"));
_api_set_error(err, kErrorTypeException, _("Failed to rename buffer"));
}
}
@@ -639,7 +639,9 @@ Boolean nvim_buf_is_valid(Buffer buffer)
FUNC_API_SINCE(1)
{
Error stub = ERROR_INIT;
return find_buffer_by_handle(buffer, &stub) != NULL;
Boolean ret = find_buffer_by_handle(buffer, &stub) != NULL;
xfree(stub.msg);
return ret;
}
/// Inserts a sequence of lines to a buffer at a certain index
@@ -678,7 +680,7 @@ ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
}
if (name.size != 1) {
api_set_error(err, Validation, _("Mark name must be a single character"));
_api_set_error(err, kErrorTypeValidation, _("Mark name must be a single character"));
return rv;
}
@@ -696,7 +698,7 @@ ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
}
if (posp == NULL) {
api_set_error(err, Validation, _("Invalid mark name"));
_api_set_error(err, kErrorTypeValidation, _("Invalid mark name"));
return rv;
}
@@ -751,11 +753,11 @@ Integer nvim_buf_add_highlight(Buffer buffer,
}
if (line < 0 || line >= MAXLNUM) {
api_set_error(err, Validation, _("Line number outside range"));
_api_set_error(err, kErrorTypeValidation, _("Line number outside range"));
return 0;
}
if (col_start < 0 || col_start > MAXCOL) {
api_set_error(err, Validation, _("Column value outside range"));
_api_set_error(err, kErrorTypeValidation, _("Column value outside range"));
return 0;
}
if (col_end < 0 || col_end > MAXCOL) {
@@ -792,7 +794,7 @@ void nvim_buf_clear_highlight(Buffer buffer,
}
if (line_start < 0 || line_start >= MAXLNUM) {
api_set_error(err, Validation, _("Line number outside range"));
_api_set_error(err, kErrorTypeValidation, _("Line number outside range"));
return;
}
if (line_end < 0 || line_end > MAXLNUM) {