AI-Arctic Fox | 2020.3.1 Patch 2 <debuggerx@debuggerx-PC Merge branch 'master'
Conflicts: yiiguxing.translation.xml
This commit is contained in:
@@ -28,18 +28,9 @@
|
|||||||
<emptyLine />
|
<emptyLine />
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
<option name="RIGHT_MARGIN" value="100" />
|
|
||||||
<AndroidXmlCodeStyleSettings>
|
|
||||||
<option name="USE_CUSTOM_SETTINGS" value="true" />
|
|
||||||
</AndroidXmlCodeStyleSettings>
|
|
||||||
<JavaCodeStyleSettings>
|
<JavaCodeStyleSettings>
|
||||||
<option name="FIELD_NAME_PREFIX" value="m" />
|
<option name="FIELD_NAME_PREFIX" value="m" />
|
||||||
<option name="STATIC_FIELD_NAME_PREFIX" value="s" />
|
<option name="STATIC_FIELD_NAME_PREFIX" value="s" />
|
||||||
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
|
|
||||||
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
|
|
||||||
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
|
|
||||||
<value />
|
|
||||||
</option>
|
|
||||||
<option name="IMPORT_LAYOUT_TABLE">
|
<option name="IMPORT_LAYOUT_TABLE">
|
||||||
<value>
|
<value>
|
||||||
<package name="android" withSubpackages="true" static="false" />
|
<package name="android" withSubpackages="true" static="false" />
|
||||||
@@ -63,31 +54,6 @@
|
|||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
</JavaCodeStyleSettings>
|
</JavaCodeStyleSettings>
|
||||||
<Objective-C-extensions>
|
|
||||||
<file>
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
|
|
||||||
</file>
|
|
||||||
<class>
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
|
|
||||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
|
|
||||||
</class>
|
|
||||||
<extensions>
|
|
||||||
<pair source="cpp" header="h" fileNamingConvention="NONE" />
|
|
||||||
<pair source="c" header="h" fileNamingConvention="NONE" />
|
|
||||||
</extensions>
|
|
||||||
</Objective-C-extensions>
|
|
||||||
<XML>
|
<XML>
|
||||||
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
||||||
</XML>
|
</XML>
|
||||||
|
|||||||
@@ -540,8 +540,9 @@
|
|||||||
<entry key="*.ignore">
|
<entry key="*.ignore">
|
||||||
<value>
|
<value>
|
||||||
<plugin>
|
<plugin>
|
||||||
<option name="myPluginId" value="mobi.hsz.idea.gitignore" />
|
<option name="myPluginId" value="com.intellij" />
|
||||||
<option name="myPluginName" value=".ignore" />
|
<option name="myPluginName" value="IDEA CORE" />
|
||||||
|
<option name="myBundled" value="true" />
|
||||||
</plugin>
|
</plugin>
|
||||||
</value>
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
<component name="UISettings">
|
<component name="UISettings">
|
||||||
<option name="LANGUAGE_FLAGS" value="true" />
|
<option name="LANGUAGE_FLAGS" value="true" />
|
||||||
<option name="MAX_LOOKUP_LIST_HEIGHT" value="19" />
|
<option name="MAX_LOOKUP_LIST_HEIGHT" value="19" />
|
||||||
<option name="MAX_LOOKUP_WIDTH2" value="1328" />
|
<option name="MAX_LOOKUP_WIDTH2" value="1574" />
|
||||||
<option name="OVERRIDE_NONIDEA_LAF_FONTS" value="true" />
|
<option name="OVERRIDE_NONIDEA_LAF_FONTS" value="true" />
|
||||||
<option name="SHOW_MAIN_TOOLBAR" value="true" />
|
<option name="SHOW_MAIN_TOOLBAR" value="true" />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
Reference in New Issue
Block a user