refactor: better handling of prefix in template completion

lppedd · Apr 10, 2020 · c6a9e60 · c6a9e60
1 parent 24309e1
commit c6a9e60
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/src/main/kotlin/com/github/lppedd/cc/CCExtensions.kt b/src/main/kotlin/com/github/lppedd/cc/CCExtensions.kt
@@ -95,6 +95,7 @@ internal fun Editor.getCurrentLine(): CharSequence {
  return document.immutableCharSequence.subSequence(start, end)
 }
 
+@Suppress("unused")
 internal fun Editor.getCurrentLineUntilCaret(): CharSequence {
  val logicalPosition = caretModel.logicalPosition
  val lineStartOffset = document.getLineStartOffset(logicalPosition.line)

diff --git a/src/main/kotlin/com/github/lppedd/cc/completion/CommitCompletionContributor.kt b/src/main/kotlin/com/github/lppedd/cc/completion/CommitCompletionContributor.kt
@@ -11,6 +11,7 @@ import com.github.lppedd.cc.completion.resultset.DelegateResultSet
 import com.github.lppedd.cc.completion.resultset.TemplateDelegateResultSet
 import com.github.lppedd.cc.configuration.CCConfigService
 import com.github.lppedd.cc.configuration.CCConfigService.CompletionType.TEMPLATE
+import com.github.lppedd.cc.lookupElement.INDEX_TYPE
 import com.github.lppedd.cc.parser.CCParser
 import com.github.lppedd.cc.parser.CommitContext.*
 import com.github.lppedd.cc.parser.FooterContext.FooterTypeContext
@@ -76,20 +77,23 @@ private class CommitCompletionContributor : CompletionContributor() {
 
  ProgressManager.checkCanceled()
 
- val project = file.project
- val configService = CCConfigService.getInstance(project)
  val resultSet = result
  .caseInsensitive()
  .withPrefixMatcher(FlatPrefixMatcher(parameters.getCompletionPrefix()))
  .withRelevanceSorter(sorter(CommitLookupElementWeigher))
 
- val isTemplateActive = TemplateManagerImpl.getTemplateState(parameters.editor) != null
+ val editor = parameters.editor
+ val templateState = TemplateManagerImpl.getTemplateState(editor)
+ val isTemplateActive = templateState != null
+
  val myResultSet = if (isTemplateActive) {
  TemplateDelegateResultSet(resultSet)
  } else {
  DelegateResultSet(resultSet)
  }
 
+ val project = file.project
+ val configService = CCConfigService.getInstance(project)
  val process = parameters.process
 
  // If the user configured commit messages to be completed via templates,
@@ -105,20 +109,33 @@ private class CommitCompletionContributor : CompletionContributor() {
  return
  }
 
- val editor = parameters.editor
- val caretModel = editor.caretModel
- val (lineNumber, lineCaretOffset) = caretModel.logicalPosition
- val lineUntilCaret = editor.getCurrentLineUntilCaret()
+ val document = editor.document
+ val caretLogicalPosition = editor.caretModel.logicalPosition
+ val caretLineNumber = caretLogicalPosition.line
+ var caretOffsetInLine = caretLogicalPosition.column
+ val lineStartOffset = document.getLineStartOffset(caretLineNumber)
+ val lineUntilCaret = if (templateState?.currentVariableNumber == INDEX_TYPE) {
+ // If we are completing a type with template, we need to consider only
+ // the part of the line after the range marker's start
+ val typeStartOffset = templateState.getSegmentRange(INDEX_TYPE).startOffset
+ val start = typeStartOffset - document.getLineRangeByOffset(typeStartOffset).startOffset
+
+ caretOffsetInLine -= typeStartOffset
+ document.getSegment(start, start + caretOffsetInLine)
+ } else {
+ document.getSegment(lineStartOffset, lineStartOffset + caretOffsetInLine)
+ }
+
  val providers = mutableListOf<CompletionProvider<*>>()
 
  // After the second line we are inside the body/footer context
- val isInBodyOrFooterContext = lineNumber > 1
+ val isInBodyOrFooterContext = caretLineNumber > 1
 
  if (isInBodyOrFooterContext) {
- val firstLineTokens = CCParser.parseHeader(editor.document.getLine(0))
+ val firstLineTokens = CCParser.parseHeader(document.getLine(0))
  val footerTokens = CCParser.parseFooter(lineUntilCaret)
 
- when (val context = footerTokens.getContext(lineCaretOffset)) {
+ when (val context = footerTokens.getContext(caretOffsetInLine)) {
  is FooterTypeContext -> {
  providers.add(FooterTypeCompletionProvider(project, context))
  providers.add(BodyCompletionProvider(project, context, firstLineTokens))
@@ -132,7 +149,7 @@ private class CommitCompletionContributor : CompletionContributor() {
  if (!isTemplateActive || !isInBodyOrFooterContext) {
  val commitTokens = CCParser.parseHeader(lineUntilCaret)
 
- when (val context = commitTokens.getContext(lineCaretOffset)) {
+ when (val context = commitTokens.getContext(caretOffsetInLine)) {
  is TypeCommitContext -> providers.add(TypeCompletionProvider(project, context))
  is ScopeCommitContext -> {
  if (isTemplateActive) {

diff --git a/src/main/kotlin/com/github/lppedd/cc/lookupElement/TemplateCommitTypeLookupElement.kt b/src/main/kotlin/com/github/lppedd/cc/lookupElement/TemplateCommitTypeLookupElement.kt
@@ -16,6 +16,7 @@ import com.intellij.openapi.util.TextRange
 import kotlin.math.max
 import kotlin.math.min
 
+internal const val INDEX_TYPE = 0
 internal const val INDEX_SCOPE = 1
 internal const val INDEX_SUBJECT = 2
 internal const val INDEX_BODY_OR_FOOTER_TYPE = 3