Merge pull request #42 from ciscorucinski/develop

finalized v2.5
ciscorucinski · Nov 8, 2017 · 7386bea · 7386bea
2 parents 2a62a63 + f29b8d9
commit 7386bea
Show file tree

Hide file tree

Showing 11 changed files with 323 additions and 300 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,24 @@
 
-# ChroMATERIAL v2.2
+# ChroMATERIAL v2.5
+
+##### Added
+
+| Type             | Supported |
+| :--------------: | :-------- |
+| **Features**     | **NEW** <kbd>2017.3</kbd> features |
 
 ##### Updated
 
 | Type             | Supported |
 | :--------------: | :-------- |
-| **Theme**        | <kbd>ChroMATERIAL</kbd> <kbd>Darcula-compatible</kbd> <kbd>Darker</kbd> |
+| **Theme**        | <kbd>All</kbd> |
 
 ##### Other Notable changes:
 
+ * Added Marked for removal methods. (2017.3)
+ * Added Inline parameter hints. (2017.3)
+ * Added Diff separator color. (2017.3)
+ * Added Visual indent guide. (2017.3)
  * Brought feature parity to all themes.
  * Method separators are now visible if enabled.
  * Breadcrumbs have a new style that is compatible with Android Studio and IntelliJ IDEs.

diff --git a/ChroMATERIAL/ChroMATERIAL.jar b/ChroMATERIAL/ChroMATERIAL.jar
diff --git a/ChroMATERIAL/build.gradle b/ChroMATERIAL/build.gradle
@@ -1,6 +1,7 @@
 intellij {
     pluginName 'ChroMATERIAL'
     updateSinceUntilBuild false
+//    sameSinceUntilBuild true
 }
 
 sourceSets {
@@ -19,26 +20,18 @@ sourceSets {
 def GROUP_CHROMATERIAL = 'ChroMATERIAL'
 
 group 'com.facebook.rucinskic.chromaterial' //'io.github.ciscorucinski.chromaterial'
-version '2.2'
+version '2.5'
 
 def sourceDir = 'src/colors'
-def intelliJColorSchemeDir = "C:\\Users\\Christopher\\.Idea${intellij.type}${intellij.version}\\config\\colors"
+def intelliJColorSchemeDir = "C:\\Users\\Christopher\\.Idea${intellij.type}2017.3\\config\\colors"
 
-def contentIndex = "        "
-def tagIndex = "  "
-
-def htmlFixer = {f -> file(f).text
-        .replace('\n', "\n${contentIndex}")     // Add indentation to make plugin.xml look good
-        .trim()
-        .replace('<html>', '\n')
-        .replace("</html>", "\n${tagIndex}")
-}
+def htmlFixer = { f -> file(f).text.replace('<html>', '').replace('</html>', '') }
 
 patchPluginXml {
 
     pluginId 'com.facebook.rucinskic.chromaterial'
     version project['version'] // Plugin version
-//    sinceBuild '131'
+    sinceBuild '131'
 //    untilBuild '999.*'
 
     pluginDescription htmlFixer('resources/html/pluginDescription.html')
@@ -49,14 +42,10 @@ patchPluginXml {
 publishPlugin {
     username usernameJetBrainPluginRepo
     password passwordJetBrainPluginRepo
-    channels = ["eap"]
+//    channels = ["eap"]
 //    distributionFile 'ChroMATERIAL.jar'
 }
 
-patchPluginXml {
-    sinceBuild 131
-}
-
 task copyGeneratedLibs() {
 
     group GROUP_CHROMATERIAL
@@ -74,6 +63,7 @@ task syncFiles(type: Copy) {
 
     into sourceDir
     from intelliJColorSchemeDir, {
+        exclude "_@user_*"
         rename 'ChroMATERIAL IntelliJ IDEA.icls', 'ChroMATERIAL.xml'
         rename '(.*)\\.icls$', '$1.xml'
     }

diff --git a/ChroMATERIAL/libs/ChroMATERIAL-2.1.1.jar b/ChroMATERIAL/libs/ChroMATERIAL-2.1.1.jar
diff --git a/ChroMATERIAL/libs/ChroMATERIAL-2.2.jar b/ChroMATERIAL/libs/ChroMATERIAL-2.2.jar
diff --git a/ChroMATERIAL/libs/ChroMATERIAL-2.5.jar b/ChroMATERIAL/libs/ChroMATERIAL-2.5.jar
diff --git a/ChroMATERIAL/resources/META-INF/plugin.xml b/ChroMATERIAL/resources/META-INF/plugin.xml
@@ -1,125 +1,133 @@
 <idea-plugin>
   <id>com.facebook.rucinskic.chromaterial</id>
   <name>ChroMATERIAL</name>
-  <version>2.2</version>
+  <version>2.5</version>
   <vendor email="[email protected]" url="https://github.com/ciscorucinski/ChroMATERIAL">
     ChristopherRucinski
   </vendor>
   <description>
-
-        &lt;p&gt;ChroMATERIAL is a color scheme that expresses the chromatic nature of Material Design within IntelliJ and Android
-            Studio. In particular, ChroMATERIAL focuses on syntax highlighting of code within the IDE's code editor. It's
-            uniqueness lies in the idea of "enhance influence, not banality"&lt;/p&gt;
-        &lt;ul&gt;
-            &lt;li&gt;&lt;b&gt;Color Schemes:&lt;/b&gt; Default (dark), Darcula-compatible, Darker&lt;/li&gt;
-            &lt;li&gt;&lt;b&gt;Supported Languages:&lt;/b&gt; Java, Kotlin, Groovy, XML, JSON, HTML, Regex, YAML&lt;/li&gt;
-            &lt;li&gt;&lt;b&gt;Supported Features:&lt;/b&gt; Android, Android Manifest, Android Resources, Android Native (C / C++), Gradle,
-                Logcat, Files, Property Files, Version Control, Debugger, Diff, XSLT, XPATH, Ignore Files*, Markdown*
-            &lt;/li&gt;
-        &lt;/ul&gt;
-        &lt;p&gt;* - via Plugin&lt;/p&gt;
-        
+    &lt;p&gt;ChroMATERIAL is a color scheme that expresses the chromatic nature of Material Design within IntelliJ and
+      Android
+      Studio. In particular, ChroMATERIAL focuses on syntax highlighting of code within the IDE's code editor. It's
+      uniqueness lies in the idea of "enhance influence, not banality"&lt;/p&gt;
+    &lt;ul&gt;
+      &lt;li&gt;&lt;b&gt;Color Schemes:&lt;/b&gt; Default (dark), Darcula-compatible, Darker&lt;/li&gt;
+      &lt;li&gt;&lt;b&gt;Supported Languages:&lt;/b&gt; Java, Kotlin, Groovy, XML, JSON, HTML, Regex, YAML&lt;/li&gt;
+      &lt;li&gt;&lt;b&gt;Supported Features:&lt;/b&gt; Android, Android Manifest, Android Resources, Android Native (C /
+        C++), Gradle,
+        Logcat, Files, Property Files, Version Control, Debugger, Diff, XSLT, XPATH, Ignore Files*, Markdown*
+      &lt;/li&gt;
+    &lt;/ul&gt;
+    &lt;p&gt;* - via Plugin&lt;/p&gt;
   </description>
   <change-notes>
+    &lt;h2&gt;v2.5&lt;/h2&gt;
+    &lt;ul&gt;
+    &lt;li&gt;&lt;b&gt;Added Features:&lt;/b&gt; NEW 2017.3 features&lt;/li&gt;
+    &lt;li&gt;&lt;b&gt;Updated Themes:&lt;/b&gt; All&lt;/li&gt;
+    &lt;br/&gt;
+    &lt;li&gt;&lt;b&gt;Notable changes:&lt;/b&gt;&lt;/li&gt;
+    &lt;br/&gt;
+    &lt;ul&gt;
+        &lt;li&gt;Added Marked for removal methods. &lt;em&gt;(2017.3)&lt;/em&gt;&lt;/li&gt;
+        &lt;li&gt;Added Inline parameter hints. &lt;em&gt;(2017.3)&lt;/em&gt;&lt;/li&gt;
+        &lt;li&gt;Added Diff separator color. &lt;em&gt;(2017.3)&lt;/em&gt;&lt;/li&gt;
+        &lt;li&gt;Added Visual indent guide. &lt;em&gt;(2017.3)&lt;/em&gt;&lt;/li&gt;
+        &lt;li&gt;Brought feature parity to all themes.&lt;/li&gt;
+        &lt;li&gt;Breadcrumbs have a new style that is compatible with Android Studio and IntelliJ IDEs.&lt;/li&gt;
+        &lt;li&gt;Debugger has a new style. New colors and breakpoint lines are bold.&lt;/li&gt;
+        &lt;li&gt;Method separators are now visible if enabled.&lt;/li&gt;
+        &lt;li&gt;Added bracket support to ignore files.&lt;/li&gt;
+        &lt;li&gt;Annotations are italic, and attribute names are purple.&lt;/li&gt;
+        &lt;li&gt;Diff &amp; Merge have darker error stripe marks for conflicts and deleted text&lt;/li&gt;
+    &lt;/ul&gt;
+    &lt;/ul&gt;
+    &lt;h2&gt;v2.1.1&lt;/h2&gt;
+    &lt;ul&gt;
+    &lt;li&gt;&lt;b&gt;Updated Support:&lt;/b&gt; Ignore Files&lt;/li&gt;
+    &lt;br/&gt;
+    &lt;li&gt;&lt;b&gt;Notable changes:&lt;/b&gt;&lt;/li&gt;
+    &lt;br/&gt;
+    &lt;ul&gt;
+    &lt;li&gt;Fixed issue with ignore file headers and sections being incorrectly formatted. &lt;em&gt;(Closes
+    #35)&lt;/em&gt;&lt;/li&gt;
+    &lt;li&gt;Fixed issue with ignore file negations being incorrectly formatted. &lt;em&gt;(Closes #36)&lt;/em&gt;
+    &lt;/li&gt;
+    &lt;/ul&gt;
+    &lt;/ul&gt;
+
+    &lt;h2&gt;v2.1&lt;/h2&gt;
+    &lt;ul&gt;
+    &lt;li&gt;&lt;b&gt;Updated Languages:&lt;/b&gt; Groovy&lt;/li&gt;
+    &lt;br/&gt;
+    &lt;li&gt;&lt;b&gt;Notable changes:&lt;/b&gt;&lt;/li&gt;
+    &lt;br/&gt;
+    &lt;ul&gt;
+        &lt;li&gt;Fixed regression with Gradle DSL not displayed as green. &lt;em&gt;(Closes #31)&lt;/em&gt;&lt;/li&gt;
+    &lt;li&gt;Fixed regression with Groovy Unknown Symbol having a gray boxed effect. &lt;em&gt;(Closes
+    #32)&lt;/em&gt;&lt;/li&gt;
+        &lt;li&gt;Changed Unused Symbols to have yellow underlines &lt;em&gt;(Closes #33)&lt;/em&gt;&lt;/li&gt;
+        &lt;li&gt;Updated Build System to use Gradle&lt;/li&gt;
+    &lt;/ul&gt;
+    &lt;/ul&gt;
+
+    &lt;h2&gt;v2.0&lt;/h2&gt;
+
+    &lt;ul&gt;
+    &lt;li&gt;&lt;b&gt;Added Themes:&lt;/b&gt; Darker, Darcula-compatible&lt;/li&gt;
+    &lt;li&gt;&lt;b&gt;Added Languages&lt;/b&gt;: Kotlin, Markdown&lt;/li&gt;
+    &lt;br/&gt;
+    &lt;li&gt;&lt;b&gt;Other Notable changes:&lt;/b&gt;&lt;/li&gt;
+    &lt;br/&gt;
+    &lt;ul&gt;
+        &lt;li&gt;Standardized colors across all languages.&lt;/li&gt;
+        &lt;li&gt;Added Breadcrumb color support to the editor.&lt;/li&gt;
+        &lt;li&gt;Enhanced Injected language color support.&lt;/li&gt;
+        &lt;li&gt;Added Read-only color support.&lt;/li&gt;
+        &lt;li&gt;Modified HTML Tree Tag level colors.&lt;/li&gt;
+        &lt;li&gt;Updated all warnings and errors to use italics.&lt;/li&gt;
+        &lt;li&gt;Unused identifiers are enhanced to prevent further issues.&lt;/li&gt;
+        &lt;li&gt;Enhanced Java instance field colors.&lt;/li&gt;
+        &lt;li&gt;Android Logcat's Assert are now purple.&lt;/li&gt;
+        &lt;li&gt;Tear line (plus collapse / expand buttons) are now green.&lt;/li&gt;
+    &lt;li&gt;Fixed regression with not highlighting all instances of the current identifier under the carat.
+    &lt;/li&gt;
+    &lt;/ul&gt;
+    &lt;/ul&gt;
+
+    &lt;h2&gt;v1.1.1&lt;/h2&gt;
+
+    &lt;ul&gt;
+    &lt;li&gt;v1.1 did not work when deployed. This is a quick-fix.&lt;/li&gt;
+    &lt;/ul&gt;
+
+    &lt;h2&gt;v1.1&lt;/h2&gt;
+
+    &lt;ul&gt;
+    &lt;li&gt;&lt;b&gt;Added Languages:&lt;/b&gt; Android Native (C / C++)&lt;/li&gt;
+    &lt;li&gt;&lt;b&gt;Added Support:&lt;/b&gt; Debugger, ProGuard files, Ignore files&lt;/li&gt;
+    &lt;br/&gt;
+    &lt;li&gt;&lt;b&gt;Other Notable changes:&lt;/b&gt;&lt;/li&gt;
+    &lt;br/&gt;
+    &lt;ul&gt;
+        &lt;li&gt;Simplified the color scheme.&lt;/li&gt;
+        &lt;li&gt;Folded text is a different color.&lt;/li&gt;
+        &lt;li&gt;Numbers and Strings are the same color.&lt;/li&gt;
+        &lt;li&gt;Annotation colors are similar in style to comments.&lt;/li&gt;
+        &lt;br/&gt;
+    &lt;/ul&gt;
+    &lt;/ul&gt;
+
+    &lt;h2&gt;v1.0&lt;/h2&gt;
 
-        &lt;h2&gt;v2.2&lt;/h2&gt;
-        &lt;ul&gt;
-            &lt;li&gt;&lt;b&gt;Updated Themes:&lt;/b&gt; Darcula-compatible, Darker&lt;/li&gt;
-            &lt;br/&gt;
-            &lt;li&gt;&lt;b&gt;Notable changes:&lt;/b&gt;&lt;/li&gt;
-            &lt;br/&gt;
-            &lt;ul&gt;
-                &lt;li&gt;Brought feature parity to all themes.&lt;/li&gt;
-                &lt;li&gt;Method separators are now visible if enabled.&lt;/li&gt;
-                &lt;li&gt;Breadcrumbs have a new style that is compatible with Android Studio and IntelliJ IDEs.&lt;/li&gt;
-                &lt;li&gt;Debugger has a new style. New colors and breakpoint lines are bold.&lt;/li&gt;
-                &lt;li&gt;Added bracket support to ignore files.&lt;/li&gt;
-                &lt;li&gt;Annotations are italic, and attribute names are purple.&lt;/li&gt;
-                &lt;li&gt;Diff &amp; Merge have darker error stripe marks for conflicts and deleted text&lt;/li&gt;
-            &lt;/ul&gt;
-        &lt;/ul&gt;
-        &lt;h2&gt;v2.1.1&lt;/h2&gt;
-        &lt;ul&gt;
-            &lt;li&gt;&lt;b&gt;Updated Support:&lt;/b&gt; Ignore Files&lt;/li&gt;
-            &lt;br/&gt;
-            &lt;li&gt;&lt;b&gt;Notable changes:&lt;/b&gt;&lt;/li&gt;
-            &lt;br/&gt;
-            &lt;ul&gt;
-                &lt;li&gt;Fixed issue with ignore file headers and sections being incorrectly formatted. &lt;em&gt;(Closes #35)&lt;/em&gt;&lt;/li&gt;
-                &lt;li&gt;Fixed issue with ignore file negations being incorrectly formatted. &lt;em&gt;(Closes #36)&lt;/em&gt;&lt;/li&gt;
-            &lt;/ul&gt;
-        &lt;/ul&gt;
-
-        &lt;h2&gt;v2.1&lt;/h2&gt;
-        &lt;ul&gt;
-            &lt;li&gt;&lt;b&gt;Updated Languages:&lt;/b&gt; Groovy&lt;/li&gt;
-            &lt;br/&gt;
-            &lt;li&gt;&lt;b&gt;Notable changes:&lt;/b&gt;&lt;/li&gt;
-            &lt;br/&gt;
-            &lt;ul&gt;
-                &lt;li&gt;Fixed regression with Gradle DSL not displayed as green. &lt;em&gt;(Closes #31)&lt;/em&gt;&lt;/li&gt;
-                &lt;li&gt;Fixed regression with Groovy Unknown Symbol having a gray boxed effect. &lt;em&gt;(Closes #32)&lt;/em&gt;&lt;/li&gt;
-                &lt;li&gt;Changed Unused Symbols to have yellow underlines &lt;em&gt;(Closes #33)&lt;/em&gt;&lt;/li&gt;
-                &lt;li&gt;Updated Build System to use Gradle&lt;/li&gt;
-            &lt;/ul&gt;
-        &lt;/ul&gt;
-
-        &lt;h2&gt;v2.0&lt;/h2&gt;
-
-        &lt;ul&gt;
-            &lt;li&gt;&lt;b&gt;Added Themes:&lt;/b&gt; Darker, Darcula-compatible&lt;/li&gt;
-            &lt;li&gt;&lt;b&gt;Added Languages&lt;/b&gt;: Kotlin, Markdown&lt;/li&gt;
-            &lt;br/&gt;
-            &lt;li&gt;&lt;b&gt;Other Notable changes:&lt;/b&gt;&lt;/li&gt;
-            &lt;br/&gt;
-            &lt;ul&gt;
-                &lt;li&gt;Standardized colors across all languages.&lt;/li&gt;
-                &lt;li&gt;Added Breadcrumb color support to the editor.&lt;/li&gt;
-                &lt;li&gt;Enhanced Injected language color support.&lt;/li&gt;
-                &lt;li&gt;Added Read-only color support.&lt;/li&gt;
-                &lt;li&gt;Modified HTML Tree Tag level colors.&lt;/li&gt;
-                &lt;li&gt;Updated all warnings and errors to use italics.&lt;/li&gt;
-                &lt;li&gt;Unused identifiers are enhanced to prevent further issues.&lt;/li&gt;
-                &lt;li&gt;Enhanced Java instance field colors.&lt;/li&gt;
-                &lt;li&gt;Android Logcat's Assert are now purple.&lt;/li&gt;
-                &lt;li&gt;Tear line (plus collapse / expand buttons) are now green.&lt;/li&gt;
-                &lt;li&gt;Fixed regression with not highlighting all instances of the current identifier under the carat.&lt;/li&gt;
-            &lt;/ul&gt;
-        &lt;/ul&gt;
-
-        &lt;h2&gt;v1.1.1&lt;/h2&gt;
-
-        &lt;ul&gt;
-            &lt;li&gt;v1.1 did not work when deployed. This is a quick-fix.&lt;/li&gt;
-        &lt;/ul&gt;
-
-        &lt;h2&gt;v1.1&lt;/h2&gt;
-
-        &lt;ul&gt;
-            &lt;li&gt;&lt;b&gt;Added Languages:&lt;/b&gt; Android Native (C / C++)&lt;/li&gt;
-            &lt;li&gt;&lt;b&gt;Added Support:&lt;/b&gt; Debugger, ProGuard files, Ignore files&lt;/li&gt;
-            &lt;br/&gt;
-            &lt;li&gt;&lt;b&gt;Other Notable changes:&lt;/b&gt;&lt;/li&gt;
-            &lt;br/&gt;
-            &lt;ul&gt;
-                &lt;li&gt;Simplified the color scheme.&lt;/li&gt;
-                &lt;li&gt;Folded text is a different color.&lt;/li&gt;
-                &lt;li&gt;Numbers and Strings are the same color.&lt;/li&gt;
-                &lt;li&gt;Annotation colors are similar in style to comments.&lt;/li&gt;
-                &lt;br/&gt;
-            &lt;/ul&gt;
-        &lt;/ul&gt;
-
-        &lt;h2&gt;v1.0&lt;/h2&gt;
-
-        &lt;ul&gt;
-            &lt;li&gt;&lt;b&gt;Added Color Scheme:&lt;/b&gt; Default (dark)&lt;/li&gt;
-            &lt;li&gt;&lt;b&gt;Added Languages:&lt;/b&gt; Java, Groovy, XML, JSON, HTML&lt;/li&gt;
-            &lt;li&gt;&lt;b&gt;Added Support:&lt;/b&gt; Android, Android Manifest, Android Resources, Gradle files, LogCat, Property files, and
-                diffs
-            &lt;/li&gt;
-        &lt;/ul&gt;
-
+    &lt;ul&gt;
+    &lt;li&gt;&lt;b&gt;Added Color Scheme:&lt;/b&gt; Default (dark)&lt;/li&gt;
+    &lt;li&gt;&lt;b&gt;Added Languages:&lt;/b&gt; Java, Groovy, XML, JSON, HTML&lt;/li&gt;
+    &lt;li&gt;&lt;b&gt;Added Support:&lt;/b&gt; Android, Android Manifest, Android Resources, Gradle files, LogCat,
+    Property files, and
+        diffs
+    &lt;/li&gt;
+    &lt;/ul&gt;
   </change-notes>
   <idea-version since-build="131"/>
   <depends>com.intellij.modules.lang</depends>

diff --git a/ChroMATERIAL/resources/html/changeLog.html b/ChroMATERIAL/resources/html/changeLog.html
@@ -1,15 +1,20 @@
 <html>
-<h2>v2.2</h2>
+<h2>v2.5</h2>
 <ul>
-    <li><b>Updated Themes:</b> Darcula-compatible, Darker</li>
+    <li><b>Added Features:</b> NEW 2017.3 features</li>
+    <li><b>Updated Themes:</b> All</li>
     <br/>
     <li><b>Notable changes:</b></li>
     <br/>
     <ul>
+        <li>Added Marked for removal methods. <em>(2017.3)</em></li>
+        <li>Added Inline parameter hints. <em>(2017.3)</em></li>
+        <li>Added Diff separator color. <em>(2017.3)</em></li>
+        <li>Added Visual indent guide. <em>(2017.3)</em></li>
         <li>Brought feature parity to all themes.</li>
-        <li>Method separators are now visible if enabled.</li>
         <li>Breadcrumbs have a new style that is compatible with Android Studio and IntelliJ IDEs.</li>
         <li>Debugger has a new style. New colors and breakpoint lines are bold.</li>
+        <li>Method separators are now visible if enabled.</li>
         <li>Added bracket support to ignore files.</li>
         <li>Annotations are italic, and attribute names are purple.</li>
         <li>Diff & Merge have darker error stripe marks for conflicts and deleted text</li>