IU-2021.1.1 <Eroter@DESKTOP-1PPMF59 Merge branch 'master'

This commit is contained in:
Eee 2021-05-25 22:08:09 +08:00
commit b8a200084d
7 changed files with 32 additions and 2 deletions

View File

@ -1,5 +1,5 @@
<application> <application>
<component name="CodeGlance"> <component name="CodeGlance">
<option name="width" value="69" /> <option name="width" value="81" />
</component> </component>
</application> </application>

View File

@ -37,6 +37,20 @@
<option name="WRAP_LONG_LINES" value="true" /> <option name="WRAP_LONG_LINES" value="true" />
<option name="PARAMETER_ANNOTATION_WRAP" value="1" /> <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
<option name="VARIABLE_ANNOTATION_WRAP" value="1" /> <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JavaScript">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<indentOptions> <indentOptions>
<option name="INDENT_SIZE" value="2" /> <option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" /> <option name="CONTINUATION_INDENT_SIZE" value="2" />

View File

@ -1,5 +1,6 @@
<application> <application>
<component name="DebuggerSettings"> <component name="DebuggerSettings">
<option name="RUN_HOTSWAP_AFTER_COMPILE" value="RunHotswapAlways" />
<filter> <filter>
<option name="PATTERN" value="com.sun.*" /> <option name="PATTERN" value="com.sun.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />

View File

@ -1,9 +1,17 @@
<application> <application>
<component name="CodeInsightSettings">
<option name="ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY" value="true" />
</component>
<component name="DaemonCodeAnalyzerSettings"> <component name="DaemonCodeAnalyzerSettings">
<option name="NEXT_ERROR_ACTION_GOES_TO_ERRORS_FIRST" value="false" /> <option name="NEXT_ERROR_ACTION_GOES_TO_ERRORS_FIRST" value="false" />
</component> </component>
<component name="DefaultFont"> <component name="DefaultFont">
<option name="FONT_SIZE" value="18" /> <option name="FONT_SIZE" value="18" />
<option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
<option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
</component>
<component name="EditorSettings">
<option name="USE_SOFT_WRAPS" value="CONSOLE" />
</component> </component>
<component name="SqlCodeCompletionSettings" AUTO_ALIAS_TABLE="true" INVERT_ON_ORDER="true"> <component name="SqlCodeCompletionSettings" AUTO_ALIAS_TABLE="true" INVERT_ON_ORDER="true">
<option name="autoAliasTable" value="true" /> <option name="autoAliasTable" value="true" />

View File

@ -0,0 +1,7 @@
<application>
<component name="ExportableFileTemplateSettings">
<includes_templates>
<template name="File Header.java" reformat="true" live-template-enabled="true" enabled="true" />
</includes_templates>
</component>
</application>

View File

@ -1,5 +1,6 @@
<application> <application>
<component name="FileTypeManager" version="18"> <component name="FileTypeManager" version="18">
<ignoreFiles list="*.iml;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.idea;.svn;CVS;__pycache__;_svn;target;vssver.scc;vssver2.scc;" />
<extensionMap> <extensionMap>
<mapping ext="space.kts" type="Kotlin" /> <mapping ext="space.kts" type="Kotlin" />
<mapping ext="gradle.kts" type="Kotlin" /> <mapping ext="gradle.kts" type="Kotlin" />

View File

@ -3,7 +3,6 @@
<option name="customScope" value="All Places" /> <option name="customScope" value="All Places" />
<option name="defaultScopeName" value="All Places" /> <option name="defaultScopeName" value="All Places" />
<option name="SEARCH_SCOPE" value="All Places" /> <option name="SEARCH_SCOPE" value="All Places" />
<option name="FILE_MASK" value="*.java" />
<mask>*.css</mask> <mask>*.css</mask>
<mask>*.html</mask> <mask>*.html</mask>
<mask>*.xml</mask> <mask>*.xml</mask>