Merge branch 'master' of github.com:CppCXY/EmmyLuaCodeStyle

CppCXY · CppCXY · commit 1a93b5c5a45d · 2022-05-31T15:22:59.000+08:00
diff --git a/CodeService/src/FormatElement/TextElement.cpp b/CodeService/src/FormatElement/TextElement.cpp
@@ -3,8 +3,9 @@
 
 TextElement::TextElement(std::string_view text, TextRange range)
 	: FormatElement(range),
-	  _text(text),
-	  _node(nullptr)
+	  _node(nullptr),
+	  _text(text)
+
 {
 }
 
diff --git a/LuaParser/src/LuaCustomParser.cpp b/LuaParser/src/LuaCustomParser.cpp
@@ -10,6 +10,7 @@ int GetCurrentChar(std::string_view source, std::size_t i)
 		unsigned char ch = source[i];
 		return ch;
 	}
+	return EOZ;
 }
 
 LuaTokenType LuaCustomParser::Lex(std::string_view source, std::size_t start, std::size_t& consumeSize)
diff --git a/include/CodeFormatServer/Service/ServiceType.h b/include/CodeFormatServer/Service/ServiceType.h
@@ -13,4 +13,4 @@ enum class ServiceType
 };
 
 #define LANGUAGE_SERVICE(ServiceClass)\
-    inline static constexpr ServiceType ServiceIndex = ServiceType::ServiceClass
+    inline static constexpr ServiceType ServiceIndex = ServiceType::ServiceClass

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`
`4`	`4`	`TextElement::TextElement(std::string_view text, TextRange range)`
`5`	`5`	`: FormatElement(range),`
`6`		`- _text(text),`
`7`		`- _node(nullptr)`
	`6`	`+ _node(nullptr),`
	`7`	`+ _text(text)`
	`8`	`+`
`8`	`9`	`{`
`9`	`10`	`}`
`10`	`11`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ int GetCurrentChar(std::string_view source, std::size_t i)`
`10`	`10`	`unsigned char ch = source[i];`
`11`	`11`	`return ch;`
`12`	`12`	`}`
	`13`	`+ return EOZ;`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`LuaTokenType LuaCustomParser::Lex(std::string_view source, std::size_t start, std::size_t& consumeSize)`