更为正确得支持范围格式化

Author: CppCXY

CodeFormatServer/src/LanguageService.cpp

@@ -181,8 +181,8 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnRangeFormatting(
 
 	edit.newText = formatter.GetRangeFormattedText(formattedRange);
 	edit.range = vscode::Range(
-		vscode::Position(formattedRange.StartLine, 0),
-		vscode::Position(formattedRange.EndLine + 1, 0)
+		vscode::Position(formattedRange.StartLine, formattedRange.StartCharacter),
+		vscode::Position(formattedRange.EndLine + 1, formattedRange.EndCharacter)
 	);
 	return result;
 }
@@ -216,8 +216,8 @@ std::shared_ptr<vscode::Serializable> LanguageService::OnTypeFormatting(
 
 	edit.newText = formatter.GetRangeFormattedText(formattedRange);
 	edit.range = vscode::Range(
-		vscode::Position(formattedRange.StartLine, 0),
-		vscode::Position(formattedRange.EndLine + 1, 0)
+		vscode::Position(formattedRange.StartLine, formattedRange.StartCharacter),
+		vscode::Position(formattedRange.EndLine + 1, formattedRange.EndCharacter)
 	);
 	return result;
 }

CodeService/src/FormatElement/RangeFormatContext.cpp

@@ -6,22 +6,25 @@ RangeFormatContext::RangeFormatContext(std::shared_ptr<LuaParser> parser, LuaCod
                                        LuaFormatRange validRange)
 	: FormatContext(parser, options),
 	  _validRange(validRange),
-	  _formattedLine(-1)
+	  _formattedRange(validRange),
+	  _inValidRange(false)
 
 {
 }
 
 void RangeFormatContext::Print(TextElement& textElement)
 {
-	int offset = textElement.GetTextRange().StartOffset;
-	int offsetLine = _parser->GetLine(offset);
-	if (offsetLine < _validRange.StartLine || offsetLine > _validRange.EndLine)
+	int startOffset = textElement.GetTextRange().StartOffset;
+	int startLine = _parser->GetLine(startOffset);
+	int endLine = _parser->GetLine(textElement.GetTextRange().EndOffset);
+	if (startLine > _validRange.EndLine || endLine < _validRange.StartLine)
 	{
+		_inValidRange = false;
 		_characterCount += textElement.GetText().size();
-		_formattedLine = -1;
 		return;
 	}
 
+	_inValidRange = true;
 	auto& indentState = _indentStack.top();
 	if (static_cast<int>(_characterCount) < indentState.Indent)
 	{
@@ -30,7 +33,16 @@ void RangeFormatContext::Print(TextElement& textElement)
 	_os << textElement.GetText();
 	_characterCount += textElement.GetText().size();
 
-	_formattedLine = _parser->GetLine(textElement.GetTextRange().EndOffset);
+	if(startLine < _formattedRange.StartLine)
+	{
+		_formattedRange.StartLine = startLine;
+		_formattedRange.StartCharacter = _parser->GetColumn(startOffset);
+	}
+
+	if(endLine > _formattedRange.EndLine)
+	{
+		_formattedRange.EndLine = endLine;
+	}
 }
 
 void RangeFormatContext::PrintBlank(int blank)
@@ -39,7 +51,7 @@ void RangeFormatContext::PrintBlank(int blank)
 	{
 		_characterCount++;
 	}
-	if (_formattedLine >= 0)
+	if (_inValidRange)
 	{
 		for (int i = 0; i < blank; i++)
 		{
@@ -51,7 +63,7 @@ void RangeFormatContext::PrintBlank(int blank)
 void RangeFormatContext::PrintLine(int line)
 {
 	_characterCount = 0;
-	if (_formattedLine >= 0 && _formattedLine <= _validRange.EndLine)
+	if (_inValidRange)
 	{
 		for (int i = 0; i < line; i++)
 		{
@@ -80,5 +92,5 @@ std::string RangeFormatContext::GetText()
 
 LuaFormatRange RangeFormatContext::GetFormattedRange()
 {
-	return _validRange;
+	return _formattedRange;
 }

CodeService/src/LuaFormatter.cpp

@@ -58,11 +58,13 @@ std::string LuaFormatter::GetFormattedText()
 	return ctx.GetText();
 }
 
-std::string LuaFormatter::GetRangeFormattedText(LuaFormatRange validRange)
+std::string LuaFormatter::GetRangeFormattedText(LuaFormatRange& validRange)
 {
 	RangeFormatContext ctx(_parser, _options, validRange);
 	_env->Format(ctx);
 
+	validRange = ctx.GetFormattedRange();
+
 	return ctx.GetText();
 }
 

LuaParser/src/LuaTokenParser.cpp

@@ -198,7 +198,7 @@ bool LuaTokenParser::IsEmptyLine(int line)
 	for (int offset = lineStartOffset; offset < nextLineStartOffset; offset++)
 	{
 		char ch = _source[offset];
-		if(ch != '\n' && ch != '\r' && ch != '\t' && ch != ' ')
+		if (ch != '\n' && ch != '\r' && ch != '\t' && ch != ' ')
 		{
 			return false;
 		}
@@ -679,11 +679,29 @@ void LuaTokenParser::readString(int del)
 				case EOZ:
 					luaError("unfinished string", TextRange(_currentParseIndex, _currentParseIndex));
 					return;
+				case 'z':
+					{
+						saveAndNext();
+						while (lisspace(getCurrentChar()))
+						{
+							if (currentIsNewLine())
+							{
+								incLinenumber();
+							}
+							else
+							{
+								saveAndNext();
+							}
+						}
+						goto no_save;
+					}
 				}
 				break;
 			}
 		}
 		saveAndNext();
+		// 空语句
+	no_save:;
 	}
 	saveAndNext();
 }

include/CodeService/FormatElement/RangeFormatContext.h

@@ -15,5 +15,6 @@ class RangeFormatContext : public FormatContext
 	LuaFormatRange GetFormattedRange();
 private:
 	LuaFormatRange _validRange;
-	int _formattedLine;
+	LuaFormatRange _formattedRange;
+	bool _inValidRange;
 };

include/CodeService/LuaFormatRange.h

@@ -5,10 +5,15 @@ class LuaFormatRange
 public:
 	LuaFormatRange(int startLine, int endLine)
 		: StartLine(startLine),
-		  EndLine(endLine)
+		  EndLine(endLine),
+		  StartCharacter(0),
+		  EndCharacter(0)
 	{
 	}
 
 	int StartLine;
 	int EndLine;
+
+	int StartCharacter;
+	int EndCharacter;
 };

include/CodeService/LuaFormatter.h

@@ -17,7 +17,7 @@ class LuaFormatter
 
 	std::string GetFormattedText();
 
-	std::string GetRangeFormattedText(LuaFormatRange validRange);
+	std::string GetRangeFormattedText(LuaFormatRange& validRange);
 
 	std::vector<LuaDiagnosisInfo> GetDiagnosisInfos();