Consistency change based upon what the class is currently doing

Author: themkat

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

@@ -44,25 +44,25 @@ class ImplementAbstractMembersQuickFix : QuickFix {
 
         // If the client side and the server side diagnostics contain a valid diagnostic for this range.
         if (diagnostic != null && anyDiagnosticMatch(kotlinDiagnostics, startCursor, endCursor)) {
-            // Get the class with the missing functions
+            // Get the class with the missing members
             val kotlinClass = file.parseAtPoint(startCursor)
             if (kotlinClass is KtClass) {
                 // Get the functions that need to be implemented
-                val functionsToImplement = getAbstractFunctionStubs(file, kotlinClass)
+                val membersToImplement = getAbstractMembersStubs(file, kotlinClass)
 
                 val uri = file.parse.toPath().toUri().toString()
-                // Get the padding to be introduced before the function declarations
+                // Get the padding to be introduced before the member declarations
                 val padding = getDeclarationPadding(file, kotlinClass)
 
                 // Get the location where the new code will be placed
-                val newFunctionStartPosition = getNewFunctionStartPosition(file, kotlinClass)
-                val bodyAppendBeginning = listOf(TextEdit(Range(newFunctionStartPosition, newFunctionStartPosition), "{")).takeIf { kotlinClass.hasNoBody() } ?: emptyList()
-                val bodyAppendEnd = listOf(TextEdit(Range(newFunctionStartPosition, newFunctionStartPosition), System.lineSeparator() + "}")).takeIf { kotlinClass.hasNoBody() } ?: emptyList()
+                val newMembersStartPosition = getNewMembersStartPosition(file, kotlinClass)
+                val bodyAppendBeginning = listOf(TextEdit(Range(newMembersStartPosition, newMembersStartPosition), "{")).takeIf { kotlinClass.hasNoBody() } ?: emptyList()
+                val bodyAppendEnd = listOf(TextEdit(Range(newMembersStartPosition, newMembersStartPosition), System.lineSeparator() + "}")).takeIf { kotlinClass.hasNoBody() } ?: emptyList()
 
-                val textEdits = bodyAppendBeginning + functionsToImplement.map {
-                    // We leave two new lines before the function is inserted
+                val textEdits = bodyAppendBeginning + membersToImplement.map {
+                    // We leave two new lines before the member is inserted
                     val newText = System.lineSeparator() + System.lineSeparator() + padding + it
-                    TextEdit(Range(newFunctionStartPosition, newFunctionStartPosition), newText)
+                    TextEdit(Range(newMembersStartPosition, newMembersStartPosition), newText)
                 } + bodyAppendEnd
 
                 val codeAction = CodeAction()
@@ -83,7 +83,7 @@ fun findDiagnosticMatch(diagnostics: List<Diagnostic>, range: Range) =
 private fun anyDiagnosticMatch(diagnostics: Diagnostics, startCursor: Int, endCursor: Int) =
     diagnostics.any { diagnosticMatch(it, startCursor, endCursor, hashSetOf("ABSTRACT_MEMBER_NOT_IMPLEMENTED", "ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED")) }
 
-private fun getAbstractFunctionStubs(file: CompiledFile, kotlinClass: KtClass) =
+private fun getAbstractMembersStubs(file: CompiledFile, kotlinClass: KtClass) =
     // For each of the super types used by this class
     kotlinClass.superTypeListEntries.mapNotNull {
         // Find the definition of this super type
@@ -214,12 +214,12 @@ private fun getDeclarationPadding(file: CompiledFile, kotlinClass: KtClass): Str
     return " ".repeat(paddingSize)
 }
 
-private fun getNewFunctionStartPosition(file: CompiledFile, kotlinClass: KtClass): Position? =
-    // If the class is not empty, the new function will be put right after the last declaration
+private fun getNewMembersStartPosition(file: CompiledFile, kotlinClass: KtClass): Position? =
+    // If the class is not empty, the new member will be put right after the last declaration
     if (kotlinClass.declarations.isNotEmpty()) {
         val lastFunctionEndOffset = kotlinClass.declarations.last().endOffset
         position(file.content, lastFunctionEndOffset)
-    } else { // Otherwise, the function is put at the beginning of the class
+    } else { // Otherwise, the member is put at the beginning of the class
         val body = kotlinClass.body
         if (body != null) {
             position(file.content, body.startOffset + 1)