2017-02-07 18:28:20 +08:00
|
|
|
//===--- Protocol.h - Language Server Protocol Implementation ---*- C++ -*-===//
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// This file contains structs based on the LSP specification at
|
|
|
|
// https://github.com/Microsoft/language-server-protocol/blob/master/protocol.md
|
|
|
|
//
|
|
|
|
// This is not meant to be a complete implementation, new interfaces are added
|
|
|
|
// when they're needed.
|
|
|
|
//
|
2017-12-01 05:32:29 +08:00
|
|
|
// Each struct has a toJSON and fromJSON function, that converts between
|
2018-07-09 22:25:59 +08:00
|
|
|
// the struct and a JSON representation. (See JSON.h)
|
2017-02-07 18:28:20 +08:00
|
|
|
//
|
2017-12-20 18:26:53 +08:00
|
|
|
// Some structs also have operator<< serialization. This is for debugging and
|
|
|
|
// tests, and is not generally machine-readable.
|
|
|
|
//
|
2017-02-07 18:28:20 +08:00
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_PROTOCOL_H
|
|
|
|
#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_PROTOCOL_H
|
|
|
|
|
2018-01-29 23:37:46 +08:00
|
|
|
#include "URI.h"
|
2017-02-07 18:28:20 +08:00
|
|
|
#include "llvm/ADT/Optional.h"
|
2018-07-09 22:25:59 +08:00
|
|
|
#include "llvm/Support/JSON.h"
|
[clangd] Implementation of workspace/symbol request
Summary:
This is a basic implementation of the "workspace/symbol" request which is
used to find symbols by a string query. Since this is similar to code completion
in terms of result, this implementation reuses the "fuzzyFind" in order to get
matches. For now, the scoring algorithm is the same as code completion and
improvements could be done in the future.
The index model doesn't contain quite enough symbols for this to cover
common symbols like methods, enum class enumerators, functions in unamed
namespaces, etc. The index model will be augmented separately to achieve this.
Reviewers: sammccall, ilya-biryukov
Reviewed By: sammccall
Subscribers: jkorous, hokein, simark, sammccall, klimek, mgorny, ilya-biryukov, mgrang, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44882
llvm-svn: 330637
2018-04-24 04:00:52 +08:00
|
|
|
#include <bitset>
|
2017-02-07 18:28:20 +08:00
|
|
|
#include <string>
|
2017-02-07 18:47:40 +08:00
|
|
|
#include <vector>
|
2017-02-07 18:28:20 +08:00
|
|
|
|
|
|
|
namespace clang {
|
|
|
|
namespace clangd {
|
|
|
|
|
2017-11-07 18:21:02 +08:00
|
|
|
enum class ErrorCode {
|
|
|
|
// Defined by JSON RPC.
|
|
|
|
ParseError = -32700,
|
|
|
|
InvalidRequest = -32600,
|
|
|
|
MethodNotFound = -32601,
|
|
|
|
InvalidParams = -32602,
|
|
|
|
InternalError = -32603,
|
|
|
|
|
|
|
|
ServerNotInitialized = -32002,
|
|
|
|
UnknownErrorCode = -32001,
|
|
|
|
|
|
|
|
// Defined by the protocol.
|
|
|
|
RequestCancelled = -32800,
|
|
|
|
};
|
|
|
|
|
2018-01-29 23:37:46 +08:00
|
|
|
struct URIForFile {
|
2018-02-16 20:20:47 +08:00
|
|
|
URIForFile() = default;
|
|
|
|
explicit URIForFile(std::string AbsPath);
|
2017-04-07 19:03:26 +08:00
|
|
|
|
2018-02-16 20:20:47 +08:00
|
|
|
/// Retrieves absolute path to the file.
|
|
|
|
llvm::StringRef file() const { return File; }
|
|
|
|
|
|
|
|
explicit operator bool() const { return !File.empty(); }
|
|
|
|
std::string uri() const { return URI::createFile(File).toString(); }
|
2017-04-07 19:03:26 +08:00
|
|
|
|
2018-01-29 23:37:46 +08:00
|
|
|
friend bool operator==(const URIForFile &LHS, const URIForFile &RHS) {
|
2018-02-16 20:20:47 +08:00
|
|
|
return LHS.File == RHS.File;
|
2017-06-29 00:12:10 +08:00
|
|
|
}
|
|
|
|
|
2018-01-29 23:37:46 +08:00
|
|
|
friend bool operator!=(const URIForFile &LHS, const URIForFile &RHS) {
|
2017-06-29 00:12:10 +08:00
|
|
|
return !(LHS == RHS);
|
|
|
|
}
|
|
|
|
|
2018-01-29 23:37:46 +08:00
|
|
|
friend bool operator<(const URIForFile &LHS, const URIForFile &RHS) {
|
2018-02-16 20:20:47 +08:00
|
|
|
return LHS.File < RHS.File;
|
2017-06-29 00:12:10 +08:00
|
|
|
}
|
2018-02-16 20:20:47 +08:00
|
|
|
|
|
|
|
private:
|
|
|
|
std::string File;
|
2017-04-07 19:03:26 +08:00
|
|
|
};
|
2018-01-29 23:37:46 +08:00
|
|
|
|
|
|
|
/// Serialize/deserialize \p URIForFile to/from a string URI.
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const URIForFile &U);
|
|
|
|
bool fromJSON(const llvm::json::Value &, URIForFile &);
|
2017-04-07 19:03:26 +08:00
|
|
|
|
2017-02-07 18:28:20 +08:00
|
|
|
struct TextDocumentIdentifier {
|
|
|
|
/// The text document's URI.
|
2018-01-29 23:37:46 +08:00
|
|
|
URIForFile uri;
|
2017-02-07 18:28:20 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const TextDocumentIdentifier &);
|
|
|
|
bool fromJSON(const llvm::json::Value &, TextDocumentIdentifier &);
|
2017-02-07 18:28:20 +08:00
|
|
|
|
|
|
|
struct Position {
|
|
|
|
/// Line position in a document (zero-based).
|
2018-02-14 18:52:04 +08:00
|
|
|
int line = 0;
|
2017-02-07 18:28:20 +08:00
|
|
|
|
|
|
|
/// Character offset on a line in a document (zero-based).
|
[clangd] Fix unicode handling, using UTF-16 where LSP requires it.
Summary:
The Language Server Protocol unfortunately mandates that locations in files
be represented by line/column pairs, where the "column" is actually an index
into the UTF-16-encoded text of the line.
(This is because VSCode is written in JavaScript, which is UTF-16-native).
Internally clangd treats source files at UTF-8, the One True Encoding, and
generally deals with byte offsets (though there are exceptions).
Before this patch, conversions between offsets and LSP Position pretended
that Position.character was UTF-8 bytes, which is only true for ASCII lines.
Now we examine the text to convert correctly (but don't actually need to
transcode it, due to some nice details of the encodings).
The updated functions in SourceCode are the blessed way to interact with
the Position.character field, and anything else is likely to be wrong.
So I also updated the other accesses:
- CodeComplete needs a "clang-style" line/column, with column in utf-8 bytes.
This is now converted via Position -> offset -> clang line/column
(a new function is added to SourceCode.h for the second conversion).
- getBeginningOfIdentifier skipped backwards in UTF-16 space, which is will
behave badly when it splits a surrogate pair. Skipping backwards in UTF-8
coordinates gives the lexer a fighting chance of getting this right.
While here, I clarified(?) the logic comments, fixed a bug with identifiers
containing digits, simplified the signature slightly and added a test.
This seems likely to cause problems with editors that have the same bug, and
treat the protocol as if columns are UTF-8 bytes. But we can find and fix those.
Reviewers: hokein
Subscribers: klimek, ilya-biryukov, ioeric, MaskRay, jkorous, cfe-commits
Differential Revision: https://reviews.llvm.org/D46035
llvm-svn: 331029
2018-04-27 19:59:28 +08:00
|
|
|
/// WARNING: this is in UTF-16 codepoints, not bytes or characters!
|
|
|
|
/// Use the functions in SourceCode.h to construct/interpret Positions.
|
2018-02-14 18:52:04 +08:00
|
|
|
int character = 0;
|
2017-02-07 18:28:20 +08:00
|
|
|
|
2017-03-02 00:16:29 +08:00
|
|
|
friend bool operator==(const Position &LHS, const Position &RHS) {
|
|
|
|
return std::tie(LHS.line, LHS.character) ==
|
|
|
|
std::tie(RHS.line, RHS.character);
|
|
|
|
}
|
2018-05-15 23:29:32 +08:00
|
|
|
friend bool operator!=(const Position &LHS, const Position &RHS) {
|
|
|
|
return !(LHS == RHS);
|
|
|
|
}
|
2017-03-02 00:16:29 +08:00
|
|
|
friend bool operator<(const Position &LHS, const Position &RHS) {
|
|
|
|
return std::tie(LHS.line, LHS.character) <
|
|
|
|
std::tie(RHS.line, RHS.character);
|
|
|
|
}
|
2018-02-21 10:39:08 +08:00
|
|
|
friend bool operator<=(const Position &LHS, const Position &RHS) {
|
|
|
|
return std::tie(LHS.line, LHS.character) <=
|
|
|
|
std::tie(RHS.line, RHS.character);
|
|
|
|
}
|
2017-02-07 18:28:20 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, Position &);
|
|
|
|
llvm::json::Value toJSON(const Position &);
|
2017-12-20 18:26:53 +08:00
|
|
|
llvm::raw_ostream &operator<<(llvm::raw_ostream &, const Position &);
|
2017-02-07 18:28:20 +08:00
|
|
|
|
|
|
|
struct Range {
|
|
|
|
/// The range's start position.
|
|
|
|
Position start;
|
|
|
|
|
|
|
|
/// The range's end position.
|
|
|
|
Position end;
|
|
|
|
|
2017-03-02 00:16:29 +08:00
|
|
|
friend bool operator==(const Range &LHS, const Range &RHS) {
|
|
|
|
return std::tie(LHS.start, LHS.end) == std::tie(RHS.start, RHS.end);
|
|
|
|
}
|
2018-03-12 23:28:22 +08:00
|
|
|
friend bool operator!=(const Range &LHS, const Range &RHS) {
|
|
|
|
return !(LHS == RHS);
|
|
|
|
}
|
2017-03-02 00:16:29 +08:00
|
|
|
friend bool operator<(const Range &LHS, const Range &RHS) {
|
|
|
|
return std::tie(LHS.start, LHS.end) < std::tie(RHS.start, RHS.end);
|
|
|
|
}
|
2018-02-21 10:39:08 +08:00
|
|
|
|
|
|
|
bool contains(Position Pos) const { return start <= Pos && Pos < end; }
|
2017-02-07 18:28:20 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, Range &);
|
|
|
|
llvm::json::Value toJSON(const Range &);
|
2017-12-20 18:26:53 +08:00
|
|
|
llvm::raw_ostream &operator<<(llvm::raw_ostream &, const Range &);
|
2017-02-07 18:28:20 +08:00
|
|
|
|
2017-06-29 00:12:10 +08:00
|
|
|
struct Location {
|
|
|
|
/// The text document's URI.
|
2018-01-29 23:37:46 +08:00
|
|
|
URIForFile uri;
|
2017-06-29 00:12:10 +08:00
|
|
|
Range range;
|
|
|
|
|
|
|
|
friend bool operator==(const Location &LHS, const Location &RHS) {
|
|
|
|
return LHS.uri == RHS.uri && LHS.range == RHS.range;
|
|
|
|
}
|
|
|
|
|
|
|
|
friend bool operator!=(const Location &LHS, const Location &RHS) {
|
|
|
|
return !(LHS == RHS);
|
|
|
|
}
|
|
|
|
|
|
|
|
friend bool operator<(const Location &LHS, const Location &RHS) {
|
|
|
|
return std::tie(LHS.uri, LHS.range) < std::tie(RHS.uri, RHS.range);
|
|
|
|
}
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const Location &);
|
2017-12-20 18:26:53 +08:00
|
|
|
llvm::raw_ostream &operator<<(llvm::raw_ostream &, const Location &);
|
2017-06-29 00:12:10 +08:00
|
|
|
|
2017-07-06 16:44:54 +08:00
|
|
|
struct Metadata {
|
|
|
|
std::vector<std::string> extraFlags;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, Metadata &);
|
2017-07-06 16:44:54 +08:00
|
|
|
|
2017-02-07 18:28:20 +08:00
|
|
|
struct TextEdit {
|
|
|
|
/// The range of the text document to be manipulated. To insert
|
|
|
|
/// text into a document create a range where start === end.
|
|
|
|
Range range;
|
|
|
|
|
|
|
|
/// The string to be inserted. For delete operations use an
|
|
|
|
/// empty string.
|
|
|
|
std::string newText;
|
2018-08-08 16:59:29 +08:00
|
|
|
|
|
|
|
bool operator==(const TextEdit &rhs) const {
|
|
|
|
return newText == rhs.newText && range == rhs.range;
|
|
|
|
}
|
2017-02-07 18:28:20 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, TextEdit &);
|
|
|
|
llvm::json::Value toJSON(const TextEdit &);
|
2018-01-26 01:29:17 +08:00
|
|
|
llvm::raw_ostream &operator<<(llvm::raw_ostream &, const TextEdit &);
|
2017-02-07 18:28:20 +08:00
|
|
|
|
|
|
|
struct TextDocumentItem {
|
|
|
|
/// The text document's URI.
|
2018-01-29 23:37:46 +08:00
|
|
|
URIForFile uri;
|
2017-02-07 18:28:20 +08:00
|
|
|
|
|
|
|
/// The text document's language identifier.
|
|
|
|
std::string languageId;
|
|
|
|
|
|
|
|
/// The version number of this document (it will strictly increase after each
|
2018-02-14 18:52:04 +08:00
|
|
|
int version = 0;
|
2017-02-07 18:28:20 +08:00
|
|
|
|
|
|
|
/// The content of the opened text document.
|
|
|
|
std::string text;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, TextDocumentItem &);
|
2017-02-07 18:28:20 +08:00
|
|
|
|
2017-09-27 23:31:17 +08:00
|
|
|
enum class TraceLevel {
|
|
|
|
Off = 0,
|
|
|
|
Messages = 1,
|
|
|
|
Verbose = 2,
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &E, TraceLevel &Out);
|
2017-09-27 23:31:17 +08:00
|
|
|
|
2017-12-01 05:32:29 +08:00
|
|
|
struct NoParams {};
|
2018-07-09 22:25:59 +08:00
|
|
|
inline bool fromJSON(const llvm::json::Value &, NoParams &) { return true; }
|
2017-10-12 21:29:58 +08:00
|
|
|
using ShutdownParams = NoParams;
|
2017-10-25 16:45:41 +08:00
|
|
|
using ExitParams = NoParams;
|
2017-10-12 21:29:58 +08:00
|
|
|
|
[clangd] Support incremental document syncing
Summary:
This patch adds support for incremental document syncing, as described
in the LSP spec. The protocol specifies ranges in terms of Position (a
line and a character), and our drafts are stored as plain strings. So I
see two things that may not be super efficient for very large files:
- Converting a Position to an offset (the positionToOffset function)
requires searching for end of lines until we reach the desired line.
- When we update a range, we construct a new string, which implies
copying the whole document.
However, for the typical size of a C++ document and the frequency of
update (at which a user types), it may not be an issue. This patch aims
at getting the basic feature in, and we can always improve it later if
we find it's too slow.
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Reviewers: malaperle, ilya-biryukov
Reviewed By: ilya-biryukov
Subscribers: MaskRay, klimek, mgorny, ilya-biryukov, jkorous-apple, ioeric, cfe-commits
Differential Revision: https://reviews.llvm.org/D44272
llvm-svn: 328500
2018-03-26 22:41:40 +08:00
|
|
|
/// Defines how the host (editor) should sync document changes to the language
|
|
|
|
/// server.
|
|
|
|
enum class TextDocumentSyncKind {
|
|
|
|
/// Documents should not be synced at all.
|
|
|
|
None = 0,
|
|
|
|
|
|
|
|
/// Documents are synced by always sending the full content of the document.
|
|
|
|
Full = 1,
|
|
|
|
|
|
|
|
/// Documents are synced by sending the full content on open. After that
|
|
|
|
/// only incremental updates to the document are send.
|
|
|
|
Incremental = 2,
|
|
|
|
};
|
|
|
|
|
2018-02-15 22:32:57 +08:00
|
|
|
struct CompletionItemClientCapabilities {
|
|
|
|
/// Client supports snippets as insert text.
|
|
|
|
bool snippetSupport = false;
|
|
|
|
/// Client supports commit characters on a completion item.
|
|
|
|
bool commitCharacterSupport = false;
|
|
|
|
// Client supports the follow content formats for the documentation property.
|
|
|
|
// The order describes the preferred format of the client.
|
|
|
|
// NOTE: not used by clangd at the moment.
|
|
|
|
// std::vector<MarkupKind> documentationFormat;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, CompletionItemClientCapabilities &);
|
2018-02-15 22:32:57 +08:00
|
|
|
|
2018-09-28 01:13:07 +08:00
|
|
|
/// The kind of a completion entry.
|
|
|
|
enum class CompletionItemKind {
|
|
|
|
Missing = 0,
|
|
|
|
Text = 1,
|
|
|
|
Method = 2,
|
|
|
|
Function = 3,
|
|
|
|
Constructor = 4,
|
|
|
|
Field = 5,
|
|
|
|
Variable = 6,
|
|
|
|
Class = 7,
|
|
|
|
Interface = 8,
|
|
|
|
Module = 9,
|
|
|
|
Property = 10,
|
|
|
|
Unit = 11,
|
|
|
|
Value = 12,
|
|
|
|
Enum = 13,
|
|
|
|
Keyword = 14,
|
|
|
|
Snippet = 15,
|
|
|
|
Color = 16,
|
|
|
|
File = 17,
|
|
|
|
Reference = 18,
|
|
|
|
Folder = 19,
|
|
|
|
EnumMember = 20,
|
|
|
|
Constant = 21,
|
|
|
|
Struct = 22,
|
|
|
|
Event = 23,
|
|
|
|
Operator = 24,
|
|
|
|
TypeParameter = 25,
|
|
|
|
};
|
|
|
|
bool fromJSON(const llvm::json::Value &, CompletionItemKind &);
|
|
|
|
|
|
|
|
struct CompletionItemKindCapabilities {
|
|
|
|
/// The CompletionItemKinds that the client supports. If not set, the client
|
|
|
|
/// only supports <= CompletionItemKind::Reference and will not fall back to a
|
|
|
|
/// valid default value.
|
|
|
|
llvm::Optional<std::vector<CompletionItemKind>> valueSet;
|
|
|
|
};
|
|
|
|
// Discards unknown CompletionItemKinds.
|
|
|
|
bool fromJSON(const llvm::json::Value &, std::vector<CompletionItemKind> &);
|
|
|
|
bool fromJSON(const llvm::json::Value &, CompletionItemKindCapabilities &);
|
|
|
|
|
|
|
|
constexpr auto CompletionItemKindMin =
|
|
|
|
static_cast<size_t>(CompletionItemKind::Text);
|
|
|
|
constexpr auto CompletionItemKindMax =
|
|
|
|
static_cast<size_t>(CompletionItemKind::TypeParameter);
|
|
|
|
using CompletionItemKindBitset = std::bitset<CompletionItemKindMax + 1>;
|
|
|
|
CompletionItemKind
|
|
|
|
adjustKindToCapability(CompletionItemKind Kind,
|
|
|
|
CompletionItemKindBitset &supportedCompletionItemKinds);
|
|
|
|
|
2018-02-15 22:32:57 +08:00
|
|
|
struct CompletionClientCapabilities {
|
|
|
|
/// Whether completion supports dynamic registration.
|
|
|
|
bool dynamicRegistration = false;
|
|
|
|
/// The client supports the following `CompletionItem` specific capabilities.
|
|
|
|
CompletionItemClientCapabilities completionItem;
|
2018-09-28 01:13:07 +08:00
|
|
|
/// The CompletionItemKinds that the client supports. If not set, the client
|
|
|
|
/// only supports <= CompletionItemKind::Reference and will not fall back to a
|
|
|
|
/// valid default value.
|
|
|
|
llvm::Optional<CompletionItemKindCapabilities> completionItemKind;
|
2018-02-15 22:32:57 +08:00
|
|
|
|
|
|
|
/// The client supports to send additional context information for a
|
|
|
|
/// `textDocument/completion` request.
|
|
|
|
bool contextSupport = false;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, CompletionClientCapabilities &);
|
2018-02-15 22:32:57 +08:00
|
|
|
|
2018-08-11 01:25:07 +08:00
|
|
|
struct PublishDiagnosticsClientCapabilities {
|
|
|
|
// Whether the client accepts diagnostics with related information.
|
|
|
|
// NOTE: not used by clangd at the moment.
|
|
|
|
// bool relatedInformation;
|
|
|
|
|
|
|
|
/// Whether the client accepts diagnostics with fixes attached using the
|
|
|
|
/// "clangd_fixes" extension.
|
|
|
|
bool clangdFixSupport = false;
|
2018-08-23 04:30:06 +08:00
|
|
|
|
|
|
|
/// Whether the client accepts diagnostics with category attached to it
|
|
|
|
/// using the "category" extension.
|
|
|
|
bool categorySupport = false;
|
2018-08-11 01:25:07 +08:00
|
|
|
};
|
|
|
|
bool fromJSON(const llvm::json::Value &,
|
|
|
|
PublishDiagnosticsClientCapabilities &);
|
|
|
|
|
[clangd] Implementation of workspace/symbol request
Summary:
This is a basic implementation of the "workspace/symbol" request which is
used to find symbols by a string query. Since this is similar to code completion
in terms of result, this implementation reuses the "fuzzyFind" in order to get
matches. For now, the scoring algorithm is the same as code completion and
improvements could be done in the future.
The index model doesn't contain quite enough symbols for this to cover
common symbols like methods, enum class enumerators, functions in unamed
namespaces, etc. The index model will be augmented separately to achieve this.
Reviewers: sammccall, ilya-biryukov
Reviewed By: sammccall
Subscribers: jkorous, hokein, simark, sammccall, klimek, mgorny, ilya-biryukov, mgrang, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44882
llvm-svn: 330637
2018-04-24 04:00:52 +08:00
|
|
|
/// A symbol kind.
|
|
|
|
enum class SymbolKind {
|
|
|
|
File = 1,
|
|
|
|
Module = 2,
|
|
|
|
Namespace = 3,
|
|
|
|
Package = 4,
|
|
|
|
Class = 5,
|
|
|
|
Method = 6,
|
|
|
|
Property = 7,
|
|
|
|
Field = 8,
|
|
|
|
Constructor = 9,
|
|
|
|
Enum = 10,
|
|
|
|
Interface = 11,
|
|
|
|
Function = 12,
|
|
|
|
Variable = 13,
|
|
|
|
Constant = 14,
|
|
|
|
String = 15,
|
|
|
|
Number = 16,
|
|
|
|
Boolean = 17,
|
|
|
|
Array = 18,
|
|
|
|
Object = 19,
|
|
|
|
Key = 20,
|
|
|
|
Null = 21,
|
|
|
|
EnumMember = 22,
|
|
|
|
Struct = 23,
|
|
|
|
Event = 24,
|
|
|
|
Operator = 25,
|
|
|
|
TypeParameter = 26
|
|
|
|
};
|
|
|
|
|
|
|
|
constexpr auto SymbolKindMin = static_cast<size_t>(SymbolKind::File);
|
|
|
|
constexpr auto SymbolKindMax = static_cast<size_t>(SymbolKind::TypeParameter);
|
|
|
|
using SymbolKindBitset = std::bitset<SymbolKindMax + 1>;
|
|
|
|
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, SymbolKind &);
|
[clangd] Implementation of workspace/symbol request
Summary:
This is a basic implementation of the "workspace/symbol" request which is
used to find symbols by a string query. Since this is similar to code completion
in terms of result, this implementation reuses the "fuzzyFind" in order to get
matches. For now, the scoring algorithm is the same as code completion and
improvements could be done in the future.
The index model doesn't contain quite enough symbols for this to cover
common symbols like methods, enum class enumerators, functions in unamed
namespaces, etc. The index model will be augmented separately to achieve this.
Reviewers: sammccall, ilya-biryukov
Reviewed By: sammccall
Subscribers: jkorous, hokein, simark, sammccall, klimek, mgorny, ilya-biryukov, mgrang, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44882
llvm-svn: 330637
2018-04-24 04:00:52 +08:00
|
|
|
|
|
|
|
struct SymbolKindCapabilities {
|
|
|
|
/// The SymbolKinds that the client supports. If not set, the client only
|
|
|
|
/// supports <= SymbolKind::Array and will not fall back to a valid default
|
|
|
|
/// value.
|
|
|
|
llvm::Optional<std::vector<SymbolKind>> valueSet;
|
|
|
|
};
|
2018-09-28 01:13:07 +08:00
|
|
|
// Discards unknown SymbolKinds.
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, std::vector<SymbolKind> &);
|
|
|
|
bool fromJSON(const llvm::json::Value &, SymbolKindCapabilities &);
|
[clangd] Implementation of workspace/symbol request
Summary:
This is a basic implementation of the "workspace/symbol" request which is
used to find symbols by a string query. Since this is similar to code completion
in terms of result, this implementation reuses the "fuzzyFind" in order to get
matches. For now, the scoring algorithm is the same as code completion and
improvements could be done in the future.
The index model doesn't contain quite enough symbols for this to cover
common symbols like methods, enum class enumerators, functions in unamed
namespaces, etc. The index model will be augmented separately to achieve this.
Reviewers: sammccall, ilya-biryukov
Reviewed By: sammccall
Subscribers: jkorous, hokein, simark, sammccall, klimek, mgorny, ilya-biryukov, mgrang, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44882
llvm-svn: 330637
2018-04-24 04:00:52 +08:00
|
|
|
SymbolKind adjustKindToCapability(SymbolKind Kind,
|
|
|
|
SymbolKindBitset &supportedSymbolKinds);
|
|
|
|
|
|
|
|
struct WorkspaceSymbolCapabilities {
|
|
|
|
/// Capabilities SymbolKind.
|
|
|
|
llvm::Optional<SymbolKindCapabilities> symbolKind;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, WorkspaceSymbolCapabilities &);
|
[clangd] Implementation of workspace/symbol request
Summary:
This is a basic implementation of the "workspace/symbol" request which is
used to find symbols by a string query. Since this is similar to code completion
in terms of result, this implementation reuses the "fuzzyFind" in order to get
matches. For now, the scoring algorithm is the same as code completion and
improvements could be done in the future.
The index model doesn't contain quite enough symbols for this to cover
common symbols like methods, enum class enumerators, functions in unamed
namespaces, etc. The index model will be augmented separately to achieve this.
Reviewers: sammccall, ilya-biryukov
Reviewed By: sammccall
Subscribers: jkorous, hokein, simark, sammccall, klimek, mgorny, ilya-biryukov, mgrang, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44882
llvm-svn: 330637
2018-04-24 04:00:52 +08:00
|
|
|
|
|
|
|
// FIXME: most of the capabilities are missing from this struct. Only the ones
|
|
|
|
// used by clangd are currently there.
|
|
|
|
struct WorkspaceClientCapabilities {
|
|
|
|
/// Capabilities specific to `workspace/symbol`.
|
|
|
|
llvm::Optional<WorkspaceSymbolCapabilities> symbol;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, WorkspaceClientCapabilities &);
|
[clangd] Implementation of workspace/symbol request
Summary:
This is a basic implementation of the "workspace/symbol" request which is
used to find symbols by a string query. Since this is similar to code completion
in terms of result, this implementation reuses the "fuzzyFind" in order to get
matches. For now, the scoring algorithm is the same as code completion and
improvements could be done in the future.
The index model doesn't contain quite enough symbols for this to cover
common symbols like methods, enum class enumerators, functions in unamed
namespaces, etc. The index model will be augmented separately to achieve this.
Reviewers: sammccall, ilya-biryukov
Reviewed By: sammccall
Subscribers: jkorous, hokein, simark, sammccall, klimek, mgorny, ilya-biryukov, mgrang, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44882
llvm-svn: 330637
2018-04-24 04:00:52 +08:00
|
|
|
|
2018-02-15 22:32:57 +08:00
|
|
|
// FIXME: most of the capabilities are missing from this struct. Only the ones
|
|
|
|
// used by clangd are currently there.
|
|
|
|
struct TextDocumentClientCapabilities {
|
|
|
|
/// Capabilities specific to the `textDocument/completion`
|
|
|
|
CompletionClientCapabilities completion;
|
2018-08-11 01:25:07 +08:00
|
|
|
|
|
|
|
/// Capabilities specific to the 'textDocument/publishDiagnostics'
|
|
|
|
PublishDiagnosticsClientCapabilities publishDiagnostics;
|
2018-02-15 22:32:57 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, TextDocumentClientCapabilities &);
|
2018-02-15 22:32:57 +08:00
|
|
|
|
|
|
|
struct ClientCapabilities {
|
|
|
|
// Workspace specific client capabilities.
|
[clangd] Implementation of workspace/symbol request
Summary:
This is a basic implementation of the "workspace/symbol" request which is
used to find symbols by a string query. Since this is similar to code completion
in terms of result, this implementation reuses the "fuzzyFind" in order to get
matches. For now, the scoring algorithm is the same as code completion and
improvements could be done in the future.
The index model doesn't contain quite enough symbols for this to cover
common symbols like methods, enum class enumerators, functions in unamed
namespaces, etc. The index model will be augmented separately to achieve this.
Reviewers: sammccall, ilya-biryukov
Reviewed By: sammccall
Subscribers: jkorous, hokein, simark, sammccall, klimek, mgorny, ilya-biryukov, mgrang, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44882
llvm-svn: 330637
2018-04-24 04:00:52 +08:00
|
|
|
llvm::Optional<WorkspaceClientCapabilities> workspace;
|
2018-02-15 22:32:57 +08:00
|
|
|
|
|
|
|
// Text document specific client capabilities.
|
|
|
|
TextDocumentClientCapabilities textDocument;
|
|
|
|
};
|
|
|
|
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, ClientCapabilities &);
|
2018-02-15 22:32:57 +08:00
|
|
|
|
2018-08-02 01:39:29 +08:00
|
|
|
/// Clangd extension that's used in the 'compilationDatabaseChanges' in
|
|
|
|
/// workspace/didChangeConfiguration to record updates to the in-memory
|
|
|
|
/// compilation database.
|
|
|
|
struct ClangdCompileCommand {
|
|
|
|
std::string workingDirectory;
|
|
|
|
std::vector<std::string> compilationCommand;
|
|
|
|
};
|
|
|
|
bool fromJSON(const llvm::json::Value &, ClangdCompileCommand &);
|
|
|
|
|
2018-08-01 19:28:49 +08:00
|
|
|
/// Clangd extension to set clangd-specific "initializationOptions" in the
|
|
|
|
/// "initialize" request and for the "workspace/didChangeConfiguration"
|
|
|
|
/// notification since the data received is described as 'any' type in LSP.
|
|
|
|
struct ClangdConfigurationParamsChange {
|
|
|
|
llvm::Optional<std::string> compilationDatabasePath;
|
2018-08-02 01:39:29 +08:00
|
|
|
|
|
|
|
// The changes that happened to the compilation database.
|
|
|
|
// The key of the map is a file name.
|
|
|
|
llvm::Optional<std::map<std::string, ClangdCompileCommand>>
|
|
|
|
compilationDatabaseChanges;
|
2018-08-01 19:28:49 +08:00
|
|
|
};
|
|
|
|
bool fromJSON(const llvm::json::Value &, ClangdConfigurationParamsChange &);
|
|
|
|
|
|
|
|
struct ClangdInitializationOptions : public ClangdConfigurationParamsChange {};
|
|
|
|
|
2017-09-27 23:31:17 +08:00
|
|
|
struct InitializeParams {
|
|
|
|
/// The process Id of the parent process that started
|
|
|
|
/// the server. Is null if the process has not been started by another
|
|
|
|
/// process. If the parent process is not alive then the server should exit
|
|
|
|
/// (see exit notification) its process.
|
|
|
|
llvm::Optional<int> processId;
|
|
|
|
|
|
|
|
/// The rootPath of the workspace. Is null
|
|
|
|
/// if no folder is open.
|
|
|
|
///
|
|
|
|
/// @deprecated in favour of rootUri.
|
|
|
|
llvm::Optional<std::string> rootPath;
|
|
|
|
|
|
|
|
/// The rootUri of the workspace. Is null if no
|
|
|
|
/// folder is open. If both `rootPath` and `rootUri` are set
|
|
|
|
/// `rootUri` wins.
|
2018-01-29 23:37:46 +08:00
|
|
|
llvm::Optional<URIForFile> rootUri;
|
2017-09-27 23:31:17 +08:00
|
|
|
|
|
|
|
// User provided initialization options.
|
|
|
|
// initializationOptions?: any;
|
|
|
|
|
|
|
|
/// The capabilities provided by the client (editor or tool)
|
2018-02-15 22:32:57 +08:00
|
|
|
ClientCapabilities capabilities;
|
2017-09-27 23:31:17 +08:00
|
|
|
|
|
|
|
/// The initial trace setting. If omitted trace is disabled ('off').
|
|
|
|
llvm::Optional<TraceLevel> trace;
|
2018-08-01 19:28:49 +08:00
|
|
|
|
|
|
|
// We use this predefined struct because it is easier to use
|
|
|
|
// than the protocol specified type of 'any'.
|
|
|
|
llvm::Optional<ClangdInitializationOptions> initializationOptions;
|
2017-09-27 23:31:17 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, InitializeParams &);
|
2017-09-27 23:31:17 +08:00
|
|
|
|
2017-02-07 18:28:20 +08:00
|
|
|
struct DidOpenTextDocumentParams {
|
|
|
|
/// The document that was opened.
|
|
|
|
TextDocumentItem textDocument;
|
|
|
|
|
2017-07-06 16:44:54 +08:00
|
|
|
/// Extension storing per-file metadata, such as compilation flags.
|
|
|
|
llvm::Optional<Metadata> metadata;
|
2017-02-07 18:28:20 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, DidOpenTextDocumentParams &);
|
2017-02-07 18:28:20 +08:00
|
|
|
|
2017-04-10 21:31:39 +08:00
|
|
|
struct DidCloseTextDocumentParams {
|
|
|
|
/// The document that was closed.
|
|
|
|
TextDocumentIdentifier textDocument;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, DidCloseTextDocumentParams &);
|
2017-04-10 21:31:39 +08:00
|
|
|
|
2017-02-07 18:28:20 +08:00
|
|
|
struct TextDocumentContentChangeEvent {
|
[clangd] Support incremental document syncing
Summary:
This patch adds support for incremental document syncing, as described
in the LSP spec. The protocol specifies ranges in terms of Position (a
line and a character), and our drafts are stored as plain strings. So I
see two things that may not be super efficient for very large files:
- Converting a Position to an offset (the positionToOffset function)
requires searching for end of lines until we reach the desired line.
- When we update a range, we construct a new string, which implies
copying the whole document.
However, for the typical size of a C++ document and the frequency of
update (at which a user types), it may not be an issue. This patch aims
at getting the basic feature in, and we can always improve it later if
we find it's too slow.
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Reviewers: malaperle, ilya-biryukov
Reviewed By: ilya-biryukov
Subscribers: MaskRay, klimek, mgorny, ilya-biryukov, jkorous-apple, ioeric, cfe-commits
Differential Revision: https://reviews.llvm.org/D44272
llvm-svn: 328500
2018-03-26 22:41:40 +08:00
|
|
|
/// The range of the document that changed.
|
|
|
|
llvm::Optional<Range> range;
|
|
|
|
|
|
|
|
/// The length of the range that got replaced.
|
|
|
|
llvm::Optional<int> rangeLength;
|
|
|
|
|
|
|
|
/// The new text of the range/document.
|
2017-02-07 18:28:20 +08:00
|
|
|
std::string text;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, TextDocumentContentChangeEvent &);
|
2017-02-07 18:28:20 +08:00
|
|
|
|
|
|
|
struct DidChangeTextDocumentParams {
|
|
|
|
/// The document that did change. The version number points
|
|
|
|
/// to the version after all provided content changes have
|
|
|
|
/// been applied.
|
|
|
|
TextDocumentIdentifier textDocument;
|
|
|
|
|
|
|
|
/// The actual content changes.
|
|
|
|
std::vector<TextDocumentContentChangeEvent> contentChanges;
|
2018-02-23 02:40:39 +08:00
|
|
|
|
|
|
|
/// Forces diagnostics to be generated, or to not be generated, for this
|
|
|
|
/// version of the file. If not set, diagnostics are eventually consistent:
|
|
|
|
/// either they will be provided for this version or some subsequent one.
|
|
|
|
/// This is a clangd extension.
|
|
|
|
llvm::Optional<bool> wantDiagnostics;
|
2017-02-07 18:28:20 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, DidChangeTextDocumentParams &);
|
2017-02-07 18:28:20 +08:00
|
|
|
|
2017-10-03 02:00:37 +08:00
|
|
|
enum class FileChangeType {
|
|
|
|
/// The file got created.
|
|
|
|
Created = 1,
|
|
|
|
/// The file got changed.
|
|
|
|
Changed = 2,
|
|
|
|
/// The file got deleted.
|
|
|
|
Deleted = 3
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &E, FileChangeType &Out);
|
2017-10-03 02:00:37 +08:00
|
|
|
|
|
|
|
struct FileEvent {
|
|
|
|
/// The file's URI.
|
2018-01-29 23:37:46 +08:00
|
|
|
URIForFile uri;
|
2017-10-03 02:00:37 +08:00
|
|
|
/// The change type.
|
2018-02-14 18:52:04 +08:00
|
|
|
FileChangeType type = FileChangeType::Created;
|
2017-10-03 02:00:37 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, FileEvent &);
|
2017-10-03 02:00:37 +08:00
|
|
|
|
|
|
|
struct DidChangeWatchedFilesParams {
|
|
|
|
/// The actual file events.
|
|
|
|
std::vector<FileEvent> changes;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, DidChangeWatchedFilesParams &);
|
2017-10-03 02:00:37 +08:00
|
|
|
|
[clangd] DidChangeConfiguration Notification
Summary:
Implementation of DidChangeConfiguration notification handling in
clangd. This currently only supports changing one setting: the path of
the compilation database to be used for the current project. In other
words, it is no longer necessary to restart clangd with a different
command line argument in order to change the compilation database.
Reviewers: malaperle, krasimir, bkramer, ilya-biryukov
Subscribers: jkorous-apple, ioeric, simark, klimek, ilya-biryukov, arphaman, rwols, cfe-commits
Differential Revision: https://reviews.llvm.org/D39571
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Signed-off-by: William Enright <william.enright@polymtl.ca>
llvm-svn: 325784
2018-02-22 22:00:39 +08:00
|
|
|
struct DidChangeConfigurationParams {
|
|
|
|
// We use this predefined struct because it is easier to use
|
|
|
|
// than the protocol specified type of 'any'.
|
|
|
|
ClangdConfigurationParamsChange settings;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, DidChangeConfigurationParams &);
|
[clangd] DidChangeConfiguration Notification
Summary:
Implementation of DidChangeConfiguration notification handling in
clangd. This currently only supports changing one setting: the path of
the compilation database to be used for the current project. In other
words, it is no longer necessary to restart clangd with a different
command line argument in order to change the compilation database.
Reviewers: malaperle, krasimir, bkramer, ilya-biryukov
Subscribers: jkorous-apple, ioeric, simark, klimek, ilya-biryukov, arphaman, rwols, cfe-commits
Differential Revision: https://reviews.llvm.org/D39571
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Signed-off-by: William Enright <william.enright@polymtl.ca>
llvm-svn: 325784
2018-02-22 22:00:39 +08:00
|
|
|
|
2017-02-07 18:28:20 +08:00
|
|
|
struct FormattingOptions {
|
|
|
|
/// Size of a tab in spaces.
|
2018-02-14 18:52:04 +08:00
|
|
|
int tabSize = 0;
|
2017-02-07 18:28:20 +08:00
|
|
|
|
|
|
|
/// Prefer spaces over tabs.
|
2018-02-14 18:52:04 +08:00
|
|
|
bool insertSpaces = false;
|
2017-02-07 18:28:20 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, FormattingOptions &);
|
|
|
|
llvm::json::Value toJSON(const FormattingOptions &);
|
2017-02-07 18:28:20 +08:00
|
|
|
|
|
|
|
struct DocumentRangeFormattingParams {
|
|
|
|
/// The document to format.
|
|
|
|
TextDocumentIdentifier textDocument;
|
|
|
|
|
|
|
|
/// The range to format
|
|
|
|
Range range;
|
|
|
|
|
|
|
|
/// The format options
|
|
|
|
FormattingOptions options;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, DocumentRangeFormattingParams &);
|
2017-02-07 18:28:20 +08:00
|
|
|
|
2017-02-16 18:49:46 +08:00
|
|
|
struct DocumentOnTypeFormattingParams {
|
|
|
|
/// The document to format.
|
|
|
|
TextDocumentIdentifier textDocument;
|
|
|
|
|
|
|
|
/// The position at which this request was sent.
|
|
|
|
Position position;
|
|
|
|
|
|
|
|
/// The character that has been typed.
|
|
|
|
std::string ch;
|
|
|
|
|
|
|
|
/// The format options.
|
|
|
|
FormattingOptions options;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, DocumentOnTypeFormattingParams &);
|
2017-02-16 18:49:46 +08:00
|
|
|
|
2017-02-07 18:28:20 +08:00
|
|
|
struct DocumentFormattingParams {
|
|
|
|
/// The document to format.
|
|
|
|
TextDocumentIdentifier textDocument;
|
|
|
|
|
|
|
|
/// The format options
|
|
|
|
FormattingOptions options;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, DocumentFormattingParams &);
|
2017-02-07 18:28:20 +08:00
|
|
|
|
2018-07-06 03:35:01 +08:00
|
|
|
struct DocumentSymbolParams {
|
|
|
|
// The text document to find symbols in.
|
|
|
|
TextDocumentIdentifier textDocument;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, DocumentSymbolParams &);
|
2018-07-06 03:35:01 +08:00
|
|
|
|
2017-03-02 00:16:29 +08:00
|
|
|
struct Diagnostic {
|
|
|
|
/// The range at which the message applies.
|
|
|
|
Range range;
|
|
|
|
|
|
|
|
/// The diagnostic's severity. Can be omitted. If omitted it is up to the
|
|
|
|
/// client to interpret diagnostics as error, warning, info or hint.
|
2018-02-14 18:52:04 +08:00
|
|
|
int severity = 0;
|
2017-03-02 00:16:29 +08:00
|
|
|
|
2017-09-18 23:02:59 +08:00
|
|
|
/// The diagnostic's code. Can be omitted.
|
|
|
|
/// Note: Not currently used by clangd
|
|
|
|
// std::string code;
|
|
|
|
|
|
|
|
/// A human-readable string describing the source of this
|
|
|
|
/// diagnostic, e.g. 'typescript' or 'super lint'.
|
|
|
|
/// Note: Not currently used by clangd
|
|
|
|
// std::string source;
|
|
|
|
|
2017-03-02 00:16:29 +08:00
|
|
|
/// The diagnostic's message.
|
|
|
|
std::string message;
|
2018-08-15 06:21:40 +08:00
|
|
|
|
|
|
|
/// The diagnostic's category. Can be omitted.
|
|
|
|
/// An LSP extension that's used to send the name of the category over to the
|
|
|
|
/// client. The category typically describes the compilation stage during
|
|
|
|
/// which the issue was produced, e.g. "Semantic Issue" or "Parse Issue".
|
|
|
|
std::string category;
|
2017-12-20 04:52:56 +08:00
|
|
|
};
|
2018-03-12 23:28:22 +08:00
|
|
|
|
2017-12-20 04:52:56 +08:00
|
|
|
/// A LSP-specific comparator used to find diagnostic in a container like
|
|
|
|
/// std:map.
|
|
|
|
/// We only use the required fields of Diagnostic to do the comparsion to avoid
|
|
|
|
/// any regression issues from LSP clients (e.g. VScode), see
|
|
|
|
/// https://git.io/vbr29
|
|
|
|
struct LSPDiagnosticCompare {
|
2018-03-12 23:28:22 +08:00
|
|
|
bool operator()(const Diagnostic &LHS, const Diagnostic &RHS) const {
|
2017-12-20 04:52:56 +08:00
|
|
|
return std::tie(LHS.range, LHS.message) < std::tie(RHS.range, RHS.message);
|
2017-03-02 00:16:29 +08:00
|
|
|
}
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, Diagnostic &);
|
2018-01-26 01:29:17 +08:00
|
|
|
llvm::raw_ostream &operator<<(llvm::raw_ostream &, const Diagnostic &);
|
2017-03-02 00:16:29 +08:00
|
|
|
|
|
|
|
struct CodeActionContext {
|
|
|
|
/// An array of diagnostics.
|
|
|
|
std::vector<Diagnostic> diagnostics;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, CodeActionContext &);
|
2017-03-02 00:16:29 +08:00
|
|
|
|
|
|
|
struct CodeActionParams {
|
|
|
|
/// The document in which the command was invoked.
|
|
|
|
TextDocumentIdentifier textDocument;
|
|
|
|
|
|
|
|
/// The range for which the command was invoked.
|
|
|
|
Range range;
|
|
|
|
|
|
|
|
/// Context carrying additional information.
|
|
|
|
CodeActionContext context;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, CodeActionParams &);
|
2017-03-02 00:16:29 +08:00
|
|
|
|
[clangd] Handle clangd.applyFix server-side
Summary:
When the user selects a fix-it (or any code action with commands), it is
possible to let the client forward the selected command to the server.
When the clangd.applyFix command is handled on the server, it can send a
workspace/applyEdit request to the client. This has the advantage that
the client doesn't explicitly have to know how to handle
clangd.applyFix. Therefore, the code to handle clangd.applyFix in the VS
Code extension (and any other Clangd client) is not required anymore.
Reviewers: ilya-biryukov, sammccall, Nebiroth, hokein
Reviewed By: hokein
Subscribers: ioeric, hokein, rwols, puremourning, bkramer, ilya-biryukov
Tags: #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D39276
llvm-svn: 317322
2017-11-03 21:39:15 +08:00
|
|
|
struct WorkspaceEdit {
|
|
|
|
/// Holds changes to existing resources.
|
|
|
|
llvm::Optional<std::map<std::string, std::vector<TextEdit>>> changes;
|
|
|
|
|
|
|
|
/// Note: "documentChanges" is not currently used because currently there is
|
|
|
|
/// no support for versioned edits.
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, WorkspaceEdit &);
|
|
|
|
llvm::json::Value toJSON(const WorkspaceEdit &WE);
|
[clangd] Handle clangd.applyFix server-side
Summary:
When the user selects a fix-it (or any code action with commands), it is
possible to let the client forward the selected command to the server.
When the clangd.applyFix command is handled on the server, it can send a
workspace/applyEdit request to the client. This has the advantage that
the client doesn't explicitly have to know how to handle
clangd.applyFix. Therefore, the code to handle clangd.applyFix in the VS
Code extension (and any other Clangd client) is not required anymore.
Reviewers: ilya-biryukov, sammccall, Nebiroth, hokein
Reviewed By: hokein
Subscribers: ioeric, hokein, rwols, puremourning, bkramer, ilya-biryukov
Tags: #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D39276
llvm-svn: 317322
2017-11-03 21:39:15 +08:00
|
|
|
|
|
|
|
/// Exact commands are not specified in the protocol so we define the
|
|
|
|
/// ones supported by Clangd here. The protocol specifies the command arguments
|
|
|
|
/// to be "any[]" but to make this safer and more manageable, each command we
|
|
|
|
/// handle maps to a certain llvm::Optional of some struct to contain its
|
|
|
|
/// arguments. Different commands could reuse the same llvm::Optional as
|
|
|
|
/// arguments but a command that needs different arguments would simply add a
|
|
|
|
/// new llvm::Optional and not use any other ones. In practice this means only
|
|
|
|
/// one argument type will be parsed and set.
|
|
|
|
struct ExecuteCommandParams {
|
|
|
|
// Command to apply fix-its. Uses WorkspaceEdit as argument.
|
2017-12-28 23:03:02 +08:00
|
|
|
const static llvm::StringLiteral CLANGD_APPLY_FIX_COMMAND;
|
[clangd] Handle clangd.applyFix server-side
Summary:
When the user selects a fix-it (or any code action with commands), it is
possible to let the client forward the selected command to the server.
When the clangd.applyFix command is handled on the server, it can send a
workspace/applyEdit request to the client. This has the advantage that
the client doesn't explicitly have to know how to handle
clangd.applyFix. Therefore, the code to handle clangd.applyFix in the VS
Code extension (and any other Clangd client) is not required anymore.
Reviewers: ilya-biryukov, sammccall, Nebiroth, hokein
Reviewed By: hokein
Subscribers: ioeric, hokein, rwols, puremourning, bkramer, ilya-biryukov
Tags: #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D39276
llvm-svn: 317322
2017-11-03 21:39:15 +08:00
|
|
|
|
|
|
|
/// The command identifier, e.g. CLANGD_APPLY_FIX_COMMAND
|
|
|
|
std::string command;
|
|
|
|
|
|
|
|
// Arguments
|
|
|
|
llvm::Optional<WorkspaceEdit> workspaceEdit;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, ExecuteCommandParams &);
|
[clangd] Handle clangd.applyFix server-side
Summary:
When the user selects a fix-it (or any code action with commands), it is
possible to let the client forward the selected command to the server.
When the clangd.applyFix command is handled on the server, it can send a
workspace/applyEdit request to the client. This has the advantage that
the client doesn't explicitly have to know how to handle
clangd.applyFix. Therefore, the code to handle clangd.applyFix in the VS
Code extension (and any other Clangd client) is not required anymore.
Reviewers: ilya-biryukov, sammccall, Nebiroth, hokein
Reviewed By: hokein
Subscribers: ioeric, hokein, rwols, puremourning, bkramer, ilya-biryukov
Tags: #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D39276
llvm-svn: 317322
2017-11-03 21:39:15 +08:00
|
|
|
|
2018-02-16 22:15:55 +08:00
|
|
|
struct Command : public ExecuteCommandParams {
|
|
|
|
std::string title;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const Command &C);
|
2018-02-16 22:15:55 +08:00
|
|
|
|
[clangd] Implementation of workspace/symbol request
Summary:
This is a basic implementation of the "workspace/symbol" request which is
used to find symbols by a string query. Since this is similar to code completion
in terms of result, this implementation reuses the "fuzzyFind" in order to get
matches. For now, the scoring algorithm is the same as code completion and
improvements could be done in the future.
The index model doesn't contain quite enough symbols for this to cover
common symbols like methods, enum class enumerators, functions in unamed
namespaces, etc. The index model will be augmented separately to achieve this.
Reviewers: sammccall, ilya-biryukov
Reviewed By: sammccall
Subscribers: jkorous, hokein, simark, sammccall, klimek, mgorny, ilya-biryukov, mgrang, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44882
llvm-svn: 330637
2018-04-24 04:00:52 +08:00
|
|
|
/// Represents information about programming constructs like variables, classes,
|
|
|
|
/// interfaces etc.
|
|
|
|
struct SymbolInformation {
|
|
|
|
/// The name of this symbol.
|
|
|
|
std::string name;
|
|
|
|
|
|
|
|
/// The kind of this symbol.
|
|
|
|
SymbolKind kind;
|
|
|
|
|
|
|
|
/// The location of this symbol.
|
|
|
|
Location location;
|
|
|
|
|
|
|
|
/// The name of the symbol containing this symbol.
|
|
|
|
std::string containerName;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const SymbolInformation &);
|
[clangd] Implementation of workspace/symbol request
Summary:
This is a basic implementation of the "workspace/symbol" request which is
used to find symbols by a string query. Since this is similar to code completion
in terms of result, this implementation reuses the "fuzzyFind" in order to get
matches. For now, the scoring algorithm is the same as code completion and
improvements could be done in the future.
The index model doesn't contain quite enough symbols for this to cover
common symbols like methods, enum class enumerators, functions in unamed
namespaces, etc. The index model will be augmented separately to achieve this.
Reviewers: sammccall, ilya-biryukov
Reviewed By: sammccall
Subscribers: jkorous, hokein, simark, sammccall, klimek, mgorny, ilya-biryukov, mgrang, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44882
llvm-svn: 330637
2018-04-24 04:00:52 +08:00
|
|
|
llvm::raw_ostream &operator<<(llvm::raw_ostream &, const SymbolInformation &);
|
|
|
|
|
|
|
|
/// The parameters of a Workspace Symbol Request.
|
|
|
|
struct WorkspaceSymbolParams {
|
|
|
|
/// A non-empty query string
|
|
|
|
std::string query;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, WorkspaceSymbolParams &);
|
[clangd] Implementation of workspace/symbol request
Summary:
This is a basic implementation of the "workspace/symbol" request which is
used to find symbols by a string query. Since this is similar to code completion
in terms of result, this implementation reuses the "fuzzyFind" in order to get
matches. For now, the scoring algorithm is the same as code completion and
improvements could be done in the future.
The index model doesn't contain quite enough symbols for this to cover
common symbols like methods, enum class enumerators, functions in unamed
namespaces, etc. The index model will be augmented separately to achieve this.
Reviewers: sammccall, ilya-biryukov
Reviewed By: sammccall
Subscribers: jkorous, hokein, simark, sammccall, klimek, mgorny, ilya-biryukov, mgrang, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44882
llvm-svn: 330637
2018-04-24 04:00:52 +08:00
|
|
|
|
[clangd] Handle clangd.applyFix server-side
Summary:
When the user selects a fix-it (or any code action with commands), it is
possible to let the client forward the selected command to the server.
When the clangd.applyFix command is handled on the server, it can send a
workspace/applyEdit request to the client. This has the advantage that
the client doesn't explicitly have to know how to handle
clangd.applyFix. Therefore, the code to handle clangd.applyFix in the VS
Code extension (and any other Clangd client) is not required anymore.
Reviewers: ilya-biryukov, sammccall, Nebiroth, hokein
Reviewed By: hokein
Subscribers: ioeric, hokein, rwols, puremourning, bkramer, ilya-biryukov
Tags: #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D39276
llvm-svn: 317322
2017-11-03 21:39:15 +08:00
|
|
|
struct ApplyWorkspaceEditParams {
|
|
|
|
WorkspaceEdit edit;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const ApplyWorkspaceEditParams &);
|
[clangd] Handle clangd.applyFix server-side
Summary:
When the user selects a fix-it (or any code action with commands), it is
possible to let the client forward the selected command to the server.
When the clangd.applyFix command is handled on the server, it can send a
workspace/applyEdit request to the client. This has the advantage that
the client doesn't explicitly have to know how to handle
clangd.applyFix. Therefore, the code to handle clangd.applyFix in the VS
Code extension (and any other Clangd client) is not required anymore.
Reviewers: ilya-biryukov, sammccall, Nebiroth, hokein
Reviewed By: hokein
Subscribers: ioeric, hokein, rwols, puremourning, bkramer, ilya-biryukov
Tags: #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D39276
llvm-svn: 317322
2017-11-03 21:39:15 +08:00
|
|
|
|
2017-04-04 17:46:39 +08:00
|
|
|
struct TextDocumentPositionParams {
|
|
|
|
/// The text document.
|
|
|
|
TextDocumentIdentifier textDocument;
|
|
|
|
|
|
|
|
/// The position inside the text document.
|
|
|
|
Position position;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, TextDocumentPositionParams &);
|
2017-04-04 17:46:39 +08:00
|
|
|
|
[clangd] Implement textDocument/hover
Summary: Implemention of textDocument/hover as described in LSP definition.
This patch adds a basic Hover implementation. When hovering a variable,
function, method or namespace, clangd will return a text containing the
declaration's scope, as well as the declaration of the hovered entity.
For example, for a variable:
Declared in class Foo::Bar
int hello = 2
For macros, the macro definition is returned.
This patch doesn't include:
- markdown support (the client I use doesn't support it yet)
- range support (optional in the Hover response)
- comments associated to variables/functions/classes
They are kept as future work to keep this patch simpler.
I added tests in XRefsTests.cpp. hover.test contains one simple
smoketest to make sure the feature works from a black box perspective.
Reviewers: malaperle, krasimir, bkramer, ilya-biryukov
Subscribers: sammccall, mgrang, klimek, rwols, ilya-biryukov, arphaman, cfe-commits
Differential Revision: https://reviews.llvm.org/D35894
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Signed-off-by: William Enright <william.enright@polymtl.ca>
llvm-svn: 325395
2018-02-17 05:38:15 +08:00
|
|
|
enum class MarkupKind {
|
|
|
|
PlainText,
|
|
|
|
Markdown,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct MarkupContent {
|
2018-02-17 07:12:26 +08:00
|
|
|
MarkupKind kind = MarkupKind::PlainText;
|
|
|
|
std::string value;
|
[clangd] Implement textDocument/hover
Summary: Implemention of textDocument/hover as described in LSP definition.
This patch adds a basic Hover implementation. When hovering a variable,
function, method or namespace, clangd will return a text containing the
declaration's scope, as well as the declaration of the hovered entity.
For example, for a variable:
Declared in class Foo::Bar
int hello = 2
For macros, the macro definition is returned.
This patch doesn't include:
- markdown support (the client I use doesn't support it yet)
- range support (optional in the Hover response)
- comments associated to variables/functions/classes
They are kept as future work to keep this patch simpler.
I added tests in XRefsTests.cpp. hover.test contains one simple
smoketest to make sure the feature works from a black box perspective.
Reviewers: malaperle, krasimir, bkramer, ilya-biryukov
Subscribers: sammccall, mgrang, klimek, rwols, ilya-biryukov, arphaman, cfe-commits
Differential Revision: https://reviews.llvm.org/D35894
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Signed-off-by: William Enright <william.enright@polymtl.ca>
llvm-svn: 325395
2018-02-17 05:38:15 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const MarkupContent &MC);
|
[clangd] Implement textDocument/hover
Summary: Implemention of textDocument/hover as described in LSP definition.
This patch adds a basic Hover implementation. When hovering a variable,
function, method or namespace, clangd will return a text containing the
declaration's scope, as well as the declaration of the hovered entity.
For example, for a variable:
Declared in class Foo::Bar
int hello = 2
For macros, the macro definition is returned.
This patch doesn't include:
- markdown support (the client I use doesn't support it yet)
- range support (optional in the Hover response)
- comments associated to variables/functions/classes
They are kept as future work to keep this patch simpler.
I added tests in XRefsTests.cpp. hover.test contains one simple
smoketest to make sure the feature works from a black box perspective.
Reviewers: malaperle, krasimir, bkramer, ilya-biryukov
Subscribers: sammccall, mgrang, klimek, rwols, ilya-biryukov, arphaman, cfe-commits
Differential Revision: https://reviews.llvm.org/D35894
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Signed-off-by: William Enright <william.enright@polymtl.ca>
llvm-svn: 325395
2018-02-17 05:38:15 +08:00
|
|
|
|
|
|
|
struct Hover {
|
|
|
|
/// The hover's content
|
2018-02-17 07:12:26 +08:00
|
|
|
MarkupContent contents;
|
[clangd] Implement textDocument/hover
Summary: Implemention of textDocument/hover as described in LSP definition.
This patch adds a basic Hover implementation. When hovering a variable,
function, method or namespace, clangd will return a text containing the
declaration's scope, as well as the declaration of the hovered entity.
For example, for a variable:
Declared in class Foo::Bar
int hello = 2
For macros, the macro definition is returned.
This patch doesn't include:
- markdown support (the client I use doesn't support it yet)
- range support (optional in the Hover response)
- comments associated to variables/functions/classes
They are kept as future work to keep this patch simpler.
I added tests in XRefsTests.cpp. hover.test contains one simple
smoketest to make sure the feature works from a black box perspective.
Reviewers: malaperle, krasimir, bkramer, ilya-biryukov
Subscribers: sammccall, mgrang, klimek, rwols, ilya-biryukov, arphaman, cfe-commits
Differential Revision: https://reviews.llvm.org/D35894
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Signed-off-by: William Enright <william.enright@polymtl.ca>
llvm-svn: 325395
2018-02-17 05:38:15 +08:00
|
|
|
|
|
|
|
/// An optional range is a range inside a text document
|
|
|
|
/// that is used to visualize a hover, e.g. by changing the background color.
|
2018-02-17 07:12:26 +08:00
|
|
|
llvm::Optional<Range> range;
|
[clangd] Implement textDocument/hover
Summary: Implemention of textDocument/hover as described in LSP definition.
This patch adds a basic Hover implementation. When hovering a variable,
function, method or namespace, clangd will return a text containing the
declaration's scope, as well as the declaration of the hovered entity.
For example, for a variable:
Declared in class Foo::Bar
int hello = 2
For macros, the macro definition is returned.
This patch doesn't include:
- markdown support (the client I use doesn't support it yet)
- range support (optional in the Hover response)
- comments associated to variables/functions/classes
They are kept as future work to keep this patch simpler.
I added tests in XRefsTests.cpp. hover.test contains one simple
smoketest to make sure the feature works from a black box perspective.
Reviewers: malaperle, krasimir, bkramer, ilya-biryukov
Subscribers: sammccall, mgrang, klimek, rwols, ilya-biryukov, arphaman, cfe-commits
Differential Revision: https://reviews.llvm.org/D35894
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Signed-off-by: William Enright <william.enright@polymtl.ca>
llvm-svn: 325395
2018-02-17 05:38:15 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const Hover &H);
|
[clangd] Implement textDocument/hover
Summary: Implemention of textDocument/hover as described in LSP definition.
This patch adds a basic Hover implementation. When hovering a variable,
function, method or namespace, clangd will return a text containing the
declaration's scope, as well as the declaration of the hovered entity.
For example, for a variable:
Declared in class Foo::Bar
int hello = 2
For macros, the macro definition is returned.
This patch doesn't include:
- markdown support (the client I use doesn't support it yet)
- range support (optional in the Hover response)
- comments associated to variables/functions/classes
They are kept as future work to keep this patch simpler.
I added tests in XRefsTests.cpp. hover.test contains one simple
smoketest to make sure the feature works from a black box perspective.
Reviewers: malaperle, krasimir, bkramer, ilya-biryukov
Subscribers: sammccall, mgrang, klimek, rwols, ilya-biryukov, arphaman, cfe-commits
Differential Revision: https://reviews.llvm.org/D35894
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Signed-off-by: William Enright <william.enright@polymtl.ca>
llvm-svn: 325395
2018-02-17 05:38:15 +08:00
|
|
|
|
2017-04-04 17:46:39 +08:00
|
|
|
/// Defines whether the insert text in a completion item should be interpreted
|
|
|
|
/// as plain text or a snippet.
|
|
|
|
enum class InsertTextFormat {
|
|
|
|
Missing = 0,
|
|
|
|
/// The primary text to be inserted is treated as a plain string.
|
|
|
|
PlainText = 1,
|
|
|
|
/// The primary text to be inserted is treated as a snippet.
|
|
|
|
///
|
|
|
|
/// A snippet can define tab stops and placeholders with `$1`, `$2`
|
|
|
|
/// and `${3:foo}`. `$0` defines the final tab stop, it defaults to the end
|
|
|
|
/// of the snippet. Placeholders with equal identifiers are linked, that is
|
|
|
|
/// typing in one will update others too.
|
|
|
|
///
|
|
|
|
/// See also:
|
|
|
|
/// https//github.com/Microsoft/vscode/blob/master/src/vs/editor/contrib/snippet/common/snippet.md
|
|
|
|
Snippet = 2,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct CompletionItem {
|
|
|
|
/// The label of this completion item. By default also the text that is
|
|
|
|
/// inserted when selecting this completion.
|
|
|
|
std::string label;
|
|
|
|
|
|
|
|
/// The kind of this completion item. Based of the kind an icon is chosen by
|
|
|
|
/// the editor.
|
|
|
|
CompletionItemKind kind = CompletionItemKind::Missing;
|
|
|
|
|
|
|
|
/// A human-readable string with additional information about this item, like
|
|
|
|
/// type or symbol information.
|
|
|
|
std::string detail;
|
|
|
|
|
|
|
|
/// A human-readable string that represents a doc-comment.
|
|
|
|
std::string documentation;
|
|
|
|
|
|
|
|
/// A string that should be used when comparing this item with other items.
|
|
|
|
/// When `falsy` the label is used.
|
|
|
|
std::string sortText;
|
|
|
|
|
|
|
|
/// A string that should be used when filtering a set of completion items.
|
|
|
|
/// When `falsy` the label is used.
|
|
|
|
std::string filterText;
|
|
|
|
|
|
|
|
/// A string that should be inserted to a document when selecting this
|
|
|
|
/// completion. When `falsy` the label is used.
|
|
|
|
std::string insertText;
|
|
|
|
|
|
|
|
/// The format of the insert text. The format applies to both the `insertText`
|
|
|
|
/// property and the `newText` property of a provided `textEdit`.
|
|
|
|
InsertTextFormat insertTextFormat = InsertTextFormat::Missing;
|
|
|
|
|
|
|
|
/// An edit which is applied to a document when selecting this completion.
|
|
|
|
/// When an edit is provided `insertText` is ignored.
|
|
|
|
///
|
|
|
|
/// Note: The range of the edit must be a single line range and it must
|
|
|
|
/// contain the position at which completion has been requested.
|
|
|
|
llvm::Optional<TextEdit> textEdit;
|
|
|
|
|
|
|
|
/// An optional array of additional text edits that are applied when selecting
|
|
|
|
/// this completion. Edits must not overlap with the main edit nor with
|
|
|
|
/// themselves.
|
|
|
|
std::vector<TextEdit> additionalTextEdits;
|
2017-04-07 19:03:26 +08:00
|
|
|
|
2018-09-07 02:52:26 +08:00
|
|
|
/// Indicates if this item is deprecated.
|
|
|
|
bool deprecated = false;
|
|
|
|
|
2017-04-04 17:46:39 +08:00
|
|
|
// TODO(krasimir): The following optional fields defined by the language
|
|
|
|
// server protocol are unsupported:
|
|
|
|
//
|
|
|
|
// data?: any - A data entry field that is preserved on a completion item
|
|
|
|
// between a completion and a completion resolve request.
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const CompletionItem &);
|
[clangd] Use operator<< to prevent printers issues in Gtest
Summary:
It is possible that there will be two different instantiations of
the printer template for a given type and some tests could end up calling the
wrong (default) one. For example, it was seen in CodeCompleteTests.cpp when
printing CompletionItems that it would use the wrong printer because the default
is also instantiated in ClangdTests.cpp.
With this change, objects that were previously printed with a custom Printer now
get printed through the operator<< which is declared alongside the class.
This rule of the thumb should make it less error-prone.
Reviewers: simark, ilya-biryukov, sammccall
Reviewed By: simark, ilya-biryukov, sammccall
Subscribers: bkramer, hokein, sammccall, klimek, ilya-biryukov, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44764
llvm-svn: 329725
2018-04-11 01:34:46 +08:00
|
|
|
llvm::raw_ostream &operator<<(llvm::raw_ostream &, const CompletionItem &);
|
2017-04-04 17:46:39 +08:00
|
|
|
|
2017-11-08 15:44:12 +08:00
|
|
|
bool operator<(const CompletionItem &, const CompletionItem &);
|
|
|
|
|
2017-11-15 17:16:29 +08:00
|
|
|
/// Represents a collection of completion items to be presented in the editor.
|
|
|
|
struct CompletionList {
|
|
|
|
/// The list is not complete. Further typing should result in recomputing the
|
|
|
|
/// list.
|
|
|
|
bool isIncomplete = false;
|
|
|
|
|
|
|
|
/// The completion items.
|
|
|
|
std::vector<CompletionItem> items;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const CompletionList &);
|
2017-11-15 17:16:29 +08:00
|
|
|
|
2017-10-06 19:54:17 +08:00
|
|
|
/// A single parameter of a particular signature.
|
|
|
|
struct ParameterInformation {
|
|
|
|
|
|
|
|
/// The label of this parameter. Mandatory.
|
|
|
|
std::string label;
|
|
|
|
|
|
|
|
/// The documentation of this parameter. Optional.
|
|
|
|
std::string documentation;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const ParameterInformation &);
|
2017-10-06 19:54:17 +08:00
|
|
|
|
|
|
|
/// Represents the signature of something callable.
|
|
|
|
struct SignatureInformation {
|
|
|
|
|
|
|
|
/// The label of this signature. Mandatory.
|
|
|
|
std::string label;
|
|
|
|
|
|
|
|
/// The documentation of this signature. Optional.
|
|
|
|
std::string documentation;
|
|
|
|
|
|
|
|
/// The parameters of this signature.
|
|
|
|
std::vector<ParameterInformation> parameters;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const SignatureInformation &);
|
[clangd] Use operator<< to prevent printers issues in Gtest
Summary:
It is possible that there will be two different instantiations of
the printer template for a given type and some tests could end up calling the
wrong (default) one. For example, it was seen in CodeCompleteTests.cpp when
printing CompletionItems that it would use the wrong printer because the default
is also instantiated in ClangdTests.cpp.
With this change, objects that were previously printed with a custom Printer now
get printed through the operator<< which is declared alongside the class.
This rule of the thumb should make it less error-prone.
Reviewers: simark, ilya-biryukov, sammccall
Reviewed By: simark, ilya-biryukov, sammccall
Subscribers: bkramer, hokein, sammccall, klimek, ilya-biryukov, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44764
llvm-svn: 329725
2018-04-11 01:34:46 +08:00
|
|
|
llvm::raw_ostream &operator<<(llvm::raw_ostream &,
|
|
|
|
const SignatureInformation &);
|
2017-10-06 19:54:17 +08:00
|
|
|
|
|
|
|
/// Represents the signature of a callable.
|
|
|
|
struct SignatureHelp {
|
|
|
|
|
|
|
|
/// The resulting signatures.
|
|
|
|
std::vector<SignatureInformation> signatures;
|
|
|
|
|
|
|
|
/// The active signature.
|
|
|
|
int activeSignature = 0;
|
|
|
|
|
|
|
|
/// The active parameter of the active signature.
|
|
|
|
int activeParameter = 0;
|
2018-08-30 21:14:31 +08:00
|
|
|
|
|
|
|
/// Position of the start of the argument list, including opening paren. e.g.
|
|
|
|
/// foo("first arg", "second arg",
|
|
|
|
/// ^-argListStart ^-cursor
|
|
|
|
/// This is a clangd-specific extension, it is only available via C++ API and
|
|
|
|
/// not currently serialized for the LSP.
|
|
|
|
Position argListStart;
|
2017-10-06 19:54:17 +08:00
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const SignatureHelp &);
|
2017-10-06 19:54:17 +08:00
|
|
|
|
2017-11-09 19:30:04 +08:00
|
|
|
struct RenameParams {
|
|
|
|
/// The document that was opened.
|
|
|
|
TextDocumentIdentifier textDocument;
|
|
|
|
|
|
|
|
/// The position at which this request was sent.
|
|
|
|
Position position;
|
|
|
|
|
|
|
|
/// The new name of the symbol.
|
|
|
|
std::string newName;
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
bool fromJSON(const llvm::json::Value &, RenameParams &);
|
2017-11-09 19:30:04 +08:00
|
|
|
|
[clangd] Document highlights for clangd
Summary: Implementation of Document Highlights Request as described in
LSP.
Contributed by William Enright (nebiroth).
Reviewers: malaperle, krasimir, bkramer, ilya-biryukov
Reviewed By: malaperle
Subscribers: mgrang, sammccall, klimek, ioeric, rwols, cfe-commits, arphaman, ilya-biryukov
Differential Revision: https://reviews.llvm.org/D38425
llvm-svn: 320474
2017-12-12 20:27:47 +08:00
|
|
|
enum class DocumentHighlightKind { Text = 1, Read = 2, Write = 3 };
|
|
|
|
|
|
|
|
/// A document highlight is a range inside a text document which deserves
|
|
|
|
/// special attention. Usually a document highlight is visualized by changing
|
|
|
|
/// the background color of its range.
|
|
|
|
|
|
|
|
struct DocumentHighlight {
|
|
|
|
/// The range this highlight applies to.
|
|
|
|
Range range;
|
|
|
|
|
|
|
|
/// The highlight kind, default is DocumentHighlightKind.Text.
|
|
|
|
DocumentHighlightKind kind = DocumentHighlightKind::Text;
|
|
|
|
|
|
|
|
friend bool operator<(const DocumentHighlight &LHS,
|
|
|
|
const DocumentHighlight &RHS) {
|
|
|
|
int LHSKind = static_cast<int>(LHS.kind);
|
|
|
|
int RHSKind = static_cast<int>(RHS.kind);
|
|
|
|
return std::tie(LHS.range, LHSKind) < std::tie(RHS.range, RHSKind);
|
|
|
|
}
|
|
|
|
|
|
|
|
friend bool operator==(const DocumentHighlight &LHS,
|
|
|
|
const DocumentHighlight &RHS) {
|
|
|
|
return LHS.kind == RHS.kind && LHS.range == RHS.range;
|
|
|
|
}
|
|
|
|
};
|
2018-07-09 22:25:59 +08:00
|
|
|
llvm::json::Value toJSON(const DocumentHighlight &DH);
|
[clangd] Use operator<< to prevent printers issues in Gtest
Summary:
It is possible that there will be two different instantiations of
the printer template for a given type and some tests could end up calling the
wrong (default) one. For example, it was seen in CodeCompleteTests.cpp when
printing CompletionItems that it would use the wrong printer because the default
is also instantiated in ClangdTests.cpp.
With this change, objects that were previously printed with a custom Printer now
get printed through the operator<< which is declared alongside the class.
This rule of the thumb should make it less error-prone.
Reviewers: simark, ilya-biryukov, sammccall
Reviewed By: simark, ilya-biryukov, sammccall
Subscribers: bkramer, hokein, sammccall, klimek, ilya-biryukov, jkorous-apple, ioeric, MaskRay, cfe-commits
Differential Revision: https://reviews.llvm.org/D44764
llvm-svn: 329725
2018-04-11 01:34:46 +08:00
|
|
|
llvm::raw_ostream &operator<<(llvm::raw_ostream &, const DocumentHighlight &);
|
[clangd] Document highlights for clangd
Summary: Implementation of Document Highlights Request as described in
LSP.
Contributed by William Enright (nebiroth).
Reviewers: malaperle, krasimir, bkramer, ilya-biryukov
Reviewed By: malaperle
Subscribers: mgrang, sammccall, klimek, ioeric, rwols, cfe-commits, arphaman, ilya-biryukov
Differential Revision: https://reviews.llvm.org/D38425
llvm-svn: 320474
2017-12-12 20:27:47 +08:00
|
|
|
|
2018-09-05 19:53:07 +08:00
|
|
|
struct ReferenceParams : public TextDocumentPositionParams {
|
|
|
|
// For now, no options like context.includeDeclaration are supported.
|
|
|
|
};
|
|
|
|
bool fromJSON(const llvm::json::Value &, ReferenceParams &);
|
|
|
|
|
2017-02-07 18:28:20 +08:00
|
|
|
} // namespace clangd
|
|
|
|
} // namespace clang
|
|
|
|
|
[clangd] Support incremental document syncing
Summary:
This patch adds support for incremental document syncing, as described
in the LSP spec. The protocol specifies ranges in terms of Position (a
line and a character), and our drafts are stored as plain strings. So I
see two things that may not be super efficient for very large files:
- Converting a Position to an offset (the positionToOffset function)
requires searching for end of lines until we reach the desired line.
- When we update a range, we construct a new string, which implies
copying the whole document.
However, for the typical size of a C++ document and the frequency of
update (at which a user types), it may not be an issue. This patch aims
at getting the basic feature in, and we can always improve it later if
we find it's too slow.
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Reviewers: malaperle, ilya-biryukov
Reviewed By: ilya-biryukov
Subscribers: MaskRay, klimek, mgorny, ilya-biryukov, jkorous-apple, ioeric, cfe-commits
Differential Revision: https://reviews.llvm.org/D44272
llvm-svn: 328500
2018-03-26 22:41:40 +08:00
|
|
|
namespace llvm {
|
|
|
|
template <> struct format_provider<clang::clangd::Position> {
|
|
|
|
static void format(const clang::clangd::Position &Pos, raw_ostream &OS,
|
|
|
|
StringRef Style) {
|
|
|
|
assert(Style.empty() && "style modifiers for this type are not supported");
|
|
|
|
OS << Pos;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
} // namespace llvm
|
|
|
|
|
2017-02-07 18:28:20 +08:00
|
|
|
#endif
|