Updates related to new EAP 2023.2 compatibility breaks

hiberbee · May 13, 2023 · 1d082b0 · 1d082b0
1 parent 5e4a712
commit 1d082b0
Show file tree

Hide file tree

Showing 9 changed files with 1,737 additions and 1,617 deletions.
diff --git a/package.json b/package.json
@@ -21,11 +21,11 @@
     "extends": "@bn-digital/eslint-config"
   },
   "devDependencies": {
-    "@bn-digital/eslint-config": "^2.0.31",
-    "@bn-digital/prettier-config": "^2.1.11",
-    "@bn-digital/typescript-config": "^1.2.4",
-    "@types/node": "^18.14.1",
-    "typescript": "^4.9.5"
+    "@bn-digital/eslint-config": "^2.2.4",
+    "@bn-digital/prettier-config": "^2.3.8",
+    "@bn-digital/typescript-config": "^1.3.4",
+    "@types/node": "^20.1.4",
+    "typescript": "^5.0.4"
   },
   "scripts": {
     "vscode:start": "code",

diff --git a/src/intellij/src/main/resources/META-INF/plugin.xml b/src/intellij/src/main/resources/META-INF/plugin.xml
@@ -40,18 +40,10 @@
   </description>
   <version>latest</version>
   <depends>com.intellij.modules.lang</depends>
-  <idea-version since-build="231.8109"/>
+  <idea-version since-build="231"/>
   <extensions defaultExtensionNs="com.intellij">
     <themeProvider id="HiberbeeDark" path="/themes/HiberbeeDark.theme.json"/>
-<!--    <applicationConfigurable instance="com.hiberbee.intellij.settings.ThemeConfigurable" displayName="Hiberbee Theme" groupId="appearance"/>-->
-<!--    <applicationService serviceImplementation="com.hiberbee.intellij.settings.ThemeSettings"/>-->
-<!--    <postStartupActivity implementation="com.hiberbee.intellij.activities.ThemeStartupActivity"/>-->
-<!--    <notificationGroup displayType="BALLOON" id="hiberbee-theme" isLogByDefault="true" />-->
     <registryKey key="ide.experimental.ui.tree.selection" defaultValue="false" restartRequired="false"
                  description="New UI for selected tree nodes (Hiberbee theme modified, IDE default: true)"/>
-
-    <!--    <themeProvider id="HiberbeeLight" path="/themes/HiberbeeLight.theme.json"/>-->
-    <!--    <registryKey key="ide.window.shadow.painter" defaultValue="true" restartRequired="true"-->
-    <!--                 description="Enables light-weight shadows for heavy-weight child windows (Windows only). (Hiberbee theme modified, IDE default: false)"/>-->
   </extensions>
 </idea-plugin>
diff --git a/src/intellij/src/main/resources/colors/Dark.icls b/src/intellij/src/main/resources/colors/Dark.icls
@@ -1634,7 +1634,7 @@
     </option>
     <option name="LESS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="78dce8" />
+        <option name="FOREGROUND" value="4ddfea" />
       </value>
     </option>
     <option name="LINE_FULL_COVERAGE">
@@ -32804,5 +32804,20 @@
         <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
@@ -65,7 +65,7 @@
   },
   "ui": {
     "*": {
-      "arc": 6,
+      "arc": 4,
       "background": "dark6",
       "borderColor": "dark8",
       "disabledBackground": "dark7",
@@ -94,7 +94,6 @@
       "pressedBorderColor": "dark7"
     },
     "Button": {
-      "arc": 6,
       "default": {
         "endBackground": "dark8",
         "endBorderColor": "dark10",
@@ -151,13 +150,12 @@
       }
     },
     "Component": {
-      "arc": 6,
       "disabledBorderColor": "dark8",
       "borderColor": "dark9",
       "errorFocusColor": "red",
       "iconColor": "accent",
       "focusColor": "dark10",
-      "focusedBorderColor": "dark10",
+      "focusedBorderColor": "dark9",
       "inactiveErrorFocusColor": "redDark",
       "inactiveWarningFocusColor": "yellowDark",
       "infoForeground": "light3",
@@ -192,12 +190,12 @@
       "areaForeground": "light4"
     },
     "Editor": {
-      "SearchField.borderInsets": "6,2,6,2",
+      "SearchField.borderInsets": "0,0,0,0",
       "SearchField": {
-        "background": "dark8"
+        "background": "dark7"
       },
       "Toolbar.borderColor": "dark8",
-      "background": "dark4",
+      "background": "dark5",
       "shortcutForeground": "light5"
     },
     "EditorPane": {
@@ -269,19 +267,25 @@
       "hoverInactiveBackground": "dark6",
       "hoverBackground": "dark5",
       "selectionBackground": "dark4",
-      "selectionInactiveBackground": "dark6"
+      "selectionInactiveBackground": "dark5"
     },
     "MemoryIndicator": {
       "allocatedBackground": "dark7",
       "usedBackground": "redDark"
     },
     "Menu": {
+      "borderColor": "dark10",
       "background": "dark7",
+      "borderInsets": "0,0,0,0",
       "separatorColor": "dark8",
       "disabledBackground": "dark8",
       "selectionBackground": "dark5",
       "acceleratorSelectionForeground": "light10",
-      "Selection.arc": 6,
+      "Selection": {
+        "arc": 0,
+        "innerInsets": "2,8,2,8",
+        "outerInsets": "2,4,2,4"
+      },
       "acceleratorForeground": "light10"
     },
     "Notification": {
@@ -355,26 +359,38 @@
     },
     "Popup": {
       "borderColor": "dark9",
-      "Selection.arc": 6,
-      "Selection.innerInsets": 0,
+      "inactiveBorderColor": "dark8",
+      "innerBorderColor": "dark9",
+      "Body": {
+        "bottomInsetNoAd": 4
+      },
       "Advertiser": {
         "background": "dark4",
         "borderColor": "dark7",
         "foreground": "light4"
       },
       "Header": {
+        "insets": "4,0,4,0",
         "activeBackground": "dark5",
         "activeForeground": "light5",
         "inactiveForeground": "light6",
         "inactiveBackground": "dark6"
       },
-      "separatorColor": "dark9"
+      "Selection": {
+        "arc": 0,
+        "leftRightInset": 4
+      },
+      "separatorColor": "dark8"
     },
     "PopupMenu": {
       "background": "dark7",
+      "borderWidth": 1,
+      "borderInsets": "4,1,4,1",
       "foreground": "light7",
       "Selection": {
-        "arc": 6
+        "arc": 0,
+        "innerInsets": "2,8,2,8",
+        "outerInsets": "2,1,2,1"
       }
     },
     "ProgressBar": {
@@ -395,7 +411,8 @@
     },
     "RunWidget": {
       "background": "dark6",
-      "pressedBackground": "dark4","runModeIconColor": "light10",
+      "pressedBackground": "dark4",
+      "runModeIconColor": "light10",
       "runningBackground": "dark5"
     },
     "ScrollBar": {
@@ -534,9 +551,11 @@
       },
       "background": "dark7"
     },
-    "GotItTooltip.arc": 6,
+    "GotItTooltip.arc": 4,
     "Tree": {
-      "Selection.arc": 6,
+      "Selection": {
+        "arc": 4
+      },
       "background": "dark7",
       "errorForeground": "red",
       "foreground": "light7",
@@ -586,10 +605,10 @@
       "Projects": {
         "background": "dark6",
         "selectionBackground": "dark4",
-        "selectionInactiveBackground": "dark6"
+        "selectionInactiveBackground": "dark5"
       },
       "SidePanel": {
-        "background": "dark5"
+        "background": "dark7"
       },
       "footerBackground": "dark4",
       "headerBackground": "dark5",