Skip to content

Commit 700d7ca

Browse files
committed
Reply, delete, resolve, unresolve action for comments in editor
1 parent ae64775 commit 700d7ca

36 files changed

+164
-90
lines changed

merge-request-integration-ce/src/main/kotlin/net/ntworld/mergeRequestIntegrationIdeCE/AddCommentEditorAction.kt

Lines changed: 0 additions & 5 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package net.ntworld.mergeRequestIntegrationIdeCE
2+
3+
import net.ntworld.mergeRequestIntegrationIde.diff.DiffViewAddCommentActionBase
4+
5+
class DiffViewAddCommentAction : DiffViewAddCommentActionBase()
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package net.ntworld.mergeRequestIntegrationIdeCE
2+
3+
import net.ntworld.mergeRequestIntegrationIde.diff.DiffViewToggleCommentsActionBase
4+
5+
class DiffViewToggleCommentsAction : DiffViewToggleCommentsActionBase()

merge-request-integration-ce/src/main/kotlin/net/ntworld/mergeRequestIntegrationIdeCE/ToggleCommentsEditorAction.kt

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

merge-request-integration-ce/src/main/resources/META-INF/plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
</extensions>
4343

4444
<actions>
45-
<action class="net.ntworld.mergeRequestIntegrationIdeCE.ToggleCommentsEditorAction"
45+
<action class="net.ntworld.mergeRequestIntegrationIdeCE.DiffViewToggleCommentsAction"
4646
text="Toggle Comments"
4747
description="Toggle comments to this line">
4848
<keyboard-shortcut first-keystroke="alt V" keymap="$default"/>
4949
<add-to-group group-id="Diff.EditorPopupMenu" relative-to-action="Annotate" anchor="after" />
5050
</action>
51-
<action class="net.ntworld.mergeRequestIntegrationIdeCE.AddCommentEditorAction"
51+
<action class="net.ntworld.mergeRequestIntegrationIdeCE.DiffViewAddCommentAction"
5252
text="Add Comment"
5353
description="Add comment to this line">
5454
<keyboard-shortcut first-keystroke="alt C" keymap="$default"/>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package net.ntworld.mergeRequestIntegrationIde.component.gutter
2+
3+
enum class GutterActionType {
4+
ADD,
5+
TOGGLE
6+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.ntworld.mergeRequestIntegrationIde.diff.gutter
1+
package net.ntworld.mergeRequestIntegrationIde.component.gutter
22

33
import com.intellij.diff.util.Side
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.ntworld.mergeRequestIntegrationIde.diff.gutter
1+
package net.ntworld.mergeRequestIntegrationIde.component.gutter
22

33
interface GutterIconRendererActionListener {
44
fun performGutterIconRendererAction(gutterIconRenderer: GutterIconRenderer, type: GutterActionType)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package net.ntworld.mergeRequestIntegrationIde.diff.gutter
1+
package net.ntworld.mergeRequestIntegrationIde.component.gutter
22

33
import com.intellij.diff.util.Side
44
import com.intellij.openapi.editor.Editor
55
import com.intellij.openapi.editor.markup.RangeHighlighter
6-
import net.ntworld.mergeRequestIntegrationIde.diff.DiffView
76

87
object GutterIconRendererFactory {
98

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.ntworld.mergeRequestIntegrationIde.diff.gutter
1+
package net.ntworld.mergeRequestIntegrationIde.component.gutter
22

33
import com.intellij.diff.util.Side
44
import com.intellij.openapi.actionSystem.AnAction
@@ -45,7 +45,7 @@ class GutterIconRendererImpl(
4545
}
4646
GutterState.WRITING -> {
4747
icon = Icons.Gutter.WritingComment
48-
desc = "Continue writing your comment"
48+
desc = "Toggle comment thread & continue writing your comment"
4949
}
5050
}
5151
}
@@ -60,6 +60,7 @@ class GutterIconRendererImpl(
6060

6161
override fun getClickAction(): AnAction = clickAction
6262
override fun getIcon() = icon
63+
override fun getTooltipText(): String? = desc
6364
override fun isNavigateAction() = icon != Icons.Gutter.Empty
6465
override fun hashCode(): Int = System.identityHashCode(this)
6566
override fun equals(other: Any?): Boolean = other == this

0 commit comments

Comments
 (0)