更新0.10.0

Author: CppCXY

CHANGELOG.md

@@ -1,4 +1,16 @@
 # Change Log
+
+## 0.10.0
+
+`NEW` vscode插件端实现配置EmmyluaCodeStyle开关`模块诊断`,`代码风格诊断`, `模块补全`.
+
+`NEW` 行距诊断换一种表现方式
+
+`NEW` 支持通过设置`align_chained_expression_statement=true`使链式表达式对齐到第一个'.'或者':' 
+
+`NEW` 支持通过设置`if_branch_comments_after_block_no_indent`允许else或者elseif之上的注释对齐到关键词上
+
+
 ## 0.9.7
 
 `IMPL` [#31](https://github.com/CppCXY/EmmyLuaCodeStyle/issues/31)

CodeFormatServer/src/LanguageClient.cpp

@@ -153,11 +153,15 @@ void LanguageClient::DiagnosticFile(std::string_view uri)
 		return;
 	}
 
-	auto formatDiagnostic = GetService<CodeFormatService>()->Diagnose(filename, parser, options);
-	auto moduleDiagnosis = GetService<ModuleService>()->Diagnose(filename, parser);
+	if (_vscodeSettings.lintCodeStyle) {
+		auto formatDiagnostic = GetService<CodeFormatService>()->Diagnose(filename, parser, options);
+		std::copy(formatDiagnostic.begin(), formatDiagnostic.end(), std::back_inserter(vscodeDiagnosis->diagnostics));
+	}
 
-	std::copy(formatDiagnostic.begin(), formatDiagnostic.end(), std::back_inserter(vscodeDiagnosis->diagnostics));
-	std::copy(moduleDiagnosis.begin(), moduleDiagnosis.end(), std::back_inserter(vscodeDiagnosis->diagnostics));
+	if (_vscodeSettings.lintModule) {
+		auto moduleDiagnosis = GetService<ModuleService>()->Diagnose(filename, parser);
+		std::copy(moduleDiagnosis.begin(), moduleDiagnosis.end(), std::back_inserter(vscodeDiagnosis->diagnostics));
+	}
 
 	SendNotification("textDocument/publishDiagnostics", vscodeDiagnosis);
 }
@@ -311,6 +315,16 @@ asio::io_context& LanguageClient::GetIOContext()
 	return _ioc;
 }
 
+vscode::VscodeSettings LanguageClient::GetSettings() const
+{
+	return _vscodeSettings;
+}
+
+void LanguageClient::SetVscodeSettings(vscode::VscodeSettings& settings)
+{
+	_vscodeSettings = settings;
+}
+
 uint64_t LanguageClient::GetRequestId()
 {
 	return ++_idCounter;

CodeFormatServer/src/LanguageService.cpp

@@ -73,6 +73,8 @@ std::shared_ptr<vscode::InitializeResult> LanguageService::OnInitialize(std::sha
 	result->capabilities.textDocumentSync.change = vscode::TextDocumentSyncKind::Incremental;
 	result->capabilities.textDocumentSync.openClose = true;
 
+	LanguageClient::GetInstance().SetVscodeSettings(param->initializationOptions.vscodeConfig);
+
 	result->capabilities.codeActionProvider = true;
 	result->capabilities.executeCommandProvider.commands = {
 		"emmylua.reformat.me",
@@ -341,6 +343,11 @@ std::shared_ptr<vscode::CodeActionResult> LanguageService::OnCodeAction(std::sha
 	auto filePath = url::UrlToFilePath(uri);
 	auto codeActionResult = std::make_shared<vscode::CodeActionResult>();
 
+	if(!LanguageClient::GetInstance().GetSettings().autoImport)
+	{
+		return codeActionResult;
+	}
+
 	if (LanguageClient::GetInstance().GetService<CodeFormatService>()->IsDiagnosticRange(filePath, range))
 	{
 		auto& action = codeActionResult->actions.emplace_back();
@@ -493,13 +500,19 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnDidChangeWatchedFiles(
 
 std::shared_ptr<vscode::CompletionList> LanguageService::OnCompletion(std::shared_ptr<vscode::CompletionParams> param)
 {
+	auto list = std::make_shared<vscode::CompletionList>();
+
+	if(!LanguageClient::GetInstance().GetSettings().autoImport)
+	{
+		return list;
+	}
+
 	auto uri = param->textDocument.uri;
 
 	auto parser = LanguageClient::GetInstance().GetFileParser(uri);
 
 	auto options = LanguageClient::GetInstance().GetOptions(uri);
 
-	auto list = std::make_shared<vscode::CompletionList>();
 	list->isIncomplete = true;
 	list->items = LanguageClient::GetInstance().GetService<CompletionService>()->GetCompletions(
 		param->textDocument.uri, param->position, parser, options);

CodeFormatServer/src/VSCode.cpp

@@ -201,6 +201,11 @@ void vscode::InitializationOptions::Deserialize(nlohmann::json json)
 	{
 		extensionChars = json["extensionChars"];
 	}
+
+	if(json["vscodeConfig"].is_object())
+	{
+		vscodeConfig.Deserialize(json["vscodeConfig"]);
+	}
 }
 
 void vscode::InitializeParams::Deserialize(nlohmann::json json)
@@ -307,6 +312,13 @@ void vscode::ConfigSource::Deserialize(nlohmann::json json)
 	workspace = json["workspace"];
 }
 
+void vscode::VscodeSettings::Deserialize(nlohmann::json json)
+{
+	lintCodeStyle = json["lint.codeStyle"];
+	lintModule = json["lint.moduleCheck"];
+	autoImport = json["autoImport"];
+}
+
 void vscode::ConfigUpdateParams::Deserialize(nlohmann::json json)
 {
 	type = json["type"];

CodeService/src/FormatElement/KeepLineElement.cpp

@@ -56,8 +56,11 @@ void KeepLineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt,
 
 		if (_line != (nextElementLine - lastElementLine - 1))
 		{
-			ctx.PushDiagnosis(format(LText("here need keep {} line"), _line),
-			                  TextRange(lastElementOffset, nextElementOffset));
+			auto character = ctx.GetColumn(nextElementOffset);
+
+			ctx.PushDiagnosis(format(LText("here need keep {} empty line"), _line),
+			                  LuaDiagnosisPosition(nextElementLine, character),
+			                  LuaDiagnosisPosition(nextElementLine + 1, 0));
 		}
 	}
 }

CodeService/src/FormatElement/MinLineElement.cpp

@@ -54,11 +54,14 @@ void MinLineElement::Diagnosis(DiagnosisContext& ctx, ChildIterator selfIt, Form
 	}
 
 	const int lastElementLine = ctx.GetLine(lastOffset);
-	const int nextElementLine = nextOffset == -1 ? -1 : ctx.GetLine(nextOffset);
+	const int nextElementLine = ctx.GetLine(nextOffset);
 
 	if (_line > (nextElementLine - lastElementLine - 1))
 	{
-		ctx.PushDiagnosis(format(LText("here need at least {} line"), _line), TextRange(lastOffset, nextOffset));
+		auto character = ctx.GetColumn(nextOffset);
+		ctx.PushDiagnosis(format(LText("here need at least {} empty line"), _line),
+		                  LuaDiagnosisPosition(nextElementLine, character),
+		                  LuaDiagnosisPosition(nextElementLine + 1, 0));
 	}
 	ctx.SetCharacterCount(0);
 }

include/CodeFormatServer/LanguageClient.h

@@ -69,6 +69,9 @@ class LanguageClient : public std::enable_shared_from_this<LanguageClient>
 	template <ServiceClass Service>
 	std::shared_ptr<Service> GetService();
 
+	vscode::VscodeSettings GetSettings() const;
+
+	void SetVscodeSettings(vscode::VscodeSettings& settings);
 private:
 	uint64_t GetRequestId();
 
@@ -91,6 +94,8 @@ class LanguageClient : public std::enable_shared_from_this<LanguageClient>
 	asio::io_context _ioc;
 
 	std::array<std::shared_ptr<Service>, static_cast<std::size_t>(ServiceType::ServiceCount)> _services;
+
+	vscode::VscodeSettings _vscodeSettings;
 };
 
 template <ServiceClass Service>

include/CodeFormatServer/VSCode.h

@@ -240,6 +240,16 @@ class ServerCapabilities : public Serializable
 
 class ConfigSource;
 
+class VscodeSettings : public Serializable
+{
+public:
+	bool lintCodeStyle = true;
+	bool lintModule = true;
+	bool autoImport = true;
+
+	void Deserialize(nlohmann::json json) override;
+};
+
 class InitializationOptions : public Serializable
 {
 public:
@@ -248,6 +258,7 @@ class InitializationOptions : public Serializable
 	std::vector<ConfigSource> moduleConfigFiles;
 	std::string localeRoot;
 	std::string extensionChars;
+	VscodeSettings vscodeConfig;
 	void Deserialize(nlohmann::json json) override;
 };