Addressed #102 #103

hiberbee · Sep 18, 2023 · 1ade703 · 1ade703
1 parent cb0cd83
commit 1ade703
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 69 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -21,4 +21,3 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-kotlin.stdlib.default.dependency = false
diff --git a/src/intellij/build.gradle b/src/intellij/build.gradle
@@ -1,4 +1,3 @@
-import org.jetbrains.intellij.tasks.RunPluginVerifierTask
 
 plugins {
   id("java")
@@ -7,15 +6,15 @@ plugins {
 }
 
 group = "com.hiberbee.intellij"
-version = System.getenv("APP_VERSION") ?: "2023.3.30.121"
+version = System.getenv("APP_VERSION") ?: java.time.OffsetDateTime.now().format("YYYY.M.d.Hm")
 
 repositories {
   mavenCentral()
 }
 
 intellij {
   pluginName ="Hiberbee Theme"
-  type = "IC"
+  type = "IU"
   version = "LATEST-EAP-SNAPSHOT"
 }
 
@@ -28,15 +27,12 @@ buildSearchableOptions {
   enabled = false
 }
 
-runPluginVerifier {
-  failureLevel = [RunPluginVerifierTask.FailureLevel.COMPATIBILITY_PROBLEMS, RunPluginVerifierTask.FailureLevel.INVALID_PLUGIN]
-}
-
 publishPlugin {
   setToken(System.getenv("JETBRAINS_TOKEN"))
 }
 
 patchPluginXml {
   changeNotes = """Compatibility fixes related to new UI changes in 2023.1."""
   version = project.version
+  sinceBuild = "191"
 }
diff --git a/src/intellij/src/main/resources/META-INF/plugin.xml b/src/intellij/src/main/resources/META-INF/plugin.xml
@@ -40,7 +40,6 @@
   </description>
   <version>latest</version>
   <depends>com.intellij.modules.lang</depends>
-  <idea-version since-build="231"/>
   <extensions defaultExtensionNs="com.intellij">
     <themeProvider id="HiberbeeDark" path="/themes/HiberbeeDark.theme.json"/>
     <registryKey key="ide.experimental.ui.tree.selection" defaultValue="false" restartRequired="false"

diff --git a/src/intellij/src/main/resources/colors/Dark.icls b/src/intellij/src/main/resources/colors/Dark.icls
@@ -1,4 +1,14 @@
 <scheme name="Hiberbee Dark" version="142">
+  <option name="FONT_SCALE" value="1.0" />
+  <metaInfo>
+    <property name="created">2023-09-18T15:25:39</property>
+    <property name="ide">idea</property>
+    <property name="ideVersion">2023.2.2.0.0</property>
+    <property name="modified">2023-09-18T15:25:57</property>
+  </metaInfo>
+  <option name="CONSOLE_FONT_NAME" value="Fira Code Retina" />
+  <option name="CONSOLE_LIGATURES" value="true" />
+  <option name="CONSOLE_LINE_SPACING" value="1.3" />
   <colors>
     <option name="ADDED_LINES_COLOR" value="92d923" />
     <option name="ANNOTATIONS_COLOR" value="fffbf7" />
@@ -39,6 +49,7 @@
     <option name="FILESTATUS_SUPPRESSED" value="727072" />
     <option name="FILESTATUS_SWITCHED" value="ab9df2" />
     <option name="FILESTATUS_UNKNOWN" value="ffd866" />
+    <option name="GRID_STRIPE_COLOR" value="373635" />
     <option name="GUTTER_BACKGROUND" value="272625" />
     <option name="HINT_BORDER" value="525150" />
     <option name="HTML_TAG_TREE_LEVEL0" value="ed6b88" />
@@ -597,6 +608,11 @@
         <option name="FOREGROUND" value="ff6188" />
       </value>
     </option>
+    <option name="CSS.URL">
+      <value>
+        <option name="FOREGROUND" value="ffb900" />
+      </value>
+    </option>
     <option name="CTRL_CLICKABLE">
       <value>
         <option name="FOREGROUND" value="57d1eb" />
@@ -936,8 +952,6 @@
     </option>
     <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR">
       <value>
-        <option name="FOREGROUND" value="efeeed" />
-        <option name="BACKGROUND" value="171615" />
         <option name="EFFECT_TYPE" value="5" />
       </value>
     </option>
@@ -1187,6 +1201,11 @@
         <option name="FOREGROUND" value="589df6" />
       </value>
     </option>
+    <option name="GRAPHQL_FRAGMENT_SPREAD">
+      <value>
+        <option name="FOREGROUND" value="b6b3eb" />
+      </value>
+    </option>
     <option name="GRAPHQL_OBJECT_FIELD">
       <value>
         <option name="FOREGROUND" value="9896ff" />
@@ -1563,12 +1582,12 @@
     </option>
     <option name="KOTLIN_KEYWORD_VAL">
       <value>
-        <option name="FOREGROUND" value="ed005c" />
+        <option name="FOREGROUND" value="ee7762" />
       </value>
     </option>
     <option name="KOTLIN_KEYWORD_VAR">
       <value>
-        <option name="FOREGROUND" value="ed005c" />
+        <option name="FOREGROUND" value="ee7762" />
       </value>
     </option>
     <option name="KOTLIN_LABEL">
@@ -1599,7 +1618,7 @@
     </option>
     <option name="KOTLIN_SMART_CAST_RECEIVER">
       <value>
-        <option name="FOREGROUND" value="d3eeb1" />
+        <option name="FOREGROUND" value="b7e66e" />
       </value>
     </option>
     <option name="KOTLIN_SMART_CAST_VALUE">
@@ -1609,7 +1628,7 @@
     </option>
     <option name="KOTLIN_SMART_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="ffbf80" />
+        <option name="FOREGROUND" value="ed005c" />
       </value>
     </option>
     <option name="KOTLIN_TYPE_PARAMETER">
@@ -1632,9 +1651,19 @@
         <option name="FOREGROUND" value="ed005c" />
       </value>
     </option>
+    <option name="LESS_PROPERTY_VALUE">
+      <value>
+        <option name="FOREGROUND" value="ffd866" />
+      </value>
+    </option>
+    <option name="LESS_URL">
+      <value>
+        <option name="FOREGROUND" value="ffb900" />
+      </value>
+    </option>
     <option name="LESS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="4ddfea" />
+        <option name="FOREGROUND" value="78dce8" />
       </value>
     </option>
     <option name="LINE_FULL_COVERAGE">
@@ -32585,7 +32614,7 @@
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="bdbebd" />
+        <option name="FOREGROUND" value="ffbdce" />
       </value>
     </option>
     <option name="TS.ENUM">
@@ -32804,20 +32833,5 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="CSS.URL">
-      <value>
-        <option name="FOREGROUND" value="ffb900" />
-      </value>
-    </option>
-    <option name="LESS_PROPERTY_VALUE">
-      <value>
-        <option name="FOREGROUND" value="ffd866" />
-      </value>
-    </option>
-    <option name="LESS_URL">
-      <value>
-        <option name="FOREGROUND" value="ffb900" />
-      </value>
-    </option>
   </attributes>
 </scheme>
diff --git a/src/intellij/src/main/resources/themes/HiberbeeDark.theme.json b/src/intellij/src/main/resources/themes/HiberbeeDark.theme.json
@@ -5,43 +5,43 @@
   "editorScheme": "/colors/Dark.icls",
   "icons": {
     "ColorPalette": {
-      "#2b2d30": "#323130",
-      "#3574f0": "#ffb900",
-      "#3c3f41": "#323130",
-      "#43494a": "#424140",
-      "#6B6B6B": "#525150",
-      "#134d80": "#202635",
-      "#a1a3a4": "light7",
-      "#A7A7A7": "light4",
-      "#3D6185": "#ffb900",
       "Actions.GreyInline.Dark": "light4",
       "Checkbox.Background.Disabled.Dark": "#323130",
       "Checkbox.Background.Default.Dark": "#424140",
       "Checkbox.Background.Selected.Dark": "#424140",
-      "Checkbox.Focus.Thin.Selected.Dark": "#525150",
-      "Checkbox.Focus.Wide.Dark": "#525150",
+      "Checkbox.Focus.Thin.Selected.Dark": "dark10",
+      "Checkbox.Focus.Wide.Dark": "dark10",
       "Checkbox.Foreground.Selected.Dark": "#ffb900",
       "Checkbox.Border.Selected": "#ffb900",
       "Checkbox.Border.Default.Dark": "dark9",
       "Checkbox.Border.Disabled.Dark": "dark7",
       "Checkbox.Border.Selected.Dark": "dark10",
       "Actions.Blue": "blue",
       "Actions.Green": "green",
-      "Actions.Grey": "dark10",
+      "Actions.Grey": "light6",
       "Actions.Red": "red",
       "Actions.Yellow": "yellow",
       "Objects.Blue": "blue",
       "Objects.Green": "green",
       "Objects.Pink": "#ff6188",
       "Objects.Purple": "#9380ff",
-      "Objects.Red": "#e81123",
-      "Objects.RedStatus": "#e81123",
-      "Objects.Grey": "#c9c8c7",
-      "Objects.Yellow": "#FFB900",
+      "Objects.Red": "red",
+      "Objects.RedStatus": "red",
+      "Objects.Grey": "light6",
+      "Objects.Yellow": "yellow",
       "Objects.YellowDark": "#ff8c00"
     }
   },
   "colors": {
+    "#2b2d30": "#323130",
+    "#3574f0": "#ffb900",
+    "#3c3f41": "#323130",
+    "#43494a": "#424140",
+    "#6B6B6B": "#525150",
+    "#134d80": "#202635",
+    "#a1a3a4": "light7",
+    "#A7A7A7": "light4",
+    "#3D6185": "#ffb900",
     "dark1": "#070605",
     "dark2": "#121110",
     "dark3": "#171615",
@@ -55,10 +55,10 @@
     "accent": "#ffb900",
     "green": "#92D923",
     "greenDark": "#92D923a0",
-    "blueDark": "#253047a0",
+    "blueDark": "#253047e0",
     "blue": "#409cff",
     "red": "#d70751",
-    "redDark": "#260b08a0",
+    "redDark": "#400020f0",
     "yellow": "#ffb900",
     "yellowLight": "#f5d277",
     "yellowDark": "#ffb900a0",
@@ -75,6 +75,7 @@
   },
   "ui": {
     "*": {
+      "darkShadow": "dark10",
       "background": "dark6",
       "borderColor": "dark8",
       "disabledBackground": "dark7",
@@ -283,39 +284,37 @@
       "usedBackground": "redDark"
     },
     "Menu": {
-      "borderColor": "dark9",
+      "borderColor": "dark10",
       "background": "dark7",
-      "separatorColor": "dark8",
+      "separatorColor": "dark9",
       "disabledBackground": "dark8",
       "selectionBackground": "dark5",
       "acceleratorSelectionForeground": "light10",
-      "acceleratorForeground": "light10"
+      "acceleratorForeground": "light7"
     },
     "Notification": {
       "ToolWindow": {
-        "errorBackground": "dark5",
-        "errorBorderColor": "dark10",
-        "errorForeground": "light6",
+        "errorBackground": "redDark",
+        "errorBorderColor": "red",
+        "errorForeground": "light8",
         "informativeBackground": "blueDark",
         "informativeBorderColor": "blue",
-        "informativeForeground": "light6",
+        "informativeForeground": "light4",
         "warningBackground": "yellowDark",
         "warningBorderColor": "yellow",
         "warningForeground": "light6"
       },
-      "borderColor": "dark10",
+      "borderColor": "dark9",
       "background": "blueDark",
-      "arc": 12,
       "Button.background": "dark8",
-
       "Button.borderColor": "dark10",
       "linkForeground": "accent",
       "Button.foreground": "light10",
       "errorBackground": "redDark",
-      "errorBorderColor": "dark10",
+      "errorBorderColor": "red",
       "MoreButton.foreground": "light6",
-      "errorForeground": "light10",
-      "foreground": "light10"
+      "errorForeground": "light8",
+      "foreground": "light8"
     },
     "NotificationsToolwindow": {
       "newNotification.background": "dark5",
@@ -328,11 +327,11 @@
     },
     "ParameterInfo": {
       "background": "dark5",
-      "currentOverloadBackground": "light7",
-      "currentParameterForeground": "light5",
+      "currentOverloadBackground": "dark7",
+      "currentParameterForeground": "light7",
       "foreground": "light6",
       "infoForeground": "light3",
-      "lineSeparatorColor": "dark9"
+      "lineSeparatorColor": "dark8"
     },
     "PasswordField": {
       "capsLockIconColor": "red",
@@ -546,9 +545,6 @@
     },
     "GotItTooltip.arc": 4,
     "Tree": {
-      "Selection": {
-        "arc": 4
-      },
       "background": "dark7",
       "errorForeground": "red",
       "foreground": "light7",