修改范围空判断

Author: CppCXY

CodeService/src/FormatElement/FormatElement.cpp

@@ -45,7 +45,7 @@ FormatElement::ChildContainer& FormatElement::GetChildren()
 
 bool FormatElement::HasValidTextRange() const
 {
-	return !(_textRange.StartOffset == 0 && _textRange.EndOffset == 0);
+	return !_textRange.IsEmpty();
 }
 
 std::shared_ptr<FormatElement> FormatElement::LastValidElement() const
@@ -91,7 +91,7 @@ void FormatElement::DiagnosisCodeStyle(DiagnosisContext& ctx)
 
 void FormatElement::AddTextRange(TextRange range)
 {
-	if (_textRange.StartOffset == 0 && _textRange.EndOffset == 0)
+	if (_textRange.IsEmpty())
 	{
 		_textRange = range;
 	}

CodeService/src/FormatElement/IndentElement.cpp

@@ -3,7 +3,7 @@
 #include "CodeService/FormatElement/FormatElement.h"
 
 IndentElement::IndentElement(int specialIndent)
-	: FormatElement(TextRange(0, 0)),
+	: FormatElement(),
 	  _specialIndent(specialIndent)
 {
 }

CodeService/src/FormatElement/KeepBlankElement.cpp

@@ -2,7 +2,7 @@
 #include "Util/format.h"
 
 KeepBlankElement::KeepBlankElement(int blank)
-	: FormatElement(TextRange(0, 0)),
+	: FormatElement(),
 	  _blank(blank)
 {
 }

CodeService/src/FormatElement/LineElement.cpp

@@ -1,7 +1,7 @@
 #include "CodeService/FormatElement/LineElement.h"
 
 LineElement::LineElement()
-	: FormatElement(TextRange())
+	: FormatElement()
 {
 }
 

CodeService/src/FormatElement/MinLineElement.cpp

@@ -2,7 +2,7 @@
 #include "Util/format.h"
 
 MinLineElement::MinLineElement(int line)
-	: FormatElement(TextRange()),
+	: FormatElement(),
 	  _line(line)
 {
 }

LuaParser/src/LuaAstNode.cpp

@@ -72,24 +72,24 @@ void LuaAstNode::AddChild(std::shared_ptr<LuaAstNode> child)
 	{
 		return;
 	}
-	auto source = GetSource();
+
+	if (child->_textRange.IsEmpty())
+	{
+		return;
+	}
+
+	const auto source = GetSource();
 	if (child->GetSource() != source)
 	{
 		return;
 	}
 
-	if (_textRange.StartOffset == 0 && _textRange.EndOffset == 0)
+	if (_textRange.IsEmpty())
 	{
 		_textRange = child->_textRange;
 	}
-
 	else
 	{
-		if (child->_textRange.StartOffset == 0 && child->_textRange.EndOffset == 0)
-		{
-			return;
-		}
-
 		if (_textRange.StartOffset > child->_textRange.StartOffset)
 		{
 			_textRange.StartOffset = child->_textRange.StartOffset;
@@ -173,23 +173,23 @@ void LuaAstNode::AddChildBefore(ChildIterator it, std::shared_ptr<LuaAstNode> ch
 {
 	if (it == _children.begin())
 	{
-		auto source = GetSource();
+		if (child->_textRange.IsEmpty())
+		{
+			return;
+		}
+
+		const auto source = GetSource();
 		if (child->GetSource() != source)
 		{
 			return;
 		}
 
-		if (_textRange.StartOffset == 0 && _textRange.EndOffset == 0)
+		if (_textRange.IsEmpty())
 		{
 			_textRange = child->_textRange;
 		}
 		else
 		{
-			if (child->_textRange.StartOffset == 0 && child->_textRange.EndOffset == 0)
-			{
-				return;
-			}
-
 			if (_textRange.StartOffset > child->_textRange.StartOffset)
 			{
 				_textRange.StartOffset = child->_textRange.StartOffset;
@@ -203,7 +203,7 @@ void LuaAstNode::AddChildBefore(ChildIterator it, std::shared_ptr<LuaAstNode> ch
 		_text = std::string_view(source + _textRange.StartOffset,
 		                         _textRange.EndOffset - _textRange.StartOffset + 1);
 	}
-	else if(it == _children.end())
+	else if (it == _children.end())
 	{
 		return AddChild(child);
 	}

LuaParser/src/LuaParser.cpp

@@ -1148,7 +1148,7 @@ void LuaParser::CodeName(std::shared_ptr<LuaAstNode> parent)
 
 std::shared_ptr<LuaAstNode> LuaParser::CreateAstNode(LuaAstNodeType type)
 {
-	return std::make_shared<LuaAstNode>(type, std::string_view(GetSource().data(), 0), TextRange(0, 0));
+	return std::make_shared<LuaAstNode>(type, std::string_view(GetSource().data(), 0), TextRange());
 }
 
 std::shared_ptr<LuaAstNode> LuaParser::CreateAstNodeFromToken(LuaAstNodeType type, LuaToken& token)

LuaParser/src/LuaTokenParser.cpp

@@ -66,11 +66,13 @@ bool LuaTokenParser::Parse()
 		{
 			if (type == TK_LONG_COMMENT || type == TK_SHEBANG || type == TK_SHORT_COMMENT)
 			{
-				_commentTokens.emplace_back(type, text, TextRange(_buffStart, _buffIndex));
+				_commentTokens.emplace_back(type, text, TextRange(
+					                            static_cast<int>(_buffStart), static_cast<int>(_buffIndex)));
 			}
 			else
 			{
-				_tokens.emplace_back(type, text, TextRange(_buffStart, _buffIndex));
+				_tokens.emplace_back(type, text, TextRange(
+					                     static_cast<int>(_buffStart), static_cast<int>(_buffIndex)));
 			}
 		}
 		else

LuaParser/src/TextRange.cpp

@@ -1,17 +1,22 @@
 #include "LuaParser/TextRange.h"
 
-TextRange::TextRange(std::size_t startOffset, std::size_t endOffset)
-	: StartOffset(static_cast<int>(startOffset)),
-	EndOffset(static_cast<int>(endOffset))
+TextRange::TextRange(int startOffset, int endOffset)
+	: StartOffset(startOffset),
+	  EndOffset(endOffset)
 {
 }
 
-bool TextRange::Contain(TextRange& range)
+bool TextRange::IsEmpty() const
+{
+	return StartOffset == 0 && EndOffset == -1;
+}
+
+bool TextRange::Contain(TextRange& range) const
 {
 	return this->StartOffset <= range.StartOffset && this->EndOffset >= range.EndOffset;
 }
 
-bool TextRange::Between(TextRange& leftRange, TextRange& rightRange)
+bool TextRange::Between(TextRange& leftRange, TextRange& rightRange) const
 {
 	return this->StartOffset > leftRange.EndOffset && this->EndOffset < rightRange.StartOffset;
 }

Test/src/CodeFormatTest.cpp

@@ -81,7 +81,7 @@ std::string ReadFile(const std::string& path)
 	return "";
 }
 
-// 第一个参数是待格式化文本目录，第二个参数是格式化预期结果
+
 int main(int argc, char* argv[])
 {
 	CommandLine commandLine;