Skip to content

Fix quality flaw: #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 16, 2021
Merged

Fix quality flaw: #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab6e3c8
Fix quality flaw:
leveretka Nov 15, 2021
0e5c073
Merge branch 'master' into fix-quality
margarita-nedzelska-sonarsource Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sonar-kotlin-plugin/src/main/java/org/sonarsource/kotlin/api/InputFileContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ interface InputFileContext {
gap: Double?,
)

fun reportAnalysisParseError(repositoryKey: String?, inputFile: InputFile, location: TextPointer?)
fun reportAnalysisParseError(repositoryKey: String, inputFile: InputFile, location: TextPointer?)

fun reportAnalysisError(message: String?, location: TextPointer?)
}
1 change: 0 additions & 1 deletion ...lugin/src/main/java/org/sonarsource/kotlin/converter/CommentAnnotationsAndTokenVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import org.jetbrains.kotlin.psi.KtValueArgument
import org.jetbrains.kotlin.psi.psiUtil.endOffset
import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.sonar.api.batch.fs.InputFile
import org.sonar.api.batch.fs.TextPointer
import org.sonar.api.batch.fs.TextRange
import org.sonarsource.kotlin.converter.KotlinTextRanges.textPointerAtOffset

Expand Down
2 changes: 1 addition & 1 deletion sonar-kotlin-plugin/src/main/java/org/sonarsource/kotlin/plugin/InputFileContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class InputFileContextImpl(
}
}

override fun reportAnalysisParseError(repositoryKey: String?, inputFile: InputFile, location: TextPointer?) {
override fun reportAnalysisParseError(repositoryKey: String, inputFile: InputFile, location: TextPointer?) {
reportAnalysisError("Unable to parse file: $inputFile", location)

val parsingErrorRuleKey = RuleKey.of(repositoryKey, PARSING_ERROR_RULE_KEY)
Expand Down
2 changes: 1 addition & 1 deletion sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/DummyInputFileContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class DummyInputFileContext : InputFileContext {
issuesReported.add(ReportedIssue(ruleKey, textRange, message, secondaryLocations, gap))
}

override fun reportAnalysisParseError(repositoryKey: String?, inputFile: InputFile, location: TextPointer?) {
override fun reportAnalysisParseError(repositoryKey: String, inputFile: InputFile, location: TextPointer?) {
throw NotImplementedError()
}

Expand Down
2 changes: 1 addition & 1 deletion ...in/src/test/java/org/sonarsource/kotlin/plugin/surefire/data/SurefireStaxHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void shouldHaveErrorsAndFailures() throws XMLStreamException {

// error
UnitTestResult error = report.getResults().get(1);
assertThat(error.getDurationMilliseconds()).isEqualTo(0L);
assertThat(error.getDurationMilliseconds()).isZero();
assertThat(error.getStatus()).isEqualTo(UnitTestResult.STATUS_ERROR);
assertThat(error.getName()).isEqualTo("testTwo");
}
Expand Down
2 changes: 1 addition & 1 deletion ...in/src/test/java/org/sonarsource/kotlin/plugin/surefire/data/UnitTestClassReportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void shouldHaveEmptyReport() {
assertThat(report.getResults().size()).isZero();
assertThat(report.getSkipped()).isZero();
assertThat(report.getTests()).isZero();
assertThat(report.getDurationMilliseconds()).isEqualTo(0L);
assertThat(report.getDurationMilliseconds()).isZero();
assertThat(report.getErrors()).isZero();
assertThat(report.getFailures()).isZero();
}
Expand Down
2 changes: 1 addition & 1 deletion sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/verifier/TestContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ internal class TestContext(
})
}

override fun reportAnalysisParseError(repositoryKey: String?, inputFile: InputFile, location: TextPointer?) {
override fun reportAnalysisParseError(repositoryKey: String, inputFile: InputFile, location: TextPointer?) {
throw NotImplementedError()
}

Expand Down