Commit e0adbba 1 parent 9663e9d commit e0adbba Copy full SHA for e0adbba
File tree 2 files changed +17
-3
lines changed
extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension
2 files changed +17
-3
lines changed Original file line number Diff line number Diff line change 1
1
package com.github.continuedev.continueintellijextension.editor
2
2
3
3
import com.github.continuedev.continueintellijextension.utils.getAltKeyLabel
4
+ import com.github.continuedev.continueintellijextension.utils.getShiftKeyLabel
4
5
import com.intellij.openapi.Disposable
5
6
import com.intellij.openapi.command.WriteCommandAction
6
7
import com.intellij.openapi.editor.Editor
@@ -131,10 +132,12 @@ class VerticalDiffBlock(
131
132
refreshEditor()
132
133
}
133
134
134
-
135
135
private fun createButtons (): Pair <JButton , JButton > {
136
136
val rejectBtn =
137
- createButton(" ${getAltKeyLabel()} ↑N" , JBColor (0x99FF0000 .toInt(), 0x99FF0000 .toInt())).apply {
137
+ createButton(
138
+ " ${getAltKeyLabel()}${getShiftKeyLabel()} N" ,
139
+ JBColor (0x99FF0000 .toInt(), 0x99FF0000 .toInt())
140
+ ).apply {
138
141
addActionListener {
139
142
handleReject();
140
143
onAcceptReject(this @VerticalDiffBlock, false )
@@ -143,7 +146,11 @@ class VerticalDiffBlock(
143
146
}
144
147
145
148
val acceptBtn =
146
- createButton(" ${getAltKeyLabel()} ↑Y" , JBColor (0x9900FF00 .toInt(), 0x9900FF00 .toInt())).apply {
149
+ createButton(
150
+ " ${getAltKeyLabel()}${
151
+ getShiftKeyLabel()
152
+ } Y" , JBColor (0x7700BB00 .toInt(), 0x7700BB00 .toInt())
153
+ ).apply {
147
154
addActionListener {
148
155
handleAccept();
149
156
onAcceptReject(this @VerticalDiffBlock, true )
Original file line number Diff line number Diff line change @@ -29,4 +29,11 @@ fun getAltKeyLabel(): String {
29
29
Os .WINDOWS -> " Alt"
30
30
Os .LINUX -> " Alt"
31
31
}
32
+ }
33
+
34
+ fun getShiftKeyLabel (): String {
35
+ return when (getOs()) {
36
+ Os .MAC -> " ⇧"
37
+ Os .WINDOWS , Os .LINUX -> " ↑"
38
+ }
32
39
}
You can’t perform that action at this time.
0 commit comments