diff options
Diffstat (limited to 'src/ring.c')
| -rw-r--r-- | src/ring.c | 41 |
1 files changed, 38 insertions, 3 deletions
@@ -37,6 +37,7 @@ #include "glob.h" #include "error.h" #include "list.h" +#include "lsp.h" #include "ring.h" /** @private @static @memberof teco_buffer_t */ @@ -79,13 +80,20 @@ teco_buffer_undo_edit(teco_buffer_t *ctx) static gboolean teco_buffer_load(teco_buffer_t *ctx, const gchar *filename, GError **error) { + teco_buffer_set_filename(ctx, filename); + + if (!teco_lsp_didopen(ctx, error)) + return FALSE; + + /* + * Will also call teco_lsp_didchange_insert() following + * Scintilla notifications. + */ if (!teco_view_load(ctx->view, filename, TRUE, error)) return FALSE; /* currently buffer cannot be dirty */ g_assert(ctx->state == TECO_BUFFER_CLEAN); - - teco_buffer_set_filename(ctx, filename); return TRUE; } @@ -93,7 +101,9 @@ teco_buffer_load(teco_buffer_t *ctx, const gchar *filename, GError **error) static gboolean teco_buffer_save(teco_buffer_t *ctx, const gchar *filename, GError **error) { - if (!filename && !ctx->filename) { + gboolean is_unnamed = !ctx->filename; + + if (!filename && is_unnamed) { g_set_error_literal(error, TECO_ERROR, TECO_ERROR_FAILED, "Cannot save the unnamed file " "without providing a file name"); @@ -127,6 +137,13 @@ teco_buffer_save(teco_buffer_t *ctx, const gchar *filename, GError **error) teco_undo_cstring(ctx->filename); teco_buffer_set_filename(ctx, filename ? : ctx->filename); + /* + * Unnamed buffers were not synced with the LSP server, + * so we do this now. + */ + if (is_unnamed && !teco_lsp_sync(ctx, error)) + return FALSE; + return TRUE; } @@ -400,6 +417,9 @@ teco_ring_edit_by_name(const gchar *filename, GError **error) else teco_interface_msg(TECO_MSG_INFO, "Added new unnamed file to ring."); + + if (!teco_lsp_didopen(buffer, error)) + return FALSE; } return teco_ed_hook(TECO_ED_HOOK_ADD, error); @@ -467,6 +487,9 @@ teco_ring_close(teco_buffer_t *buffer, GError **error) teco_ring_remove_buffer(buffer); } + if (!teco_lsp_didclose(buffer, error)) + return FALSE; + /* transfer responsibility to the undo token object */ teco_undo_ring_reinsert(buffer); @@ -489,6 +512,18 @@ teco_ring_set_scintilla_undo(gboolean state) } } +gboolean +teco_ring_sync_lsp(GError **error) +{ + for (teco_tailq_entry_t *cur = teco_ring_head.first; cur != NULL; cur = cur->next) { + teco_buffer_t *buffer = (teco_buffer_t *)cur; + if (buffer->filename && !teco_lsp_sync(buffer, error)) + return FALSE; + } + + return TRUE; +} + void teco_ring_cleanup(void) { |