Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/kotlin/asset/MixinAssets.kt
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ package com.demonwav.mcdev.asset

@Suppress("unused")
object MixinAssets : Assets() {
val SHADOW = loadIcon("/assets/icons/mixin/shadow.png")
val SHADOW_DARK = loadIcon("/assets/icons/mixin/shadow_dark.png")
val MIXIN_ELEMENT_ICON = loadIcon("/assets/icons/mixin/mixin_element.svg")
val MIXIN_ELEMENT_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_element_dark.svg")

val MIXIN_CLASS_ICON = loadIcon("/assets/icons/mixin/mixin_class_gutter.png")
val MIXIN_CLASS_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_class_gutter_dark.png")
val MIXIN_CLASS_ICON = loadIcon("/assets/icons/mixin/mixin_class_gutter.svg")
val MIXIN_CLASS_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_class_gutter_dark.svg")

val MIXIN_MARK = loadIcon("/assets/icons/mixin/mixin_mark.svg")
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ import com.intellij.ui.awt.RelativePoint
import com.intellij.util.PsiNavigateUtil
import java.awt.event.MouseEvent

class MixinTargetLineMarkerProvider : LineMarkerProviderDescriptor() {
class MixinElementLineMarkerProvider : LineMarkerProviderDescriptor() {

override fun getName() = "Mixin target line marker"
override fun getIcon() = MixinAssets.SHADOW
override fun getName() = "Mixin element line marker"
override fun getIcon() = MixinAssets.MIXIN_ELEMENT_ICON

override fun getLineMarkerInfo(element: PsiElement): LineMarkerInfo<PsiIdentifier>? {
if (element !is PsiMember) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@
<codeInsight.lineMarkerProvider language="JAVA"
implementationClass="com.demonwav.mcdev.platform.mixin.insight.MixinLineMarkerProvider"/>
<codeInsight.lineMarkerProvider language="JAVA"
implementationClass="com.demonwav.mcdev.platform.mixin.insight.MixinTargetLineMarkerProvider"/>
implementationClass="com.demonwav.mcdev.platform.mixin.insight.MixinElementLineMarkerProvider"/>


<customJavadocTagProvider implementation="com.demonwav.mcdev.platform.mixin.MixinCustomJavaDocTagProvider"/>
Expand Down
Binary file not shown.
17 changes: 17 additions & 0 deletions src/main/resources/assets/icons/mixin/mixin_class_gutter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
17 changes: 17 additions & 0 deletions src/main/resources/assets/icons/mixin/mixin_class_gutter_dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions src/main/resources/assets/icons/mixin/mixin_element.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions src/main/resources/assets/icons/mixin/mixin_element_dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 16 additions & 2 deletions src/main/resources/assets/icons/mixin/mixin_mark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/main/resources/assets/icons/mixin/shadow.png
Binary file not shown.
Binary file removed src/main/resources/assets/icons/mixin/shadow_dark.png
Binary file not shown.
Loading