From 91b00543759927600dd7f6348eaad7ee4d97e990 Mon Sep 17 00:00:00 2001 From: ycgambo Date: Tue, 29 May 2018 16:22:32 +0800 Subject: [PATCH] WebStorm compability. check this: https://github.com/jkaving/intellij-colors-solarized --- intellij-colors-solarized/README.md | 374 ++++++++++- intellij-colors-solarized/Solarized Dark.xml | 609 ----------------- intellij-colors-solarized/Solarized Light.xml | 619 ------------------ intellij-colors-solarized/buildjar.sh | 73 ++- intellij-colors-solarized/settings.jar | Bin 3221 -> 62696 bytes 5 files changed, 421 insertions(+), 1254 deletions(-) delete mode 100644 intellij-colors-solarized/Solarized Dark.xml delete mode 100644 intellij-colors-solarized/Solarized Light.xml diff --git a/intellij-colors-solarized/README.md b/intellij-colors-solarized/README.md index 619f9b3f..5307cfdb 100644 --- a/intellij-colors-solarized/README.md +++ b/intellij-colors-solarized/README.md @@ -10,48 +10,378 @@ Johan Kaving Visit the [Solarized homepage] ------------------------------ -See the [Solarized homepage] for screenshots, -details and colorscheme versions for Vim, Mutt, popular terminal emulators and -other applications. +See the [Solarized homepage] for screenshots, +details and color scheme versions for Vim, Mutt, popular terminal emulators and +other applications. These versions can also be found in the main [Solarized repository] +on GitHub. -Downloads ---------- +Unfortunately the IntelliJ subtree in the main repository has not been updated and is out-of-sync with this +repository. -If you have come across this colorscheme via the [IntelliJ-only repository] on -github see the link above to the Solarized homepage or visit the main [Solarized repository]. - -The [IntelliJ-only repository] is kept in sync with the main [Solarized repository]. -Issues, bug reports, changelogs are centralized at the main [Solarized repository]. +For IntelliJ this [IntelliJ-only repository] is therefore recommended over the main repository. [Solarized homepage]: http://ethanschoonover.com/solarized [Solarized repository]: https://github.com/altercation/solarized [IntelliJ-only repository]: https://github.com/jkaving/intellij-colors-solarized +Status +------------ + +These color scheme files are primarily tested with the latest version of IntelliJ IDEA Community Edition. +They might work with other versions of IntelliJ IDEA as well as other JetBrains tools +(e.g. PhpStorm and PyCharm). + +This table lists the languages (and other sections under `Preferences | Editor | Colors & Fonts`) +for which the syntax highlighting has been adapted to the Solarized color scheme: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Language/SectionSupportedNote
ActionScriptYes
Android LogcatYes
Apache ConfigYes
BEMHTMLYes
BashYes(BashSupport 1.1beta14 or later)
Buildout configYes
CNo
C++No
CMDYes
CSSYes
Clojure TemplatesYes
CoffeeScriptYes
Custom TemplatesYes
DartYes
DebuggerYes
DiffYes
Django/Jinja2 TemplateYes
ERBYes
ErlangYes
File StatusYes
GeneralYes
Gherkin (Cucumber)Yes
Google GoYes
GQLYes
GroovyYes
HAMLYes
HTMLYes
HaskellYes
JFlexYes
JadeYes
JavaYes
JavaScriptYes
JSPYes
Jodd props fileYes
KotlinYes
LESSYes
Localization fileYes
LuaYes
Mako TemplateYes
MarkdownYes
Objective-CYes
PHPYes
PropertiesYes
PythonYes
ReST fileYes
RegExpYes
RubyYes
RustYes
SASSYes
SQLYes
ScalaYes
TeaYes
TwigYes
XMLYes
XPathYes
YAMLYes
+ + Installation ------------ ### Option 1: Install using "Import Settings..." -1. Go to `File | Import Settings...` and specify the `intellij-colors-solarized` directory. - Clik `OK` in the dialog that appears. +1. Go to `File | Import Settings...` and specify the `intellij-colors-solarized` directory or the `settings.jar` file. + Click `OK` in the dialog that appears. 2. Restart IntelliJ IDEA -3. Go to `Preferences | Editor | Colors & Fonts` and select one of the new +3. Go to `Preferences | Editor | Colors & Fonts` and select one of the new color themes. ### Option 2: Manual installation -1. Copy `Solarized Dark.xml` and `Solarized Light.xml` to your IntelliJ IDEA preferences -color directory. -On Mac OS X this is typically located in `~/Library/Preferences/IntelliJIdea10/colors` or `~/Library/Preferences/IntelliJIdea10CE/colors` (for the Community Edition). -On Windows it is in `Documents and Settings//.IntelliJIdea10/config/colors`. - +1. Copy `Solarized Dark.icls` and `Solarized Light.icls` to your IntelliJ IDEA preferences + color directory. The directory varies, depending on which JetBrains IDE you are using. + + *The colors directory may need to be created.* + + It is typically in: + + **Mac OS X** + * `~/Library/Preferences/IntelliJIdeaXX/colors` [(IntelliJ IDEA Ultimate Edition)][IntelliJ IDE settings], + * `~/Library/Preferences/IdeaICXX/colors` [(IntelliJ IDEA Community Edition)][IntelliJ IDE settings], + * `~/Library/Preferences/WebIDE70/colors` [(PHPStorm 7.0)][PHPStorm IDE settings], + * `~/Library/Preferences/WebIDE80/colors` [(PHPStorm 8.0)][PHPStorm IDE settings], + * `~/Library/Preferences/WebStorm8/colors` [(WebStorm 8.0)][WebStorm IDE settings]. + + **Linux** + * `~/./colors` Generic path, + * `~/.IdeaICXX/config/colors` [(IntelliJ IDEA)][IntelliJ IDE settings], + * `~/.PyCharmXX/colors` [(PyCharm)][PyCharm IDE settings]. + + **Windows** + * `%USERPROFILE%\.IdeaICXX\config\colors` [(IntelliJ IDEA Community Edition)][IntelliJ IDE settings], + * `%USERPROFILE%\.PyCharm40\config\colors` [(PyCharm 4.5 Community Edition)][PyCharm IDE settings]. + 2. Restart IntelliJ IDEA -3. Go to `Preferences | Editor | Colors & Fonts` and select one of the new +3. Go to `Preferences | Editor | Colors & Fonts` and select one of the new color themes. +[IntelliJ IDE settings]: https://www.jetbrains.com/idea/help/project-and-ide-settings.html +[PHPStorm IDE settings]: https://www.jetbrains.com/phpstorm/help/project-and-ide-settings.html +[PyCharm IDE settings]: https://www.jetbrains.com/pycharm/help/project-and-ide-settings.html +[WebStorm IDE settings]: https://www.jetbrains.com/webstorm/help/project-and-ide-settings.html + +Darcula +------- +Depending on the Look and Feel that you use the background +color for editor tabs will be different. The default L&F has a light gray +background, while the Darcula L&F has a dark background. + +It is hard to find colors that work equally well on both light and dark backgrounds, +and therefore the `settings.jar` file contains Darcula versions of the color schemes.
+The only difference from the regular versions is that these color schemes inherit +their default colors from the Darcula theme rather than from Default. + Note About Fonts ----------------- Unfortunately, font settings are included in the color settings files. @@ -60,6 +390,6 @@ after adding the color schemes to your IntelliJ IDEA installation. Note About Committing Changes ----------------------------- -If you want to commit updates to the XML color scheme files, make sure to run the `buildjar.sh` script before committing to generate -an updated `settings.jar` file as well. -*The script has been tested on OS X, on other operating systems you're on your own.* \ No newline at end of file +If you want to commit updates to the ICLS color scheme files, make sure to run the `buildjar.sh` script before committing to generate +an updated `settings.jar` file as well. +*The script has been tested on OS X, on other operating systems you're on your own.* diff --git a/intellij-colors-solarized/Solarized Dark.xml b/intellij-colors-solarized/Solarized Dark.xml deleted file mode 100644 index 7e2f28f8..00000000 --- a/intellij-colors-solarized/Solarized Dark.xml +++ /dev/null @@ -1,609 +0,0 @@ - - - - diff --git a/intellij-colors-solarized/Solarized Light.xml b/intellij-colors-solarized/Solarized Light.xml deleted file mode 100644 index 3026c864..00000000 --- a/intellij-colors-solarized/Solarized Light.xml +++ /dev/null @@ -1,619 +0,0 @@ - - - - diff --git a/intellij-colors-solarized/buildjar.sh b/intellij-colors-solarized/buildjar.sh index f3b2ed11..6948fdae 100755 --- a/intellij-colors-solarized/buildjar.sh +++ b/intellij-colors-solarized/buildjar.sh @@ -1,11 +1,76 @@ -#!/bin/sh +#!/bin/bash +# Create a Darcula version of the specified color scheme. +# +# Usage: +# createDarculaVersion sourceFile targetFile +# +function createDarculaVersion { + cp "${1}" "${2}" + + # Append " (Darcula)" to the name of the scheme + sed -i'.orig' -e 's/\(/' "${2}" + + # Use Darcula parent theme + sed -i'.orig' -e 's/\(parent_scheme\)="[^"]*"/\1="Darcula"/' "${2}" + + # Fix static methods + sed -i'.orig' -e 's/<\/attributes>/