averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SourceKit] Dedicated error message for 'offset' + 'length' out of range

Browse Source
This commit is contained in:
Rintaro Ishizaki
2018-08-02 09:29:28 +09:00
parent 930d4342cd
commit 399fece7f5
5 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
View File

@@ -1709,13 +1709,15 @@ ImmutableTextSnapshotRef SwiftEditorDocument::initializeText(
ImmutableTextSnapshotRef SwiftEditorDocument::replaceText(
unsigned Offset, unsigned Length, llvm::MemoryBuffer *Buf,
bool ProvideSemanticInfo) {
bool ProvideSemanticInfo, std::string &error) {
llvm::sys::ScopedLock L(Impl.AccessMtx);
// Validate offset and length.
if ((Offset + Length) > Impl.EditableBuffer->getSize())
if ((Offset + Length) > Impl.EditableBuffer->getSize()) {
error = "'offset' + 'length' is out of range";
return nullptr;
}
Impl.Edited = true;
llvm::StringRef Str = Buf->getBuffer();
@@ -2241,10 +2243,12 @@ void SwiftLangSupport::editorReplaceText(StringRef Name,
StringRef PreEditTextRef(BufferStart + Offset, Length);
PreEditText = PreEditTextRef.str();
}
std::string error;
Snapshot = EditorDoc->replaceText(Offset, Length, Buf,
Consumer.needsSemanticInfo());
Consumer.needsSemanticInfo(), error);
if (!Snapshot) {
Consumer.handleRequestError("Failed to replace text");
assert(error.size());
Consumer.handleRequestError(error.c_str());
return;
}