Merge pull request #63 from doki-theme/mnemonicBookmark

Added Better Mnemonic Bookmarks

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ## [Unreleased]
 
+## 88.5-1.0.12 [Mnemonic Bookmarks]
+
+### Added
+- Mnemonic Bookmarks
+
 ## 88.3-1.0.11 [Maintenance]
 
 ### Fixed

RELEASE-NOTES.md

@@ -7,6 +7,7 @@
 - CSS Icon
 - Initial 2023.1 build support
 - dll, so, dylib, java.class files, & .iml file icons.
+- Mnemonic Bookmarks
 
 
 ### Fixed

buildSrc/src/main/kotlin/BuildThemes.kt

@@ -37,6 +37,7 @@ data class DokiTheme(
 
 data class IconPathMapping(
   val iconName: String,
+  val isOddBall: Boolean?,
 )
 
 open class BuildThemes : DefaultTask() {
@@ -129,6 +130,7 @@ open class BuildThemes : DefaultTask() {
           object : TypeToken<List<IconPathMapping>>() {}
         )
       }
+      .filter { it.isOddBall != true }
       .map { it.iconName }
       .toMutableSet()
 

gradle.properties

@@ -2,7 +2,7 @@
 
 pluginGroup = io.unthrottled.doki.icons
 pluginName = Doki Theme Icons
-pluginVersion = 88.3-1.0.11
+pluginVersion = 88.5-1.0.12
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 222

src/main/kotlin/io/unthrottled/doki/icons/jetbrains/Constants.kt

@@ -5,4 +5,5 @@ object Constants {
   const val PLUGIN_ID = "io.unthrottled.doki.icons"
   const val PLUGIN_NAME = "Doki Theme Icons"
   const val DOKI_ICONS_BASE_PATH = "doki/icons"
+  const val DOKI_ODD_BALLS_ICONS_BASE_PATH = "doki/oddBalls"
 }

src/main/kotlin/io/unthrottled/doki/icons/jetbrains/path/DokiIconPathPatcher.kt

@@ -9,7 +9,8 @@ import io.unthrottled.doki.icons.jetbrains.tools.logger
 
 data class PathMapping(
   val originalPath: String,
-  val iconName: String
+  val iconName: String,
+  val isOddBall: Boolean?
 )
 
 class DokiIconPathPatcher(private val mappingFile: String) : IconPathPatcher(), Logging {
@@ -22,7 +23,9 @@ class DokiIconPathPatcher(private val mappingFile: String) : IconPathPatcher(),
     )
       .map { def ->
         def.associate {
-          it.originalPath to "${Constants.DOKI_ICONS_BASE_PATH}/${it.iconName}"
+          val dokiIconsBasePath =
+            if (it.isOddBall == true) Constants.DOKI_ODD_BALLS_ICONS_BASE_PATH else Constants.DOKI_ICONS_BASE_PATH
+          it.originalPath to "$dokiIconsBasePath/${it.iconName}"
         }
       }.orElseGet {
         logger().warn("Unable to read path mappings")

src/main/resources/ui-icons.path.mappings.json

@@ -761,7 +761,8 @@
   },
   {
     "originalPath": "/icons/ideavim.svg",
-    "iconName": "vim.svg"
+    "iconName": "plugins/vim.svg",
+    "isOddBall": true
   },
   {
     "originalPath": "/nodes/plugin.svg",
@@ -894,5 +895,25 @@
   {
     "originalPath": "/actions/searchWithHistory.svg",
     "iconName": "search_right_chevron_down.svg"
+  },
+  {
+    "originalPath": "/gutter/mnemonic.svg",
+    "iconName": "gutter/mnemonic.svg",
+    "isOddBall": true
+  },
+  {
+    "originalPath": "/gutter/mnemonic_dark.svg",
+    "iconName": "gutter/mnemonic_dark.svg",
+    "isOddBall": true
+  },
+  {
+    "originalPath": "/nodes/mnemonic.svg",
+    "iconName": "nodes/mnemonic.svg",
+    "isOddBall": true
+  },
+  {
+    "originalPath": "/nodes/mnemonic_dark.svg",
+    "iconName": "nodes/mnemonic_dark.svg",
+    "isOddBall": true
   }
 ]