Merge branch 'master' into dependabot/gradle/com.google.code.gson-gson-2.9.1

KengoTODA · web-flow · commit b89ebeddae89 · 2022-08-28T07:30:34.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ Currently the versioning policy of this project follows [Semantic Versioning v2.
 ## Unreleased - 2022-??-??
 ### Fixed
 - Bumped gson from 2.9.0 to 2.9.1 ([#2136](https://github.com/spotbugs/spotbugs/pull/2136))
+- Fixed InvalidInputException in Eclipse while bug reporting ([#2134](https://github.com/spotbugs/spotbugs/issues/2134))
 
 ## 4.7.1 - 2022-06-26
 ### Fixed
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
   id "org.sonarqube" version "3.4.0.2513"
   id "com.diffplug.spotless" version "6.5.2"
   id "org.gradle.crypto.checksum" version "1.4.0"
-  id "com.github.spotbugs" version "5.0.8"
+  id "com.github.spotbugs" version "5.0.10"
   id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
 }
 
@@ -37,7 +37,7 @@ allprojects {
     mavenCentral()
   }
   dependencies {
-    implementation platform('org.junit:junit-bom:5.8.2')
+    implementation platform('org.junit:junit-bom:5.9.0')
   }
 }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -6,5 +6,5 @@ repositories {
     gradlePluginPortal()
 }
 dependencies {
-    implementation("com.diffplug.gradle:goomph:3.37.1")
+    implementation("com.diffplug.gradle:goomph:3.37.2")
 }
diff --git a/eclipsePlugin-junit/build.gradle b/eclipsePlugin-junit/build.gradle
@@ -12,7 +12,7 @@ tasks.named('compileJava', JavaCompile).configure {
 dependencies {
   implementation project(':eclipsePlugin')
   testImplementation 'junit:junit:4.13.2'
-  testImplementation 'org.mockito:mockito-core:4.6.1'
+  testImplementation 'org.mockito:mockito-core:4.7.0'
 }
 
 tasks.named('jacocoTestReport', JacocoReport).configure {
diff --git a/eclipsePlugin/src/de/tobject/findbugs/reporter/MarkerUtil.java b/eclipsePlugin/src/de/tobject/findbugs/reporter/MarkerUtil.java
@@ -437,7 +437,15 @@ private static IScanner initScanner(IType source, ISourceRange range) throws Jav
         if (charContent == null) {
             return null;
         }
-        IScanner scanner = ToolFactory.createScanner(false, false, false, true);
+        IScanner scanner;
+        IJavaProject project = source.getJavaProject();
+        if (project != null) {
+            String sourceLevel = project.getOption(JavaCore.COMPILER_SOURCE, true);
+            String complianceLevel = project.getOption(JavaCore.COMPILER_COMPLIANCE, true);
+            scanner = ToolFactory.createScanner(false, false, true, sourceLevel, complianceLevel);
+        } else {
+            scanner = ToolFactory.createScanner(false, false, false, true);
+        }
         scanner.setSource(charContent);
         int offset = range.getOffset();
         try {
diff --git a/spotbugs/src/main/java/edu/umd/cs/findbugs/DetectorFactory.java b/spotbugs/src/main/java/edu/umd/cs/findbugs/DetectorFactory.java
@@ -159,7 +159,7 @@ public Class<?> getDetectorClass() {
      *            comma separated list of bug pattern codes reported by the
      *            detector; empty if unknown
      * @param requireJRE
-     *            string describing JRE version required to run the the
+     *            string describing JRE version required to run the
      *            detector: e.g., "1.5"
      */
     public DetectorFactory(@Nonnull Plugin plugin, @Nonnull String className,
diff --git a/spotbugs/src/main/java/edu/umd/cs/findbugs/bytecode/MemberUtils.java b/spotbugs/src/main/java/edu/umd/cs/findbugs/bytecode/MemberUtils.java
@@ -98,7 +98,7 @@ public static boolean couldBeLambda(final MethodGen m) {
     }
 
     /**
-     * Checks if the the given method was user-generated. This takes into
+     * Checks if the given method was user-generated. This takes into
      * account for instance lambda methods, that even though they are marked as
      * "synthetic", they are user-generated, and therefore interesting to
      * analysis.
@@ -111,7 +111,7 @@ public static boolean isUserGenerated(final FieldOrMethod m) {
     }
 
     /**
-     * Checks if the the given method was user-generated. This takes into
+     * Checks if the given method was user-generated. This takes into
      * account for instance lambda methods, that even though they are marked as
      * "synthetic", they are user-generated, and therefore interesting to
      * analysis.
@@ -124,7 +124,7 @@ public static boolean isUserGenerated(final ClassMember m) {
     }
 
     /**
-     * Checks if the the given method was user-generated. This takes into
+     * Checks if the given method was user-generated. This takes into
      * account for instance lambda methods, that even though they are marked as
      * "synthetic", they are user-generated, and therefore interesting to
      * analysis.
diff --git a/spotbugs/src/main/java/edu/umd/cs/findbugs/detect/FindInconsistentSync2.java b/spotbugs/src/main/java/edu/umd/cs/findbugs/detect/FindInconsistentSync2.java
@@ -802,7 +802,7 @@ private void analyzeMethod(ClassContext classContext, Method method, Set<Method>
     }
 
     /**
-     * Determine whether or not the the given method is a getter method. I.e.,
+     * Determine whether or not the given method is a getter method. I.e.,
      * if it just returns the value of an instance field.
      *
      * @param classContext

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ plugins {`
`2`	`2`	`id "org.sonarqube" version "3.4.0.2513"`
`3`	`3`	`id "com.diffplug.spotless" version "6.5.2"`
`4`	`4`	`id "org.gradle.crypto.checksum" version "1.4.0"`
`5`		`- id "com.github.spotbugs" version "5.0.8"`
	`5`	`+ id "com.github.spotbugs" version "5.0.10"`
`6`	`6`	`id "io.github.gradle-nexus.publish-plugin" version "1.1.0"`
`7`	`7`	`}`
`8`	`8`
`@@ -37,7 +37,7 @@ allprojects {`
`37`	`37`	`mavenCentral()`
`38`	`38`	`}`
`39`	`39`	`dependencies {`
`40`		`- implementation platform('org.junit:junit-bom:5.8.2')`
	`40`	`+ implementation platform('org.junit:junit-bom:5.9.0')`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ repositories {`
`6`	`6`	`gradlePluginPortal()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- implementation("com.diffplug.gradle:goomph:3.37.1")`
	`9`	`+ implementation("com.diffplug.gradle:goomph:3.37.2")`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ tasks.named('compileJava', JavaCompile).configure {`
`12`	`12`	`dependencies {`
`13`	`13`	`implementation project(':eclipsePlugin')`
`14`	`14`	`testImplementation 'junit:junit:4.13.2'`
`15`		`- testImplementation 'org.mockito:mockito-core:4.6.1'`
	`15`	`+ testImplementation 'org.mockito:mockito-core:4.7.0'`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`tasks.named('jacocoTestReport', JacocoReport).configure {`
Original file line number	Diff line number	Diff line change
`@@ -802,7 +802,7 @@ private void analyzeMethod(ClassContext classContext, Method method, Set<Method>`
`802`	`802`	`}`
`803`	`803`
`804`	`804`	`/**`
`805`		`- * Determine whether or not the the given method is a getter method. I.e.,`
	`805`	`+ * Determine whether or not the given method is a getter method. I.e.,`
`806`	`806`	`* if it just returns the value of an instance field.`
`807`	`807`	`*`
`808`	`808`	`* @param classContext`