Change private helper function into an extension function

Author: themkat

server/src/main/kotlin/org/javacs/kt/codeaction/quickfix/QuickFix.kt

@@ -7,6 +7,7 @@ import org.eclipse.lsp4j.Range
 import org.eclipse.lsp4j.jsonrpc.messages.Either
 import org.javacs.kt.CompiledFile
 import org.javacs.kt.index.SymbolIndex
+import org.javacs.kt.util.isSubrangeOf
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
 import org.jetbrains.kotlin.diagnostics.Diagnostic as KotlinDiagnostic
 
@@ -16,15 +17,7 @@ interface QuickFix {
 }
 
 fun diagnosticMatch(diagnostic: Diagnostic, range: Range, diagnosticTypes: Set<String>): Boolean =
-    isDiagnosticInRange(diagnostic, range) && diagnosticTypes.contains(diagnostic.code.left)
-
-// for a diagnostic to be in range the lines should be the same, and
-//  the input character range should be within the bounds of the diagnostics range.
-private fun isDiagnosticInRange(diagnostic: Diagnostic, range: Range): Boolean {
-    val diagnosticRange = diagnostic.range
-    return diagnosticRange.start.line == range.start.line && diagnosticRange.end.line == range.end.line &&
-        diagnosticRange.start.character <= range.start.character && diagnosticRange.end.character >= range.end.character
-}
+    range.isSubrangeOf(diagnostic.range) && diagnosticTypes.contains(diagnostic.code.left)
 
 fun diagnosticMatch(diagnostic: KotlinDiagnostic, startCursor: Int, endCursor: Int, diagnosticTypes: Set<String>): Boolean =
     diagnostic.textRanges.any { it.startOffset <= startCursor && it.endOffset >= endCursor } && diagnosticTypes.contains(diagnostic.factory.name)

server/src/main/kotlin/org/javacs/kt/util/RangeUtils.kt

@@ -0,0 +1,8 @@
+package org.javacs.kt.util
+
+import org.eclipse.lsp4j.Range
+
+// checks if the current range is within the other range (same lines, within the character bounds)
+fun Range.isSubrangeOf(otherRange: Range): Boolean =
+    otherRange.start.line == this.start.line && otherRange.end.line == this.end.line &&
+        otherRange.start.character <= this.start.character && otherRange.end.character >= this.end.character