为intellij插件做准备

Author: CppCXY

CMakeLists.txt

@@ -12,7 +12,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 	add_definitions(-DMSVC)
 endif ()
 
-
 add_subdirectory(LuaParser)
 add_subdirectory(CodeService)
 add_subdirectory(Util)

CodeFormatServer/src/CodeFormatServer.cpp

@@ -18,6 +18,7 @@ using namespace asio::ip;
 
 int main(int argc, char** argv)
 {
+    // std::this_thread::sleep_for(std::chrono::seconds(10));
     if(argc > 1)
     {
         int port = std::stoi(argv[1]);

CodeFormatServer/src/LanguageService.cpp

@@ -52,6 +52,7 @@ std::shared_ptr<vscode::InitializeResult> LanguageService::OnInitialize(std::sha
 	{
 		LanguageClient::GetInstance().UpdateOptions(configFile.workspace, configFile.path);
 	}
+	result->capabilities.codeActionProvider = true;
 
 	return result;
 }

CodeFormatServer/src/Protocol/ProtocolParser.cpp

@@ -6,7 +6,7 @@
 #include "CodeFormatServer/LanguageService.h"
 
 ProtocolParser::ProtocolParser()
-	: _id(-1)
+	: _id(nullptr)
 {
 }
 
@@ -17,6 +17,11 @@ void ProtocolParser::Parse(std::string_view msg)
 	{
 		_id = jsonMessage["id"].get<int>();
 	}
+	else if (jsonMessage["id"].is_string())
+	{
+		_id = jsonMessage["id"].get<std::string>();
+	}
+
 	if (jsonMessage["method"].is_string())
 	{
 		_method = jsonMessage["method"].get<std::string>();
@@ -40,11 +45,16 @@ std::string_view ProtocolParser::GetMethod()
 
 std::string ProtocolParser::SerializeProtocol(std::shared_ptr<vscode::Serializable> result)
 {
-
 	nlohmann::json json;
-	if (_id != -1) {
-		json["id"] = _id;
+	if (_id.index() == 0)
+	{
+		json["id"] = std::get<int>(_id);
+	}
+	else if (_id.index() == 1)
+	{
+		json["id"] = std::get<std::string>(_id);
 	}
+
 	json["result"] = result->Serialize();
 	json["jsonrpc"] = "2.0";
 	auto dumpResult = json.dump();

CodeFormatServer/src/VSCode.cpp

@@ -35,7 +35,7 @@ std::shared_ptr<vscode::Serializable> vscode::MakeFromRequest(std::string_view m
 	{
 		return MakeRequestObject<DidCloseTextDocumentParams>(json);
 	}
-	else if (method  == "updateEditorConfig")
+	else if (method == "updateEditorConfig")
 	{
 		return MakeRequestObject<EditorConfigUpdateParams>(json);
 	}
@@ -150,7 +150,7 @@ nlohmann::json vscode::PublishDiagnosticsParams::Serialize()
 
 	auto array = nlohmann::json::array();
 
-	for(auto& diagnositc: diagnostics)
+	for (auto& diagnositc : diagnostics)
 	{
 		array.push_back(diagnositc.Serialize());
 	}
@@ -178,54 +178,58 @@ nlohmann::json vscode::TextDocumentSyncOptions::Serialize()
 
 	object["openClose"] = openClose;
 	object["change"] = change;
+	object["willSave"] = willSave;
+	object["willSaveWaitUntil"] = willSaveWaitUntil;
 
 	return object;
 }
 
-void vscode::TextDocumentSyncOptions::Deserialize(nlohmann::json json)
-{
-	openClose = json["openClose"];
-	change = static_cast<TextDocumentSyncKind>(json["change"].get<int>());
-}
-
 nlohmann::json vscode::ServerCapabilities::Serialize()
 {
 	auto object = nlohmann::json::object();
 	object["textDocumentSync"] = textDocumentSync.Serialize();
 	object["documentFormattingProvider"] = documentFormattingProvider;
-
+	// object["codeActionProvider"] = codeActionProvider;
 	return object;
 }
 
-void vscode::ServerCapabilities::Deserialize(nlohmann::json json)
-{
-	documentFormattingProvider = json["documentFormattingProvider"];
-	textDocumentSync.Deserialize(json["textDocumentSync"]);
-}
-
 void vscode::InitializationOptions::Deserialize(nlohmann::json json)
 {
-	auto configFileArray = json["configFiles"];
-
-	for(auto& configSource: configFileArray)
+	if (json["configFiles"].is_array())
 	{
-		auto& source = configFiles.emplace_back();
-		source.Deserialize(configSource);
-	}
+		auto configFileArray = json["configFiles"];
 
-	auto workspaceFolderArray = json["workspaceFolders"];
-
-	for(auto& workspaceUri: workspaceFolderArray)
+		for (auto& configSource : configFileArray)
+		{
+			auto& source = configFiles.emplace_back();
+			source.Deserialize(configSource);
+		}
+	}
+	if (json["workspaceFolders"].is_array())
 	{
-		workspaceFolders.emplace_back(workspaceUri);
+		auto workspaceFolderArray = json["workspaceFolders"];
+
+		for (auto& workspaceUri : workspaceFolderArray)
+		{
+			workspaceFolders.emplace_back(workspaceUri);
+		}
 	}
 }
 
 void vscode::InitializeParams::Deserialize(nlohmann::json json)
 {
-	rootPath = json["rootPath"];
-	rootUri = json["rootUri"];
-	locale = json["locale"];
+	if (json["rootPath"].is_string())
+	{
+		rootPath = json["rootPath"];
+	}
+	if (json["rootUri"].is_string())
+	{
+		rootUri = json["rootUri"];
+	}
+	if (json["locale"].is_string())
+	{
+		locale = json["locale"];
+	}
 
 	initializationOptions.Deserialize(json["initializationOptions"]);
 }
@@ -290,14 +294,14 @@ void vscode::DocumentFormattingParams::Deserialize(nlohmann::json json)
 
 nlohmann::json vscode::DocumentFormattingResult::Serialize()
 {
-	if(hasError)
+	if (hasError)
 	{
 		return nullptr;
 	}
 	else
 	{
 		auto array = nlohmann::json::array();
-		for(auto& edit: edits)
+		for (auto& edit : edits)
 		{
 			array.push_back(edit.Serialize());
 		}

CodeService/CMakeLists.txt

@@ -4,10 +4,13 @@ project(CodeService)
 
 add_library(CodeService STATIC)
 
+#add_subdirectory(${LuaCodeStyle_SOURCE_DIR}/3rd/JamSpell-0.0.12 jamspell.out)
+
 add_dependencies(CodeService LuaParser)
 
 target_include_directories(CodeService PUBLIC
 	${LuaCodeStyle_SOURCE_DIR}/include
+	${LuaCodeStyle_SOURCE_DIR}/3rd/JamSpell-0.0.12/jamspell
 	src
 )
 

CodeService/src/FormatElement/TextElement.cpp

@@ -1,5 +1,6 @@
 #include "CodeService/FormatElement/TextElement.h"
 
+
 TextElement::TextElement(std::string_view text, TextRange range)
 	: _text(text),
 	  FormatElement(range)

include/CodeFormatServer/Protocol/ProtocolParser.h

@@ -3,6 +3,7 @@
 #include <cstdlib>
 #include <string_view>
 #include <memory>
+#include <variant>
 #include "CodeFormatServer/VSCode.h"
 
 class ProtocolParser
@@ -18,7 +19,7 @@ class ProtocolParser
 
 	std::string SerializeProtocol(std::shared_ptr<vscode::Serializable> result);
 private:
-	int _id;
+	std::variant<int, std::string, void*> _id;
 	std::string _method;
 	std::shared_ptr<vscode::Serializable> _param;
-};
+};

include/CodeFormatServer/VSCode.h

@@ -121,19 +121,20 @@ class TextDocumentSyncOptions : public Serializable
 public:
 	bool openClose = false;
 	TextDocumentSyncKind change = TextDocumentSyncKind::None;
+	bool willSave = false;
+	bool willSaveWaitUntil = false;
 
 	nlohmann::json Serialize() override;
-	void Deserialize(nlohmann::json json) override;
 };
 
 class ServerCapabilities : public Serializable
 {
 public:
 	TextDocumentSyncOptions textDocumentSync;
-	bool documentFormattingProvider;
+	bool documentFormattingProvider = false;
+	bool codeActionProvider = false;
 
 	nlohmann::json Serialize() override;
-	void Deserialize(nlohmann::json json) override;
 };
 
 class EditorConfigSource;