sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 16:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1645 from loradd/loradd/fix-findings-from-conversion-1517

Browse source 
Fixes eclipse/xtext-core#1517
This commit is contained in:
Sebastian Zarnekow 2020-12-11 08:54:56 +01:00 committed by GitHub
commit 610ea8dfa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/contentassist/ContentAssistService.java
View file

@ -183,19 +183,14 @@ public class ContentAssistService {
}
protected TextEdit toTextEdit(ReplaceRegion region, Document doc) {
Position start = null;
if (region.getOffset() > doc.getContents().length()) {
Position docEnd = doc.getPosition(doc.getContents().length());
start = new Position(docEnd.getLine(), docEnd.getCharacter() + region.getLength());
} else {
start = doc.getPosition(region.getOffset());
}
Position end = null;
if (region.getEndOffset() > doc.getContents().length()) {
end = new Position(start.getLine(), start.getCharacter() + region.getLength());
} else {
end = doc.getPosition(region.getEndOffset());
}
final Position start = getPosition(doc, region.getOffset());
final Position end = getPosition(doc, region.getEndOffset());
return new TextEdit(new Range(start, end), region.getText());
}
private Position getPosition(final Document doc, final int offset) {
final int docLength = doc.getContents().length();
return offset > docLength ? doc.getPosition(docLength) : doc.getPosition(offset);
}
}