New UI

Split code for new and old UI
Update Rider download to 2023.3-SNAPSHOT
2025-09-13 20:32:15 +02:00 · 2023-12-11 12:31:24 +01:00 · 2023-12-11 12:31:06 +01:00 · 2023-08-11 13:17:09 +02:00 · 2023-08-11 13:17:09 +02:00 · 2023-08-11 13:17:08 +02:00
16 changed files with 575 additions and 361 deletions
--- a/README.md
+++ b/README.md
@@ -31,4 +31,3 @@ Note that the Project tool window is supposed to be purple, but it doesn't work
 * ![Yellow](https://placehold.it/15/F0A732/000000?text=+) **Editing / Hints** (Edit Source, Intention Bulb, Find In Selection)
 * ![Blue](https://placehold.it/15/3592C4/000000?text=+) **Movement / Layout** (Filter, Sort, Split, Expand, Collapse, Refresh)
 * ![Purple](https://placehold.it/15/B066B0/000000?text=+) **Special** (Save, Print, Download, Upload, Import, Export, Pin)
-
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
 	java
-	idea
-	id("org.jetbrains.intellij") version "1.13.2"
+	id("org.jetbrains.intellij") version "1.15.0"
 }

 group = "com.chylex.intellij.coloredicons"
@@ -14,10 +13,14 @@ repositories {

 intellij {
 	type.set("IU")
-	version.set("2022.3.3")
+	version.set("2023.2")
 	updateSinceUntilBuild.set(false)
 }

+tasks.patchPluginXml {
+	sinceBuild.set("232")
+}
+
 tasks.buildSearchableOptions {
 	enabled = false
 }
@@ -51,7 +54,7 @@ dependencies {
 		"ides"("com.jetbrains.intellij.goland:goland:LATEST-EAP-SNAPSHOT")
 		"ides"("com.jetbrains.intellij.phpstorm:phpstorm:LATEST-EAP-SNAPSHOT")
 		"ides"("com.jetbrains.intellij.pycharm:pycharmPY:LATEST-EAP-SNAPSHOT")
-		"ides"("com.jetbrains.intellij.rider:riderRD:2022.3-SNAPSHOT")
+		"ides"("com.jetbrains.intellij.rider:riderRD:2023.3-SNAPSHOT")
 	}
 }

@@ -73,5 +76,11 @@ createHelperTask("grabIconsFromInstalledIDEs", main = "GrabIcons\$FromInstalledI
 createHelperTask("grabIconsFromGradle",        main = "GrabIcons\$FromArgumentPaths") {
 	val ideLibraries = getClassPathFolders(project.configurations.getByName("ides"))
 	val downloadedPlugins = File(buildDir, "idea-sandbox/system/plugins").absolutePath
-	it.args = ideLibraries + downloadedPlugins
+	
+	if (File(downloadedPlugins).exists()) {
+		it.args = ideLibraries + downloadedPlugins
+	}
+	else {
+		it.args = ideLibraries
+	}
 }
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/285
+++ b/285
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh

 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################

 # Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null

-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum

 warn () {
    echo "$*"
-}
+} >&2

 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'

 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/helpers/com/chylex/intellij/coloredicons/GrabIcons.java
+++ b/helpers/com/chylex/intellij/coloredicons/GrabIcons.java
@@ -23,17 +23,28 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;

 abstract class GrabIcons {
-	private static final List<String> EXPECTED_VIEW_BOXES_LOWERCASE = List.of(
+	private static final List<String> EXPECTED_OLD_UI_VIEW_BOXES_LOWERCASE = List.of(
 		"viewbox=\"0 0 12 12\"",
-		"viewbox=\"0 0 16 16\"",
-		"viewbox=\"0 0 13 13\""
+		"viewbox=\"0 0 13 13\"",
+		"viewbox=\"0 0 16 16\""
 	);
 	
-	private static final List<String> EXPECTED_COLORS_LOWERCASE = List.of(
+	private static final List<String> EXPECTED_OLD_UI_COLORS_LOWERCASE = List.of(
 		"#afb1b3",
 		"#6e6e6e"
 	);
 	
+	private static final List<String> EXPECTED_NEW_UI_VIEW_BOXES_LOWERCASE = List.of(
+		"viewbox=\"0 0 14 14\"",
+		"viewbox=\"0 0 16 16\"",
+		"viewbox=\"0 0 20 20\""
+	);
+	
+	private static final List<String> EXPECTED_NEW_UI_COLORS_LOWERCASE = List.of(
+		"#6c707e",
+		"#ced0d6"
+	);
+	
 	private static final boolean FLATTEN_ARCHIVE_PATHS = true;
 	private static final boolean FLATTEN_SVG_PATHS = false;
 	
@@ -191,7 +202,8 @@ abstract class GrabIcons {
 		final byte[] svgBytes = inputStream.readAllBytes();
 		final String svgText = new String(svgBytes, StandardCharsets.UTF_8);
 		
-		if (!isValidSVG(svgText)) {
+		if (!isValidSVG(svgText, EXPECTED_OLD_UI_VIEW_BOXES_LOWERCASE, EXPECTED_OLD_UI_COLORS_LOWERCASE) &&
+			!isValidSVG(svgText, EXPECTED_NEW_UI_VIEW_BOXES_LOWERCASE, EXPECTED_NEW_UI_COLORS_LOWERCASE)) {
 			return;
 		}
 		
@@ -218,16 +230,16 @@ abstract class GrabIcons {
 		++stats.uniqueSVGs;
 	}
 	
-	private static boolean isValidSVG(final String svg) {
+	private static boolean isValidSVG(final String svg, final List<String> expectedViewBoxes, final List<String> expectedColors) {
 		boolean hasExpectedViewBox = false;
 		boolean hasExpectedColor = false;
 		
 		for (final String line : svg.lines().map(line -> line.toLowerCase(Locale.ROOT)).toArray(String[]::new)) {
-			if (EXPECTED_VIEW_BOXES_LOWERCASE.stream().anyMatch(line::contains)) {
+			if (expectedViewBoxes.stream().anyMatch(line::contains)) {
 				hasExpectedViewBox = true;
 			}
 			
-			if (EXPECTED_COLORS_LOWERCASE.stream().anyMatch(line::contains)) {
+			if (expectedColors.stream().anyMatch(line::contains)) {
 				hasExpectedColor = true;
 			}
 			
@@ -256,57 +268,82 @@ abstract class GrabIcons {
 		}
 	}
 	
+	@SuppressWarnings("CallToSystemGetenv")
 	public static final class FromInstalledIDEs extends GrabIcons {
 		public static void main(final String[] args) throws IOException {
 			new FromInstalledIDEs().run();
 		}
 		
-		@SuppressWarnings("CallToSystemGetenv")
 		@Override
 		protected Stream<Path> findLibAndPluginFolders() {
+			return Stream.concat(findLibAndPluginFoldersFromOldToolbox(), findLibAndPluginFoldersFromNewToolbox()).filter(Files::isDirectory); // catches non-existent paths too
+		}
+		
+		private static Stream<Path> findLibAndPluginFoldersFromOldToolbox() {
+			System.out.println("Searching in %LOCALAPPDATA%\\JetBrains\\Toolbox\\apps...");
+			
 			final String localAppData = System.getenv("LOCALAPPDATA");
 			
 			if (localAppData == null) {
-				System.out.println("Missing %LOCALAPPDATA%, only Windows Vista or newer are supported.");
-				return null;
+				System.out.println("Found nothing, %LOCALAPPDATA% does not exist.");
+				return Stream.of();
 			}
 			
 			final Path toolboxAppsFolder = Paths.get(localAppData, "JetBrains", "Toolbox", "apps");
 			
 			if (!Files.exists(toolboxAppsFolder)) {
-				System.out.println("Missing JetBrains Toolbox installation folder at: " + toolboxAppsFolder);
-				return null;
+				System.out.println("Found nothing, old Toolbox installation folder does not exist.");
+				return Stream.of();
 			}
 			
-			return list(toolboxAppsFolder)
-				.filter(Files::isDirectory)
-				.flatMap(FromInstalledIDEs::getAppChannelFolders)
-				.flatMap(FromInstalledIDEs::getLibAndPluginsFolders);
+			return listDirectories(toolboxAppsFolder)
+				.flatMap(FromInstalledIDEs::listDirectories)
+				.filter(child -> getFileNameLowerCase(child).startsWith("ch-"))
+				.flatMap(FromInstalledIDEs::listDirectories)
+				.flatMap(child -> {
+					final String name = getFileNameLowerCase(child);
+					
+					if (name.contains(".remove-")) {
+						return Stream.empty();
+					}
+					else if (name.endsWith(".plugins")) {
+						return Stream.of(child);
+					}
+					else {
+						return Stream.of(child.resolve("lib"), child.resolve("plugins"));
+					}
+				});
 		}
 		
-		private static Stream<Path> getAppChannelFolders(final Path appFolder) {
-			return list(appFolder).filter(Files::isDirectory).filter(child -> getFileNameLowerCase(child).startsWith("ch-"));
+		private static Stream<Path> findLibAndPluginFoldersFromNewToolbox() {
+			System.out.println("Searching in %LOCALAPPDATA%\\Programs...");
+			
+			final String localAppData = System.getenv("LOCALAPPDATA");
+			
+			if (localAppData == null) {
+				System.out.println("Found nothing, %LOCALAPPDATA% does not exist.");
+				return Stream.of();
+			}
+			
+			final Path programsFolder = Paths.get(localAppData, "Programs");
+			
+			if (!Files.exists(programsFolder)) {
+				System.out.println("Found nothing, Programs folder does not exist.");
+				return Stream.of();
+			}
+			
+			return listDirectories(programsFolder)
+				.filter(FromInstalledIDEs::matchesNewToolboxInstallation)
+				.flatMap(child -> Stream.of(child.resolve("lib"), child.resolve("plugins")));
 		}
 		
-		private static Stream<Path> getLibAndPluginsFolders(final Path channelFolder) {
-			return list(channelFolder).filter(Files::isDirectory).flatMap(child -> {
-				final String name = getFileNameLowerCase(child);
-				
-				if (name.contains(".remove-")) {
-					return Stream.empty();
-				}
-				else if (name.endsWith(".plugins")) {
-					return Stream.of(child);
-				}
-				else {
-					return Stream.of(child.resolve("lib"), child.resolve("plugins"));
-				}
-			}).filter(Files::isDirectory); // catches non-existent paths too
+		private static boolean matchesNewToolboxInstallation(final Path path) {
+			return Files.exists(path.resolve("product-info.json")) && Files.isDirectory(path.resolve("jbr"));
 		}
 		
-		private static Stream<Path> list(final Path parent) {
+		private static Stream<Path> listDirectories(final Path parent) {
 			try {
-				return Files.list(parent);
+				return Files.list(parent).filter(Files::isDirectory);
 			} catch (final IOException e) {
 				e.printStackTrace();
 				return Stream.empty();
--- a/palette.svg
+++ b/palette.svg
@@ -1,22 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g id="Light">
-        <rect x="2" y="18" width="5.5" height="5.5" style="fill:#b76db7;"/>
-        <rect x="8.5" y="18" width="5.5" height="5.5" style="fill:#6e6e6e;"/>
-        <rect x="2" y="5" width="5.5" height="5.5" style="fill:#59a869;"/>
-        <rect x="8.5" y="5" width="5.5" height="5.5" style="fill:#eda200;"/>
-        <rect x="2" y="11.5" width="5.5" height="5.5" style="fill:#389fd6;"/>
-        <rect x="8.5" y="11.5" width="5.5" height="5.5" style="fill:#db5860;"/>
-        <text x="5.832px" y="3.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Light</text>
+<svg width="100%" height="100%" viewBox="0 0 33 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="Dark---New" serif:id="Dark / New">
+        <rect x="28" y="24" width="4" height="4" style="fill:#ced0d6;"/>
+        <rect x="23" y="24" width="4" height="4" style="fill:#b466b4;"/>
+        <rect x="18" y="19" width="4" height="4" style="fill:#57965c;"/>
+        <rect x="23" y="19" width="4" height="4" style="fill:#f2c55c;"/>
+        <rect x="28" y="19" width="4" height="4" style="fill:#548af7;"/>
+        <rect x="18" y="24" width="4" height="4" style="fill:#db5c5c;"/>
+        <g transform="matrix(2,0,0,2,29.8363,17.216)">
+        </g>
+        <text x="19.946px" y="17.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Dark / New</text>
    </g>
-    <g id="Dark">
-        <rect x="24.5" y="18" width="5.5" height="5.5" style="fill:#afb1b3;"/>
-        <rect x="18" y="18" width="5.5" height="5.5" style="fill:#b066b0;"/>
-        <rect x="18" y="5" width="5.5" height="5.5" style="fill:#499c54;"/>
-        <rect x="24.5" y="5" width="5.5" height="5.5" style="fill:#f0a732;"/>
-        <rect x="18" y="11.5" width="5.5" height="5.5" style="fill:#3592c4;"/>
-        <rect x="24.5" y="11.5" width="5.5" height="5.5" style="fill:#c75450;"/>
-        <text x="21.889px" y="3.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Dark</text>
+    <g id="Dark---Old" serif:id="Dark / Old">
+        <rect x="28" y="10" width="4" height="4" style="fill:#afb1b3;"/>
+        <rect x="23" y="10" width="4" height="4" style="fill:#b066b0;"/>
+        <rect x="18" y="5" width="4" height="4" style="fill:#499c54;"/>
+        <rect x="23" y="5" width="4" height="4" style="fill:#f0a732;"/>
+        <rect x="28" y="5" width="4" height="4" style="fill:#3592c4;"/>
+        <rect x="18" y="10" width="4" height="4" style="fill:#c75450;"/>
+        <g transform="matrix(2,0,0,2,29.4477,3.216)">
+        </g>
+        <text x="20.446px" y="3.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Dark / Old</text>
+    </g>
+    <g id="Light---New" serif:id="Light / New">
+        <rect x="6" y="24" width="4" height="4" style="fill:#b857b8;"/>
+        <rect x="11" y="24" width="4" height="4" style="fill:#6c707e;"/>
+        <rect x="1" y="19" width="4" height="4" style="fill:#369650;"/>
+        <rect x="6" y="19" width="4" height="4" style="fill:#ffaf0f;"/>
+        <rect x="11" y="19" width="4" height="4" style="fill:#3574f0;"/>
+        <rect x="1.156" y="24" width="4" height="4" style="fill:#db3b4b;"/>
+        <g transform="matrix(2,0,0,2,12.9584,17.216)">
+        </g>
+        <text x="2.954px" y="17.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Light / New</text>
+    </g>
+    <g id="Light---Old" serif:id="Light / Old">
+        <rect x="6" y="10" width="4" height="4" style="fill:#b76db7;"/>
+        <rect x="10.943" y="10" width="4" height="4" style="fill:#6e6e6e;"/>
+        <rect x="1" y="5" width="4" height="4" style="fill:#59a869;"/>
+        <rect x="6" y="5" width="4" height="4" style="fill:#eda200;"/>
+        <rect x="10.943" y="5" width="4" height="4" style="fill:#389fd6;"/>
+        <rect x="1" y="10" width="4" height="4" style="fill:#db5860;"/>
+        <g transform="matrix(2,0,0,2,12.5697,3.216)">
+        </g>
+        <text x="3.454px" y="3.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:2px;">Light / Old</text>
    </g>
 </svg>
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -36,7 +36,6 @@
    </ul>
  ]]></change-notes>
  
-  <idea-version since-build="223.0" />
  <depends>com.intellij.modules.platform</depends>
  
  <application-components>
--- a/resources/icons/expui/toolwindow/vcs.svg
+++ b/resources/icons/expui/toolwindow/vcs.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;">
+    <circle cx="4.5" cy="4" r="2" style="fill:none;stroke:#3574f0;stroke-width:1px;"/>
+    <path d="M4.5,11.5L8.5,11.5C9.605,11.5 10.5,10.605 10.5,9.5L10.5,8" style="fill:none;fill-rule:nonzero;stroke:#3574f0;stroke-width:1px;"/>
+    <path d="M4.5,6.5L4.5,14.5" style="fill:none;fill-rule:nonzero;stroke:#3574f0;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;"/>
+    <circle cx="10.5" cy="6" r="2" style="fill:none;stroke:#3574f0;stroke-width:1px;"/>
+</svg>
--- a/resources/icons/expui/toolwindow/vcs@20x20.svg
+++ b/resources/icons/expui/toolwindow/vcs@20x20.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="M7.5,4.5C7.5,5.605 6.605,6.5 5.5,6.5C4.395,6.5 3.5,5.605 3.5,4.5C3.5,3.395 4.395,2.5 5.5,2.5C6.605,2.5 7.5,3.395 7.5,4.5ZM9,4.5C9,6.176 7.823,7.576 6.25,7.919L6.25,13.25L9.5,13.25C10.209,13.25 10.704,13.25 11.09,13.223C11.471,13.197 11.692,13.149 11.861,13.079C12.412,12.85 12.85,12.412 13.079,11.861C13.149,11.692 13.197,11.471 13.223,11.09C13.244,10.785 13.249,10.412 13.25,9.919C11.677,9.576 10.5,8.175 10.5,6.5C10.5,4.567 12.067,3 14,3C15.933,3 17.5,4.567 17.5,6.5C17.5,8.176 16.323,9.576 14.75,9.92C14.749,10.419 14.744,10.838 14.72,11.193C14.689,11.649 14.623,12.053 14.464,12.435C14.084,13.354 13.354,14.084 12.435,14.464C12.053,14.623 11.649,14.689 11.193,14.72C10.749,14.75 10.203,14.75 9.527,14.75L6.25,14.75L6.25,18C6.25,18.414 5.914,18.75 5.5,18.75C5.086,18.75 4.75,18.414 4.75,18L4.75,7.919C3.177,7.576 2,6.176 2,4.5C2,2.567 3.567,1 5.5,1C7.433,1 9,2.567 9,4.5ZM16,6.5C16,7.605 15.105,8.5 14,8.5C12.895,8.5 12,7.605 12,6.5C12,5.395 12.895,4.5 14,4.5C15.105,4.5 16,5.395 16,6.5Z" style="fill:#3574f0;"/>
+</svg>
--- a/resources/icons/expui/toolwindow/vcs@20x20_dark.svg
+++ b/resources/icons/expui/toolwindow/vcs@20x20_dark.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="M7.5,4.5C7.5,5.605 6.605,6.5 5.5,6.5C4.395,6.5 3.5,5.605 3.5,4.5C3.5,3.395 4.395,2.5 5.5,2.5C6.605,2.5 7.5,3.395 7.5,4.5ZM9,4.5C9,6.176 7.823,7.576 6.25,7.919L6.25,13.25L9.5,13.25C10.209,13.25 10.704,13.25 11.09,13.223C11.471,13.197 11.692,13.149 11.861,13.079C12.412,12.85 12.85,12.412 13.079,11.861C13.149,11.692 13.197,11.471 13.223,11.09C13.244,10.785 13.249,10.412 13.25,9.919C11.677,9.576 10.5,8.175 10.5,6.5C10.5,4.567 12.067,3 14,3C15.933,3 17.5,4.567 17.5,6.5C17.5,8.176 16.323,9.576 14.75,9.92C14.749,10.419 14.744,10.838 14.72,11.193C14.689,11.649 14.623,12.053 14.464,12.435C14.084,13.354 13.354,14.084 12.435,14.464C12.053,14.623 11.649,14.689 11.193,14.72C10.749,14.75 10.203,14.75 9.527,14.75L6.25,14.75L6.25,18C6.25,18.414 5.914,18.75 5.5,18.75C5.086,18.75 4.75,18.414 4.75,18L4.75,7.919C3.177,7.576 2,6.176 2,4.5C2,2.567 3.567,1 5.5,1C7.433,1 9,2.567 9,4.5ZM16,6.5C16,7.605 15.105,8.5 14,8.5C12.895,8.5 12,7.605 12,6.5C12,5.395 12.895,4.5 14,4.5C15.105,4.5 16,5.395 16,6.5Z" style="fill:#548af7;"/>
+</svg>
--- a/resources/icons/expui/toolwindow/vcs_dark.svg
+++ b/resources/icons/expui/toolwindow/vcs_dark.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;">
+    <circle cx="4.5" cy="4" r="2" style="fill:none;stroke:#548af7;stroke-width:1px;"/>
+    <path d="M4.5,11.5L8.5,11.5C9.605,11.5 10.5,10.605 10.5,9.5L10.5,8" style="fill:none;fill-rule:nonzero;stroke:#548af7;stroke-width:1px;"/>
+    <path d="M4.5,6.5L4.5,14.5" style="fill:none;fill-rule:nonzero;stroke:#548af7;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;"/>
+    <circle cx="10.5" cy="6" r="2" style="fill:none;stroke:#548af7;stroke-width:1px;"/>
+</svg>
--- a/src/com/chylex/intellij/coloredicons/IconPatcher.java
+++ b/src/com/chylex/intellij/coloredicons/IconPatcher.java
@@ -1,199 +1,22 @@
 package com.chylex.intellij.coloredicons;
+import com.chylex.intellij.coloredicons.sets.NewUI;
+import com.chylex.intellij.coloredicons.sets.OldUI;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.IconPathPatcher;
+import com.intellij.ui.NewUiValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import java.util.HashMap;
 import java.util.Map;

 public class IconPatcher extends IconPathPatcher {
 	private final ClassLoader classLoader = getClass().getClassLoader();
-	private final Map<String, String> iconPaths = new HashMap<>();
+	private final Map<String, String> iconPaths;
 	
 	public IconPatcher() {
-		addPathWithDark("actions/addList");
-		addPathWithDark("actions/AddMulticaret");
-		addPathWithDark("actions/back");
-		addPathWithDark("actions/buildAutoReloadChanges");
-		addPathWithDark("actions/cancel");
-		addPathWithDark("actions/CheckMulticaret");
-		addPathWithDark("actions/collapseall");
-		addPathWithDark("actions/download");
-		addPathWithDark("actions/dump");
-		addPathWithDark("actions/edit");
-		addPathWithDark("actions/editScheme");
-		addPathWithDark("actions/editSource");
-		addPathWithDark("actions/expandall");
-		addPathWithDark("actions/forward");
-		addPathWithDark("actions/inSelection");
-		addPathWithDark("actions/intentionBulbGrey");
-		addPathWithDark("actions/menu-saveall");
-		addPathWithDark("actions/newFolder");
-		addPathWithDark("actions/nextOccurence");
-		addPathWithDark("actions/openNewTab");
-		addPathWithDark("actions/prettyPrint");
-		addPathWithDark("actions/previousOccurence");
-		addPathWithDark("actions/realIntentionBulb");
-		addPathWithDark("actions/refactoringBulb"); // TODO not working
-		addPathWithDark("actions/refresh");
-		addPathWithDark("actions/RemoveMulticaret");
-		addPathWithDark("actions/rollback");
-		addPathWithDark("actions/show");
-		addPathWithDark("actions/showCode");
-		addPathWithDark("actions/showHiddens");
-		addPathWithDark("actions/splitHorizontally");
-		addPathWithDark("actions/splitVertically");
-		addPathWithDark("actions/swapPanels");
-		addPathWithDark("actions/synchronizeScrolling");
-		addPathWithDark("actions/syncPanels");
-		addPathWithDark("actions/toggleSoftWrap");
-		addPathWithDark("actions/unselectall");
-		addPathWithDark("actions/upload");
-		
-		addPathWithDark("codeStyle/AddNewSectionRule");
-		
-		addPathWithDark("diff/magicResolve");
-		addPathWithDark("diff/magicResolveToolbar");
-		
-		addPathWithDark("general/add");
-		addPathWithDark("general/addJdk");
-		addPathWithDark("general/autoscrollFromSource");
-		addPathWithDark("general/autoscrollToSource");
-		addPathWithDark("general/filter");
-		addPathWithDark("general/layout");
-		addPathWithDark("general/layoutEditorOnly");
-		addPathWithDark("general/layoutEditorPreview");
-		addPathWithDark("general/layoutPreviewOnly");
-		addPathWithDark("general/pin_tab");
-		addPathWithDark("general/print");
-		addPathWithDark("general/remove");
-		addPathWithDark("general/reset");
-		addPathWithDark("general/zoomIn");
-		addPathWithDark("general/zoomOut");
-		
-		addPathWithDark("graph/layout");
-		addPathWithDark("graph/zoomIn");
-		addPathWithDark("graph/zoomOut");
-		
-		addPathWithDark("hierarchy/class");
-		addPathWithDark("hierarchy/subtypes");
-		addPathWithDark("hierarchy/supertypes");
-		
-		addPathWithDark("icons/artifactSmall");
-		addPathWithDark("icons/cherryPick");
-		addPathWithDark("icons/CMakeToolWindow");
-		addPathWithDark("icons/ConcurrencyDiagramToolwindow");
-		addPathWithDark("icons/debug_listen_on");
-		addPathWithDark("icons/ejbToolWindow");
-		addPathWithDark("icons/gradleNavigate");
-		addPathWithDark("icons/IntelliSort");
-		addPathWithDark("icons/interTypes");
-		addPathWithDark("icons/javaeeToolWindow");
-		addPathWithDark("icons/jpaConsoleToolWindow");
-		addPathWithDark("icons/jpaToolWindow");
-		addPathWithDark("icons/makefileToolWindow");
-		addPathWithDark("icons/OpenTerminal_13x13");
-		addPathWithDark("icons/springToolWindow");
-		addPathWithDark("icons/toolWindowConsole");
-		addPathWithDark("icons/toolWindowDatabase");
-		addPathWithDark("icons/toolwindowDatabaseChanges");
-		addPathWithDark("icons/toolWindowDsm");
-		addPathWithDark("icons/toolwindowEndpoints");
-		addPathWithDark("icons/toolWindowGradle");
-		addPathWithDark("icons/toolWindowSQLGenerator");
-		addPathWithDark("icons/youTrack");
-		addPathWithDark("icons/buildTools/gulp_toolwindow");
-		addPathWithDark("icons/buildTools/grunt/grunt_toolwindow");
-		addPathWithDark("icons/buildTools/npm/npm_13");
-		addPathWithDark("icons/com/jetbrains/python/DataView");
-		addPathWithDark("icons/com/jetbrains/python/pythonConsoleToolWindow");
-		
-		addPathWithDark("images/toolWindowMaven");
-		addPathWithDark("images/transferToolWindow");
-		addPathWithDark("images/updateFolders");
-		addPathWithDark("images/webServerToolWindow");
-		
-		addPathWithDark("img/featureTrainerToolWindow");
-		
-		addPathWithDark("modules/addExcludedRoot");
-		
-		addPathWithDark("objectBrowser/sortByType");
-		addPathWithDark("objectBrowser/sorted");
-		addPathWithDark("objectBrowser/sortedByUsage");
-		addPathWithDark("objectBrowser/visibilitySort");
-		
-		addPathWithDark("org/jetbrains/plugins/github/pullRequestsToolWindow");
-		addPathWithDark("org/jetbrains/plugins/scala/images/sbtShellToolwin");
-		addPathWithDark("org/jetbrains/plugins/scala/images/sbtToolwin");
-		
-		addPathWithDark("resources/icons/bvToolWindow");
-		addPathWithDark("resources/icons/hibConsoleToolWindow");
-		
-		addPathWithDark("rider/toolWindows/toolWindowNuGet");
-		addPathWithDark("rider/toolWindows/toolWindowSolutionWideAnalysis");
-		addPathWithDark("rider/toolWindows/toolwindowStacktrace");
-		addPathWithDark("rider/toolWindows/toolWindowUnitTesting");
-		addPathWithDark("rider/toolWindows/toolWindowWPFPreview");
-		
-		addPathWithDark("runConfigurations/scroll_down");
-		addPathWithDark("runConfigurations/showIgnored");
-		addPathWithDark("runConfigurations/showPassed");
-		addPathWithDark("runConfigurations/sortbyDuration");
-		
-		addPathWithDark("toolbarDecorator/addBlankLine");
-		addPathWithDark("toolbarDecorator/addClass");
-		addPathWithDark("toolbarDecorator/addFolder");
-		addPathWithDark("toolbarDecorator/addIcon");
-		addPathWithDark("toolbarDecorator/addJira");
-		addPathWithDark("toolbarDecorator/addLink");
-		addPathWithDark("toolbarDecorator/addPattern");
-		addPathWithDark("toolbarDecorator/addRemoteDatasource");
-		addPathWithDark("toolbarDecorator/addYouTrack");
-		addPathWithDark("toolbarDecorator/export");
-		addPathWithDark("toolbarDecorator/import");
-		
-		addPathWithDark("toolwindows/documentation");
-		addPathWithDark("toolwindows/notifications");
-		addPathWithDark("toolwindows/notificationsNew");
-		addPathWithDark("toolwindows/notificationsNewImportant");
-		addPathWithDark("toolwindows/toolWindowAnalyzeDataflow");
-		addPathWithDark("toolwindows/toolWindowAnt");
-		addPathWithDark("toolwindows/toolWindowBookmarks");
-		addPathWithDark("toolwindows/toolWindowBuild");
-		addPathWithDark("toolwindows/toolWindowChanges");
-		addPathWithDark("toolwindows/toolWindowCommit");
-		addPathWithDark("toolwindows/toolWindowCoverage");
-		addPathWithDark("toolwindows/toolWindowDebugger");
-		addPathWithDark("toolwindows/toolWindowFavorites");
-		addPathWithDark("toolwindows/toolWindowFind");
-		addPathWithDark("toolwindows/toolWindowHierarchy");
-		addPathWithDark("toolwindows/toolWindowInspection");
-		addPathWithDark("toolwindows/toolWindowMessages");
-		addPathWithDark("toolwindows/toolWindowModuleDependencies");
-		addPathWithDark("toolwindows/toolWindowProfiler");
-		addPathWithDark("toolwindows/toolWindowProject");
-		addPathWithDark("toolwindows/toolWindowRun");
-		addPathWithDark("toolwindows/toolWindowServices");
-		addPathWithDark("toolwindows/toolWindowStructure");
-		addPathWithDark("toolwindows/toolWindowTodo");
-		addPathWithDark("toolwindows/webToolWindow");
-		
-		addPathWithDark("vcs/changelist");
-		addPathWithDark("vcs/history");
-		addPathWithDark("vcs/merge");
-		
-		addPathWithDark("toolWindowDotTrace");
-		addPathWithDark("toolWindowDPA");
-		addPathWithDark("toolwindowUnitTestCoverage");
-		
+		iconPaths = NewUiValue.isEnabled() ? NewUI.getIconPaths() : OldUI.getIconPaths();
 		IconLoader.installPathPatcher(this);
 	}
 	
-	private void addPathWithDark(final String path) {
-		iconPaths.put('/' + path + ".svg", "icons/" + path + ".svg");
-		iconPaths.put('/' + path + "_dark.svg", "icons/" + path + "_dark.svg");
-	}
-	
 	@Nullable
 	@Override
 	public String patchPath(@NotNull final String path, final ClassLoader classLoaderIgnore) {
--- a/src/com/chylex/intellij/coloredicons/sets/NewUI.java
+++ b/src/com/chylex/intellij/coloredicons/sets/NewUI.java
@@ -0,0 +1,33 @@
+package com.chylex.intellij.coloredicons.sets;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public final class NewUI {
+	
+	public static Map<String, String> getIconPaths() {
+		return new NewUI().getMap();
+	}
+	
+	private final Map<String, String> iconPaths = new HashMap<>();
+	
+	private NewUI() {
+		addPathWithDark("toolwindows/toolWindowChanges", "expui/toolwindow/vcs");
+		addPathWithDark("expui/toolwindow/vcs");
+		addPathWithDark("expui/toolwindow/vcs@20x20");
+	}
+	
+	private Map<String, String> getMap() {
+		return iconPaths;
+	}
+	
+	private void addPathWithDark(final String oldUiPath, final String newPath) {
+		iconPaths.put('/' + oldUiPath + ".svg", "icons/" + newPath + ".svg");
+		iconPaths.put('/' + oldUiPath + "_dark.svg", "icons/" + newPath + "_dark.svg");
+	}
+	
+	private void addPathWithDark(final String path) {
+		iconPaths.put('/' + path + ".svg", "icons/" + path + ".svg");
+		iconPaths.put('/' + path + "_dark.svg", "icons/" + path + "_dark.svg");
+	}
+}
--- a/src/com/chylex/intellij/coloredicons/sets/OldUI.java
+++ b/src/com/chylex/intellij/coloredicons/sets/OldUI.java
@@ -0,0 +1,199 @@
+package com.chylex.intellij.coloredicons.sets;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public final class OldUI {
+	
+	public static Map<String, String> getIconPaths() {
+		return new OldUI().getMap();
+	}
+	
+	private final Map<String, String> iconPaths = new HashMap<>();
+	
+	private OldUI() {
+		addPathWithDark("actions/addList");
+		addPathWithDark("actions/AddMulticaret");
+		addPathWithDark("actions/back");
+		addPathWithDark("actions/buildAutoReloadChanges");
+		addPathWithDark("actions/cancel");
+		addPathWithDark("actions/CheckMulticaret");
+		addPathWithDark("actions/collapseall");
+		addPathWithDark("actions/download");
+		addPathWithDark("actions/dump");
+		addPathWithDark("actions/edit");
+		addPathWithDark("actions/editScheme");
+		addPathWithDark("actions/editSource");
+		addPathWithDark("actions/expandall");
+		addPathWithDark("actions/forward");
+		addPathWithDark("actions/inSelection");
+		addPathWithDark("actions/intentionBulbGrey");
+		addPathWithDark("actions/menu-saveall");
+		addPathWithDark("actions/newFolder");
+		addPathWithDark("actions/nextOccurence");
+		addPathWithDark("actions/openNewTab");
+		addPathWithDark("actions/prettyPrint");
+		addPathWithDark("actions/previousOccurence");
+		addPathWithDark("actions/realIntentionBulb");
+		addPathWithDark("actions/refactoringBulb"); // TODO not working
+		addPathWithDark("actions/refresh");
+		addPathWithDark("actions/RemoveMulticaret");
+		addPathWithDark("actions/rollback");
+		addPathWithDark("actions/show");
+		addPathWithDark("actions/showCode");
+		addPathWithDark("actions/showHiddens");
+		addPathWithDark("actions/splitHorizontally");
+		addPathWithDark("actions/splitVertically");
+		addPathWithDark("actions/swapPanels");
+		addPathWithDark("actions/synchronizeScrolling");
+		addPathWithDark("actions/syncPanels");
+		addPathWithDark("actions/toggleSoftWrap");
+		addPathWithDark("actions/unselectall");
+		addPathWithDark("actions/upload");
+		
+		addPathWithDark("codeStyle/AddNewSectionRule");
+		
+		addPathWithDark("diff/magicResolve");
+		addPathWithDark("diff/magicResolveToolbar");
+		
+		addPathWithDark("general/add");
+		addPathWithDark("general/addJdk");
+		addPathWithDark("general/autoscrollFromSource");
+		addPathWithDark("general/autoscrollToSource");
+		addPathWithDark("general/filter");
+		addPathWithDark("general/layout");
+		addPathWithDark("general/layoutEditorOnly");
+		addPathWithDark("general/layoutEditorPreview");
+		addPathWithDark("general/layoutPreviewOnly");
+		addPathWithDark("general/pin_tab");
+		addPathWithDark("general/print");
+		addPathWithDark("general/remove");
+		addPathWithDark("general/reset");
+		addPathWithDark("general/zoomIn");
+		addPathWithDark("general/zoomOut");
+		
+		addPathWithDark("graph/layout");
+		addPathWithDark("graph/zoomIn");
+		addPathWithDark("graph/zoomOut");
+		
+		addPathWithDark("hierarchy/class");
+		addPathWithDark("hierarchy/subtypes");
+		addPathWithDark("hierarchy/supertypes");
+		
+		addPathWithDark("icons/artifactSmall");
+		addPathWithDark("icons/cherryPick");
+		addPathWithDark("icons/CMakeToolWindow");
+		addPathWithDark("icons/ConcurrencyDiagramToolwindow");
+		addPathWithDark("icons/debug_listen_on");
+		addPathWithDark("icons/ejbToolWindow");
+		addPathWithDark("icons/gradleNavigate");
+		addPathWithDark("icons/IntelliSort");
+		addPathWithDark("icons/interTypes");
+		addPathWithDark("icons/javaeeToolWindow");
+		addPathWithDark("icons/jpaConsoleToolWindow");
+		addPathWithDark("icons/jpaToolWindow");
+		addPathWithDark("icons/makefileToolWindow");
+		addPathWithDark("icons/OpenTerminal_13x13");
+		addPathWithDark("icons/springToolWindow");
+		addPathWithDark("icons/toolWindowConsole");
+		addPathWithDark("icons/toolWindowDatabase");
+		addPathWithDark("icons/toolwindowDatabaseChanges");
+		addPathWithDark("icons/toolWindowDsm");
+		addPathWithDark("icons/toolwindowEndpoints");
+		addPathWithDark("icons/toolWindowGradle");
+		addPathWithDark("icons/toolWindowSQLGenerator");
+		addPathWithDark("icons/youTrack");
+		addPathWithDark("icons/buildTools/gulp_toolwindow");
+		addPathWithDark("icons/buildTools/grunt/grunt_toolwindow");
+		addPathWithDark("icons/buildTools/npm/npm_13");
+		addPathWithDark("icons/com/jetbrains/python/DataView");
+		addPathWithDark("icons/com/jetbrains/python/pythonConsoleToolWindow");
+		
+		addPathWithDark("images/toolWindowMaven");
+		addPathWithDark("images/transferToolWindow");
+		addPathWithDark("images/updateFolders");
+		addPathWithDark("images/webServerToolWindow");
+		
+		addPathWithDark("img/featureTrainerToolWindow");
+		
+		addPathWithDark("modules/addExcludedRoot");
+		
+		addPathWithDark("objectBrowser/sortByType");
+		addPathWithDark("objectBrowser/sorted");
+		addPathWithDark("objectBrowser/sortedByUsage");
+		addPathWithDark("objectBrowser/visibilitySort");
+		
+		addPathWithDark("org/jetbrains/plugins/github/pullRequestsToolWindow");
+		addPathWithDark("org/jetbrains/plugins/scala/images/sbtShellToolwin");
+		addPathWithDark("org/jetbrains/plugins/scala/images/sbtToolwin");
+		
+		addPathWithDark("resources/icons/bvToolWindow");
+		addPathWithDark("resources/icons/hibConsoleToolWindow");
+		
+		addPathWithDark("rider/toolWindows/toolWindowNuGet");
+		addPathWithDark("rider/toolWindows/toolWindowSolutionWideAnalysis");
+		addPathWithDark("rider/toolWindows/toolwindowStacktrace");
+		addPathWithDark("rider/toolWindows/toolWindowUnitTesting");
+		addPathWithDark("rider/toolWindows/toolWindowWPFPreview");
+		
+		addPathWithDark("runConfigurations/scroll_down");
+		addPathWithDark("runConfigurations/showIgnored");
+		addPathWithDark("runConfigurations/showPassed");
+		addPathWithDark("runConfigurations/sortbyDuration");
+		
+		addPathWithDark("toolbarDecorator/addBlankLine");
+		addPathWithDark("toolbarDecorator/addClass");
+		addPathWithDark("toolbarDecorator/addFolder");
+		addPathWithDark("toolbarDecorator/addIcon");
+		addPathWithDark("toolbarDecorator/addJira");
+		addPathWithDark("toolbarDecorator/addLink");
+		addPathWithDark("toolbarDecorator/addPattern");
+		addPathWithDark("toolbarDecorator/addRemoteDatasource");
+		addPathWithDark("toolbarDecorator/addYouTrack");
+		addPathWithDark("toolbarDecorator/export");
+		addPathWithDark("toolbarDecorator/import");
+		
+		addPathWithDark("toolwindows/documentation");
+		addPathWithDark("toolwindows/notifications");
+		addPathWithDark("toolwindows/notificationsNew");
+		addPathWithDark("toolwindows/notificationsNewImportant");
+		addPathWithDark("toolwindows/toolWindowAnalyzeDataflow");
+		addPathWithDark("toolwindows/toolWindowAnt");
+		addPathWithDark("toolwindows/toolWindowBookmarks");
+		addPathWithDark("toolwindows/toolWindowBuild");
+		addPathWithDark("toolwindows/toolWindowChanges");
+		addPathWithDark("toolwindows/toolWindowCommit");
+		addPathWithDark("toolwindows/toolWindowCoverage");
+		addPathWithDark("toolwindows/toolWindowDebugger");
+		addPathWithDark("toolwindows/toolWindowFavorites");
+		addPathWithDark("toolwindows/toolWindowFind");
+		addPathWithDark("toolwindows/toolWindowHierarchy");
+		addPathWithDark("toolwindows/toolWindowInspection");
+		addPathWithDark("toolwindows/toolWindowMessages");
+		addPathWithDark("toolwindows/toolWindowModuleDependencies");
+		addPathWithDark("toolwindows/toolWindowProfiler");
+		addPathWithDark("toolwindows/toolWindowProject");
+		addPathWithDark("toolwindows/toolWindowRun");
+		addPathWithDark("toolwindows/toolWindowServices");
+		addPathWithDark("toolwindows/toolWindowStructure");
+		addPathWithDark("toolwindows/toolWindowTodo");
+		addPathWithDark("toolwindows/webToolWindow");
+		
+		addPathWithDark("vcs/changelist");
+		addPathWithDark("vcs/history");
+		addPathWithDark("vcs/merge");
+		
+		addPathWithDark("toolWindowDotTrace");
+		addPathWithDark("toolWindowDPA");
+		addPathWithDark("toolwindowUnitTestCoverage");
+	}
+	
+	private Map<String, String> getMap() {
+		return iconPaths;
+	}
+	
+	private void addPathWithDark(final String path) {
+		iconPaths.put('/' + path + ".svg", "icons/" + path + ".svg");
+		iconPaths.put('/' + path + "_dark.svg", "icons/" + path + "_dark.svg");
+	}
+}
Author	SHA1	Message	Date
chylex	71323fbd50	New UI	2023-12-11 12:31:24 +01:00
chylex	dc0d979afc	Split code for new and old UI	2023-12-11 12:31:06 +01:00
chylex	91046d21c5	Update Rider download to 2023.3-SNAPSHOT	2023-08-11 13:17:09 +02:00
chylex	f2cf886dae	Add support for grabbing icons from new UI	2023-08-11 13:17:09 +02:00
chylex	d7e344e45e	Skip trying to grab icons from plugins installed in project folder if it never ran	2023-08-11 13:17:08 +02:00
chylex	998cdf1149	Update icon grabber to search new Toolbox installation folders	2023-08-11 13:17:08 +02:00
chylex	43228be8aa	Set minimum IDEA version to 2023.2	2023-08-11 13:17:08 +02:00
chylex	ddfdf1f477	Update Gradle wrapper to 7.6.2	2023-08-11 10:35:51 +02:00