Compare commits

...

6 Commits

7 changed files with 269 additions and 161 deletions

View File

@ -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
}
}

Binary file not shown.

View File

@ -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

285
gradlew vendored
View File

@ -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" "$@"

15
gradlew.bat vendored
View File

@ -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

View File

@ -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();

View File

@ -36,7 +36,6 @@
</ul>
]]></change-notes>
<idea-version since-build="223.0" />
<depends>com.intellij.modules.platform</depends>
<application-components>