CL-2022.3 <TheoryOfNekomata@VALHALLA Merge branch 'master'

Conflicts:
	ui.lnf.xml

NewUIInfoService.xml

@@ -1,5 +1,6 @@
 <application>
   <component name="NewUIInfoState"><![CDATA[{
+  "numberNotificationShowed": 1,
   "enableNewUIDate": "2022-12-11T16:28:30.876810500"
 }]]></component>
 </application>

a-file-icons.xml

@@ -7,5 +7,7 @@
     <option name="isEnabledUIIcons" value="false" />
     <option name="monochromeColor" value="546e7a" />
     <option name="isUseHollowFolders" value="false" />
+    <option name="accentColor" value="589df6" />
+    <option name="themedColor" value="bbbbbb" />
   </component>
 </application>

colors/_@user_Darcula.icls

@@ -3,7 +3,7 @@
     <property name="created">2022-12-11T15:56:44</property>
     <property name="ide">WebStorm</property>
     <property name="ideVersion">2022.3.0.0</property>
-    <property name="modified">2022-12-11T15:59:52</property>
+    <property name="modified">2023-01-19T17:11:26</property>
     <property name="originalScheme">Darcula</property>
   </metaInfo>
   <colors>

csv-editor.xml

@@ -1,5 +1,5 @@
 <application>
   <component name="CsvEditorSettings">
-    <option name="CURRENT_PLUGIN_VERSION" value="3.0.1-223" />
+    <option name="CURRENT_PLUGIN_VERSION" value="3.0.2-223" />
   </component>
 </application>

editor-font.xml

@@ -4,8 +4,6 @@
     <option name="FONT_SIZE" value="12" />
     <option name="FONT_SIZE_2D" value="12.0" />
     <option name="FONT_FAMILY" value="MonoLisa" />
-    <option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
-    <option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
     <option name="LINE_SPACING" value="0.85" />
   </component>
 </application>

filetypes.xml

@@ -3,7 +3,6 @@
     <extensionMap>
       <mapping pattern="cucumber-js" type="AUTO_DETECTED" />
       <mapping ext="babelrc" type="JSON" />
-      <mapping ext="sequelizerc" type="JavaScript" />
       <mapping pattern=".gitmessage" type="PLAIN_TEXT" />
       <mapping pattern="LICENSE" type="PLAIN_TEXT" />
       <mapping pattern=".nvmrc" type="PLAIN_TEXT" />
@@ -21,6 +20,7 @@
       <removed_mapping pattern=".sequelizerc" approved="true" type="JSON" />
       <mapping ext="gradle.kts" type="Kotlin" />
       <mapping ext="main.kts" type="Kotlin" />
+      <mapping ext="sequelizerc" type="JavaScript" />
     </extensionMap>
   </component>
 </application>

ide.general.xml

@@ -7,6 +7,10 @@
     <entry key="ide.balloon.shadow.size" value="0" />
     <entry key="ide.experimental.ui" value="true" />
     <entry key="debugger.new.tool.window.layout" value="true" />
+    <entry key="ide.editor.tab.selection.animation" value="true" />
+    <entry key="ide.new.editor.tabs.vertical.borders" value="true" />
+    <entry key="editor.focus.mode.color.light" value="444444" />
+    <entry key="editor.focus.mode.color.dark" value="444444" />
   </component>
   <component name="StatusBar">
     <option name="widgets">

keymapFlags.xml

@@ -0,0 +1,13 @@
+<application>
+  <component name="KeymapFlagsStorage">
+    <option name="keymapToDescriptor">
+      <map>
+        <entry key="Windows Proper Redo">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</application>

material_theme.xml

@@ -1,6 +1,7 @@
 <application>
   <component name="MaterialThemeConfig">
     <option name="customTreeIndentEnabled" value="true" />
+    <option name="allowDataCollection" value="true" />
     <option name="autoResetColorScheme" value="true" />
     <option name="compactSidebar" value="true" />
     <option name="isCustomTreeIndentEnabled" value="true" />
@@ -15,6 +16,6 @@
     <option name="accentColor" value="eeca3f" />
     <option name="selectedTheme" value="CUSTOM" />
     <option name="userId" value="7a11f371:1686d9b67db:-8000" />
-    <option name="version" value="8.3.2" />
+    <option name="version" value="8.4.0" />
   </component>
 </application>

ocRefactoring.xml

@@ -0,0 +1,5 @@
+<application>
+  <component name="OCRefactoringSettings">
+    <option name="RENAME_ASSOCIATED_FILES" value="false" />
+  </component>
+</application>

ui.lnf.xml

@@ -1,11 +1,6 @@
 <application>
   <component name="UISettings">
-    <option name="compactTreeIndents" value="true" />
-    <option name="LEFT_HORIZONTAL_SPLIT" value="true" />
-    <option name="MARK_MODIFIED_TABS_WITH_ASTERISK" value="true" />
+    <option name="OPEN_IN_PREVIEW_TAB_IF_POSSIBLE" value="true" />
     <option name="OVERRIDE_NONIDEA_LAF_FONTS" value="true" />
-    <option name="RIGHT_HORIZONTAL_SPLIT" value="true" />
-    <option name="SHOW_NAVIGATION_BAR" value="false" />
-    <option name="showTreeIndentGuides" value="true" />
   </component>
 </application>