Revert "[clang-format] Fix an off-by-1 bug with -length option (#143302)"
This reverts commit 1fae5918b3d6fbed8ce6d8a2edf31bdf304ca8db because it may
break VSCode.
Closes #146036
NOKEYCHECK=True
GitOrigin-RevId: da283b54d964c4b08395baa57d8b33dcb59dfd07
diff --git a/ClangFormat.cpp b/ClangFormat.cpp
index c0efbb7..24ad3cb 100644
--- a/ClangFormat.cpp
+++ b/ClangFormat.cpp
@@ -284,7 +284,7 @@
if (Offsets.size() == 1 && EmptyLengths) {
Length = Sources.getFileOffset(Sources.getLocForEndOfFile(ID)) - Offsets[0];
} else if (Offsets.size() != Lengths.size()) {
- errs() << "error: number of -offset and -length arguments must match\n";
+ errs() << "error: number of -offset and -length arguments must match.\n";
return true;
}
for (unsigned I = 0, E = Offsets.size(), CodeSize = Code->getBufferSize();
@@ -296,16 +296,12 @@
}
if (!EmptyLengths)
Length = Lengths[I];
- if (Length == 0) {
- errs() << "error: length should be at least 1\n";
- return true;
- }
if (Offset + Length > CodeSize) {
errs() << "error: invalid length " << Length << ", offset + length ("
- << Offset + Length << ") is outside the file\n";
+ << Offset + Length << ") is outside the file.\n";
return true;
}
- Ranges.push_back(tooling::Range(Offset, Length - 1));
+ Ranges.push_back(tooling::Range(Offset, Length));
}
return false;
}
