Skip to content

Commit e578518

Browse files
carlrobertohcarlrobertoh
committed
chore: upgrade to 2025.1 and align dependencies
1 parent c15976d commit e578518

File tree

11 files changed

+7
-299
lines changed

11 files changed

+7
-299
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
bundledPlugin("com.intellij.java")
6464
bundledPlugin("org.jetbrains.kotlin")
6565
bundledPlugin("Git4Idea")
66-
plugin("PythonCore:241.14494.240")
66+
plugin("PythonCore:251.25410.109")
6767

6868
testFramework(TestFrameworkType.Platform)
6969
testFramework(TestFrameworkType.JUnit5)

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ pluginVersion = 3.6.4
88

99
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
1010
pluginSinceBuild = 241.1
11-
pluginUntilBuild = 252.*
11+
pluginUntilBuild = 253.*
1212

1313
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
1414
platformType = IC
15-
platformVersion = 2024.1.2
15+
platformVersion = 2025.1.1
1616

1717
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1818
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

‎src/main/kotlin/ee/carlrobert/codegpt/actions/InlayActionPromoter.kt‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
package ee.carlrobert.codegpt.actions
22

3-
import com.intellij.codeInsight.inline.completion.session.InlineCompletionContext
43
import com.intellij.openapi.actionSystem.ActionPromoter
54
import com.intellij.openapi.actionSystem.AnAction
65
import com.intellij.openapi.actionSystem.CommonDataKeys
76
import com.intellij.openapi.actionSystem.DataContext
87
import ee.carlrobert.codegpt.CodeGPTKeys
9-
import ee.carlrobert.codegpt.codecompletions.AcceptNextLineInlayAction
10-
import ee.carlrobert.codegpt.codecompletions.AcceptNextWordInlayAction
11-
import ee.carlrobert.codegpt.predictions.OpenPredictionAction
12-
import ee.carlrobert.codegpt.predictions.TriggerCustomPredictionAction
13-
import ee.carlrobert.codegpt.inlineedit.AcceptCurrentInlineEditAction
148
import ee.carlrobert.codegpt.actions.editor.AcceptInlineEditAction
159
import ee.carlrobert.codegpt.actions.editor.InlineEditContextMenuAction
1610
import ee.carlrobert.codegpt.actions.editor.InlineEditFloatingMenuAction
11+
import ee.carlrobert.codegpt.inlineedit.AcceptCurrentInlineEditAction
1712
import ee.carlrobert.codegpt.inlineedit.RejectCurrentInlineEditAction
13+
import ee.carlrobert.codegpt.predictions.OpenPredictionAction
14+
import ee.carlrobert.codegpt.predictions.TriggerCustomPredictionAction
1815

1916
class InlayActionPromoter : ActionPromoter {
2017
override fun promote(actions: List<AnAction>, context: DataContext): List<AnAction> {
@@ -36,10 +33,6 @@ class InlayActionPromoter : ActionPromoter {
3633
actions.filterIsInstance<TriggerCustomPredictionAction>().takeIf { it.isNotEmpty() }?.let { return it }
3734
actions.filterIsInstance<OpenPredictionAction>().takeIf { it.isNotEmpty() }?.let { return it }
3835

39-
if (InlineCompletionContext.getOrNull(editor) == null) return emptyList()
40-
41-
actions.filterIsInstance<AcceptNextWordInlayAction>().takeIf { it.isNotEmpty() }?.let { return it }
42-
actions.filterIsInstance<AcceptNextLineInlayAction>().takeIf { it.isNotEmpty() }?.let { return it }
4336
return emptyList()
4437
}
4538
}

‎src/main/kotlin/ee/carlrobert/codegpt/codecompletions/AbstractInlayActionHandler.kt‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎src/main/kotlin/ee/carlrobert/codegpt/codecompletions/AcceptNextLineInlayAction.kt‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎src/main/kotlin/ee/carlrobert/codegpt/codecompletions/AcceptNextWordInlayAction.kt‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎src/main/kotlin/ee/carlrobert/codegpt/codecompletions/CodeCompletionProviderPresentation.kt‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package ee.carlrobert.codegpt.codecompletions
22

33
import com.intellij.codeInsight.inline.completion.InlineCompletionProviderPresentation
4-
import com.intellij.openapi.actionSystem.ActionManager
54
import com.intellij.openapi.components.service
6-
import com.intellij.openapi.keymap.KeymapUtil
75
import com.intellij.openapi.project.Project
86
import com.intellij.ui.components.JBLabel
97
import ee.carlrobert.codegpt.Icons
@@ -17,20 +15,12 @@ class CodeCompletionProviderPresentation : InlineCompletionProviderPresentation
1715
project?.service<CodeCompletionService>()?.getSelectedModelCode() ?: ""
1816
val text = if (selectedModelCode.isNotEmpty()) {
1917
buildString {
20-
append("<html>Model: (<strong>$selectedModelCode</strong>) | ")
21-
append("Accept Word: (<strong>${getShortcutText(AcceptNextWordInlayAction.ID)}</strong>) | ")
22-
append("Accept Line: (<strong>${getShortcutText(AcceptNextLineInlayAction.ID)}</strong>)</html>")
18+
append("<html>Model: (<strong>$selectedModelCode</strong>)</html>")
2319
}
2420
} else {
2521
"ProxyAI"
2622
}
2723

2824
return JBLabel(text, Icons.DefaultSmall, SwingConstants.LEADING)
2925
}
30-
31-
private fun getShortcutText(actionId: String): String {
32-
return KeymapUtil.getFirstKeyboardShortcutText(
33-
ActionManager.getInstance().getAction(actionId)
34-
)
35-
}
3626
}

‎src/main/kotlin/ee/carlrobert/codegpt/codecompletions/CodeCompletionSuggestionUpdateAdapter.kt‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package ee.carlrobert.codegpt.codecompletions
22

3-
import ai.grazie.nlp.utils.takeWhitespaces
43
import com.intellij.codeInsight.inline.completion.InlineCompletionEvent
5-
import com.intellij.codeInsight.inline.completion.elements.InlineCompletionGrayTextElement
64
import com.intellij.codeInsight.inline.completion.suggestion.InlineCompletionSuggestionUpdateManager
75
import com.intellij.codeInsight.inline.completion.suggestion.InlineCompletionSuggestionUpdateManager.UpdateResult
8-
import com.intellij.codeInsight.inline.completion.suggestion.InlineCompletionSuggestionUpdateManager.UpdateResult.Changed
9-
import com.intellij.codeInsight.inline.completion.suggestion.InlineCompletionSuggestionUpdateManager.UpdateResult.Invalidated
106
import com.intellij.codeInsight.inline.completion.suggestion.InlineCompletionVariant
117
import com.intellij.openapi.editor.Editor
128
import ee.carlrobert.codegpt.CodeGPTKeys.REMAINING_EDITOR_COMPLETION
@@ -22,61 +18,6 @@ class CodeCompletionSuggestionUpdateAdapter :
2218
return super.onDocumentChange(event, variant)
2319
}
2420

25-
override fun onCustomEvent(
26-
event: InlineCompletionEvent,
27-
variant: InlineCompletionVariant.Snapshot
28-
): UpdateResult {
29-
if (variant.elements.isEmpty()) return Invalidated
30-
31-
val completionText = variant.elements.joinToString("") { it.text }
32-
return when (event) {
33-
is ApplyNextWordInlaySuggestionEvent -> handleNextWordEvent(event, variant, completionText)
34-
is ApplyNextLineInlaySuggestionEvent -> handleNextLineEvent(event, variant, completionText)
35-
else -> Invalidated
36-
}
37-
}
38-
39-
private fun handleNextWordEvent(
40-
event: ApplyNextWordInlaySuggestionEvent,
41-
variant: InlineCompletionVariant.Snapshot,
42-
completionText: String
43-
): UpdateResult {
44-
val textToInsert = CompletionSplitter.split(completionText)
45-
return createUpdatedVariant(event.toRequest().editor, variant, completionText, textToInsert)
46-
}
47-
48-
private fun handleNextLineEvent(
49-
event: ApplyNextLineInlaySuggestionEvent,
50-
variant: InlineCompletionVariant.Snapshot,
51-
completionText: String
52-
): UpdateResult {
53-
val lineBreakIndex = completionText.indexOf('\n')
54-
if (lineBreakIndex == -1) return Invalidated
55-
56-
val nextLineStart = lineBreakIndex + 1
57-
val whitespacesLength = completionText
58-
.substring(nextLineStart)
59-
.takeWhitespaces()
60-
.length
61-
val textToInsert = completionText.substring(0, nextLineStart + whitespacesLength)
62-
63-
return createUpdatedVariant(event.toRequest().editor, variant, completionText, textToInsert)
64-
}
65-
66-
private fun createUpdatedVariant(
67-
editor: Editor,
68-
variant: InlineCompletionVariant.Snapshot,
69-
completionText: String,
70-
textToInsert: String
71-
): UpdateResult {
72-
updateRemainingCompletion(editor, textToInsert)
73-
return Changed(
74-
variant.copy(
75-
listOf(InlineCompletionGrayTextElement(completionText.removePrefix(textToInsert)))
76-
)
77-
)
78-
}
79-
8021
private fun updateRemainingCompletion(editor: Editor, textToInsert: String) {
8122
val remainingCompletion = REMAINING_EDITOR_COMPLETION.get(editor) ?: ""
8223
if (remainingCompletion.isNotEmpty()) {

‎src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/PromptTextField.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ class PromptTextField(
8686
document.putUserData(PROMPT_FIELD_KEY, this)
8787
setPlaceholder(CodeGPTBundle.get("toolwindow.chat.textArea.emptyText"))
8888

89-
putClientProperty(UIUtil.HIDE_EDITOR_FROM_DATA_CONTEXT_PROPERTY, true)
9089
installPasteHandler()
9190
}
9291

‎src/main/resources/META-INF/plugin.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,6 @@
143143
<keyboard-shortcut first-keystroke="ctrl ENTER" keymap="$default"/>
144144
</action>
145145

146-
<action
147-
id="codegpt.acceptNextInlayWord"
148-
text="Apply next word"
149-
use-shortcut-of="EditorNextWord"
150-
class="ee.carlrobert.codegpt.codecompletions.AcceptNextWordInlayAction"/>
151-
152-
<action
153-
id="codegpt.acceptNextInlayLine"
154-
text="Apply next line"
155-
use-shortcut-of="EditorLineEnd"
156-
class="ee.carlrobert.codegpt.codecompletions.AcceptNextLineInlayAction"/>
157-
158146
<group id="CodeGPTEditorPopup">
159147
<group id="action.editor.group.EditorActionGroup"
160148
text="ProxyAI"

0 commit comments

Comments
 (0)