From 750cc4ea30b17ffff2d9f1cc7c4c219eafd68deb Mon Sep 17 00:00:00 2001 From: Peter Elmers Date: Wed, 22 Nov 2017 09:52:33 -0800 Subject: [PATCH] Respond to comment --- src/language_server_api.cc | 1 + src/language_server_api.h | 1 + src/working_files.cc | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/language_server_api.cc b/src/language_server_api.cc index 8d3d8e4c..1c4d3268 100644 --- a/src/language_server_api.cc +++ b/src/language_server_api.cc @@ -273,6 +273,7 @@ bool lsPosition::operator==(const lsPosition& other) const { std::string lsPosition::ToString() const { return std::to_string(line) + ":" + std::to_string(character); } +const lsPosition lsPosition::kZeroPosition = lsPosition(); lsRange::lsRange() {} lsRange::lsRange(lsPosition start, lsPosition end) : start(start), end(end) {} diff --git a/src/language_server_api.h b/src/language_server_api.h index 0b11cb58..d52d6bd3 100644 --- a/src/language_server_api.h +++ b/src/language_server_api.h @@ -148,6 +148,7 @@ struct lsPosition { // Note: these are 0-based. int line = 0; int character = 0; + static const lsPosition kZeroPosition; }; MAKE_HASHABLE(lsPosition, t.line, t.character); MAKE_REFLECT_STRUCT(lsPosition, line, character); diff --git a/src/working_files.cc b/src/working_files.cc index 8129ce6d..50e893e7 100644 --- a/src/working_files.cc +++ b/src/working_files.cc @@ -329,9 +329,8 @@ void WorkingFiles::OnChange(const Ipc_TextDocumentDidChange::Params& change) { // std::cerr << "|" << file->buffer_content << "|" << std::endl; // Per the spec replace everything if the rangeLength and range are not set. // See https://github.com/Microsoft/language-server-protocol/issues/9. - auto zeroPosition = lsPosition(0, 0); - if (diff.rangeLength == -1 && diff.range.start == zeroPosition - && diff.range.end == zeroPosition) { + if (diff.rangeLength == -1 && diff.range.start == lsPosition::kZeroPosition + && diff.range.end == lsPosition::kZeroPosition) { file->buffer_content = diff.text; file->OnBufferContentUpdated(); // std::cerr << "-> Replacing entire content";