提交

Author: CppCXY

3rd/uriparser/src/config.h

@@ -43,7 +43,7 @@
 
 #define PACKAGE_VERSION "0.9.5"
 
-/* #undef HAVE_WPRINTF */
+#define HAVE_WPRINTF
 /* #undef HAVE_REALLOCARRAY */
 
 

CodeFormatServer/src/CodeFormatServer.cpp

@@ -16,7 +16,6 @@ using namespace asio::ip;
 
 int main(int argc, char** argv)
 {
-
     if(argc > 1)
     {
         int port = std::stoi(argv[1]);
@@ -37,7 +36,5 @@ int main(int argc, char** argv)
         LanguageClient::GetInstance().Run();
     }
 
-   
-
     return 0;
 }

CodeFormatServer/src/LanguageClient.cpp

@@ -131,9 +131,6 @@ void LanguageClient::DiagnosticFile(std::string_view uri)
 		diagnosis.severity = vscode::DiagnosticSeverity::Warning;
 	}
 
-
-
-
 	SendNotification("textDocument/publishDiagnostics", vscodeDiagnosis);
 }
 
@@ -243,6 +240,8 @@ void LanguageClient::UpdateAllDiagnosis()
 void LanguageClient::SetRoot(std::string_view root)
 {
 	_root = root;
+	_defaultOptions->export_root = root;
+	_defaultOptions->import_from.emplace_back(root);
 }
 
 uint64_t LanguageClient::GetRequestId()

CodeFormatServer/src/LanguageService.cpp

@@ -218,12 +218,12 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnRangeFormatting(
 		return result;
 	}
 
-	LuaFormatter formatter(parser, *options);
-	formatter.BuildFormattedElement();
-
 	auto& edit = result->edits.emplace_back();
 	LuaFormatRange formattedRange(static_cast<int>(param->range.start.line), static_cast<int>(param->range.end.line));
 
+	LuaFormatter formatter(parser, *options);
+	formatter.BuildRangeFormattedElement(formattedRange);
+
 	edit.newText = formatter.GetRangeFormattedText(formattedRange);
 	edit.range = vscode::Range(
 		vscode::Position(formattedRange.StartLine, formattedRange.StartCharacter),
@@ -253,12 +253,12 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnTypeFormatting(
 		return result;
 	}
 
-	LuaFormatter formatter(parser, *options);
-	formatter.BuildFormattedElement();
-
 	auto& edit = result->edits.emplace_back();
 	LuaFormatRange formattedRange(static_cast<int>(position.line) - 1, static_cast<int>(position.line) - 1);
 
+	LuaFormatter formatter(parser, *options);
+	formatter.BuildRangeFormattedElement(formattedRange);
+
 	edit.newText = formatter.GetRangeFormattedText(formattedRange);
 	edit.range = vscode::Range(
 		vscode::Position(formattedRange.StartLine, formattedRange.StartCharacter),
@@ -310,21 +310,21 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnExecuteCommand(
 			return result;
 		}
 
-		LuaFormatter formatter(parser, *options);
-		formatter.BuildFormattedElement();
 		auto it = applyParams->edit.changes.emplace(uri, std::vector<vscode::TextEdit>());
 		auto& change = it.first->second;
 
 		auto& edit = change.emplace_back();
 		LuaFormatRange formattedRange(static_cast<int>(range.start.line), static_cast<int>(range.end.line));
 
+		LuaFormatter formatter(parser, *options);
+		formatter.BuildRangeFormattedElement(formattedRange);
+
 		edit.newText = formatter.GetRangeFormattedText(formattedRange);
 		edit.range = vscode::Range(
 			vscode::Position(formattedRange.StartLine, formattedRange.StartCharacter),
 			vscode::Position(formattedRange.EndLine + 1, formattedRange.EndCharacter)
 		);
 
-
 		LanguageClient::GetInstance().SendRequest("workspace/applyEdit", applyParams);
 	}
 

CodeFormatServer/src/Service/ModuleService.cpp

@@ -3,20 +3,68 @@
 
 class UnResolveModuleFinder : public LuaAstVisitor
 {
+public:
+	class Scope
+	{
+	public:
+		std::set<std::string, std::less<>> LocalVariableSet;
+	};
+
+	UnResolveModuleFinder(std::vector<vscode::Diagnostic>& result, std::shared_ptr<LuaCodeStyleOptions> options)
+		: _result(result),
+		  _options(options)
+	{
+	}
+
+	void Find()
+	{
+		
+	}
+
 protected:
-	void VisitParamList(const std::shared_ptr<LuaAstNode>& node) override;
+	void VisitParamList(const std::shared_ptr<LuaAstNode>& node) override
+	{
+	}
+
+	void VisitLocalFunctionStatement(const std::shared_ptr<LuaAstNode>& node) override
+	{
+	}
+
+	void VisitLocalStatement(const std::shared_ptr<LuaAstNode>& node) override
+	{
+	}
 
-	void VisitLocalFunctionStatement(const std::shared_ptr<LuaAstNode>& node) override;
+	void VisitExpression(const std::shared_ptr<LuaAstNode>& expression) override
+	{
+		if(expression->GetChildren().empty())
+		switch (expression->GetType())
+		{
+			// case 
 
-	void VisitLocalStatement(const std::shared_ptr<LuaAstNode>& node) override;
 
-	void VisitIdentify(const std::shared_ptr<LuaAstNode>& node) override;
 
+		}
+
+	}
+
+private:
+	std::vector<vscode::Diagnostic>& _result;
+	std::shared_ptr<LuaCodeStyleOptions> _options;
 };
 
+std::vector<vscode::Diagnostic> ModuleService::GetModuleDiagnostics(std::shared_ptr<LuaParser> parser,
+                                                                    std::shared_ptr<LuaCodeStyleOptions> options)
+{
+	std::vector<vscode::Diagnostic> result;
+	UnResolveModuleFinder finder(result, options);
+	auto ast = parser->GetAst();
 
+	ast->AcceptChildren(finder);
 
+	return result;
+}
 
-std::vector<vscode::Diagnostic> ModuleService::GetModuleDiagnostics()
+std::vector<std::string> ModuleService::GetCompleteItems()
 {
+	return {};
 }