Browse Source

SONAR-7509 Revert to not check empty ranges to not break Java plugin

tags/5.6-RC2
Julien HENRY 8 years ago
parent
commit
f18f19a4e2

+ 0
- 2
sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputFile.java View File

@@ -238,7 +238,6 @@ public class DefaultInputFile extends DefaultInputComponent implements InputFile
public TextRange newRange(int startLine, int startLineOffset, int endLine, int endLineOffset) {
TextPointer start = newPointer(startLine, startLineOffset);
TextPointer end = newPointer(endLine, endLineOffset);
Preconditions.checkArgument(start.compareTo(end) < 0, "Start pointer %s should be before end pointer %s", start, end);
return newRangeValidPointers(start, end);
}

@@ -263,7 +262,6 @@ public class DefaultInputFile extends DefaultInputComponent implements InputFile
* Create Range from global offsets. Used for backward compatibility with older API.
*/
public TextRange newRange(int startOffset, int endOffset) {
Preconditions.checkArgument(startOffset < endOffset, "Start offset %s should be strictly before end offset %s", startOffset, endOffset);
return newRangeValidPointers(newPointer(startOffset), newPointer(endOffset));
}


+ 2
- 0
sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/internal/DefaultHighlighting.java View File

@@ -79,6 +79,8 @@ public class DefaultHighlighting extends DefaultStorable implements NewHighlight
checkInputFileNotNull();
TextRange newRange;
try {
// TODO remove when SONAR-7664 is implemented
Preconditions.checkArgument(startOffset < endOffset, "start offset should be strictly before end offset");
newRange = inputFile.newRange(startOffset, endOffset);
} catch (Exception e) {
throw new IllegalArgumentException("Unable to highlight file " + inputFile, e);

+ 0
- 12
sonar-plugin-api/src/test/java/org/sonar/api/batch/sensor/highlighting/internal/DefaultHighlightingTest.java View File

@@ -107,18 +107,6 @@ public class DefaultHighlightingTest {
.save();
}

@Test
public void should_prevent_start_equal_end2() {
throwable.expect(IllegalArgumentException.class);
throwable
.expectMessage("Unable to highlight file");

new DefaultHighlighting(mock(SensorStorage.class))
.onFile(INPUT_FILE)
.highlight(1, 10, 1, 10, KEYWORD)
.save();
}

@Test
public void should_prevent_boudaries_overlapping() {
throwable.expect(IllegalStateException.class);

Loading…
Cancel
Save