瀏覽代碼

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

Conflicts:
	colors/TheoryOfNekomata.icls
	colors/_@user_Darcula.icls
master
TheoryOfNekomata 1 年之前
父節點
當前提交
e86d22e43b
共有 3 個文件被更改,包括 11 次插入4 次删除
  1. +8
    -1
      colors/TheoryOfNekomata.icls
  2. 二進制
      colors/_@user_Darcula.icls
  3. +3
    -3
      colors/_@user_Default.icls

+ 8
- 1
colors/TheoryOfNekomata.icls 查看文件

@@ -586,6 +586,13 @@
</value>
</option>
<option name="INSTANCE_FIELD_ATTRIBUTES" baseAttributes="" />
<option name="JS.GLOBAL_FUNCTION" baseAttributes="DEFAULT_FUNCTION_DECLARATION" />
<option name="JS.GLOBAL_VARIABLE" baseAttributes="DEFAULT_GLOBAL_VARIABLE" />
<option name="JS.INSTANCE_MEMBER_FUNCTION" baseAttributes="DEFAULT_INSTANCE_METHOD" />
<option name="JS.LOCAL_VARIABLE" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
<option name="JS.PARAMETER" baseAttributes="DEFAULT_PARAMETER" />
<option name="JS.REGEXP" baseAttributes="DEFAULT_STRING" />
<option name="JavaScript:INJECTED_LANGUAGE_FRAGMENT" baseAttributes="INJECTED_LANGUAGE_FRAGMENT" />
<option name="KOTLIN_ANNOTATION">
<value>
<option name="FOREGROUND" value="7a8fd9" />
@@ -934,4 +941,4 @@
</value>
</option>
</attributes>
</scheme>
</scheme>

二進制
colors/_@user_Darcula.icls 查看文件


+ 3
- 3
colors/_@user_Default.icls 查看文件

@@ -3,7 +3,7 @@
<property name="created">2019-08-26T12:03:47</property>
<property name="ide">WebStorm</property>
<property name="ideVersion">2019.2.1.0.0</property>
<property name="modified">2023-02-25T11:53:12</property>
<property name="modified">2023-02-27T18:11:39</property>
<property name="originalScheme">Default</property>
</metaInfo>
<colors>
@@ -15,7 +15,7 @@
<option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS" value="d5756c" />
<option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_CONFLICTS" value="d5756c" />
<option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="d5756c" />
<option name="FILESTATUS_IGNORE.PROJECT_VIEW.IGNORED" value="cccccc" />
<option name="FILESTATUS_IGNORE.PROJECT_VIEW.IGNORED" value="666666" />
<option name="FILESTATUS_MERGED" value="9876aa" />
<option name="FILESTATUS_MODIFIED" value="80cbc4" />
<option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" />
@@ -26,6 +26,6 @@
<option name="FILESTATUS_UNKNOWN" value="f77669" />
<option name="FILESTATUS_addedOutside" value="629755" />
<option name="FILESTATUS_changelistConflict" value="d5756c" />
<option name="FILESTATUS_modifiedOutside" value="f3db88" />
<option name="FILESTATUS_modifiedOutside" value="6897bb" />
</colors>
</scheme>

Loading…
取消
儲存