IU-2021.1.1 <Eroter@DESKTOP-1PPMF59 Merge branch 'master'
This commit is contained in:
commit
7629c112f6
|
@ -1,5 +1,5 @@
|
|||
<application>
|
||||
<component name="CodeGlance">
|
||||
<option name="width" value="81" />
|
||||
<option name="width" value="79" />
|
||||
</component>
|
||||
</application>
|
|
@ -0,0 +1,15 @@
|
|||
<application>
|
||||
<component name="RestfulSetting">
|
||||
<option name="appSetting">
|
||||
<Settings>
|
||||
<option name="properties">
|
||||
<map>
|
||||
<entry key="Scan service with library on application default (global)" value="false" />
|
||||
<entry key="Whether to display the Class file by default?" value="true" />
|
||||
<entry key="Whether to expand the ServiceTree by default?" value="false" />
|
||||
</map>
|
||||
</option>
|
||||
</Settings>
|
||||
</option>
|
||||
</component>
|
||||
</application>
|
|
@ -1,6 +1,6 @@
|
|||
<application>
|
||||
<component name="PathMacrosImpl">
|
||||
<macro name="MAVEN_REPOSITORY" value="D:\JavaSpace\maven\repository" />
|
||||
<macro name="KOTLIN_BUNDLED" value="S:\JavaSpace\Intellij IDEA\IntelliJ IDEA 2021.1.1\plugins\Kotlin\kotlinc" />
|
||||
<macro name="KOTLIN_BUNDLED" value="C:\Users\Administrator\AppData\Roaming\JetBrains\IntelliJIdea2021.1\plugins\Kotlin\kotlinc" />
|
||||
</component>
|
||||
</application>
|
|
@ -0,0 +1,14 @@
|
|||
<application>
|
||||
<component name="CodeStyleSettingsManager">
|
||||
<option name="PER_PROJECT_SETTINGS">
|
||||
<value version="173">
|
||||
<codeStyleSettings language="JAVA">
|
||||
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
|
||||
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
|
||||
<option name="LINE_COMMENT_ADD_SPACE" value="true" />
|
||||
</codeStyleSettings>
|
||||
</value>
|
||||
</option>
|
||||
<option name="PREFERRED_PROJECT_CODE_STYLE" value="GoogleStyle" />
|
||||
</component>
|
||||
</application>
|
|
@ -39,8 +39,9 @@
|
|||
<option name="VARIABLE_ANNOTATION_WRAP" value="1" />
|
||||
<indentOptions>
|
||||
<option name="INDENT_SIZE" value="2" />
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
||||
<option name="TAB_SIZE" value="2" />
|
||||
<option name="USE_RELATIVE_INDENTS" value="true" />
|
||||
</indentOptions>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="JavaScript">
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
<application>
|
||||
<component name="ExportableFileTemplateSettings">
|
||||
<internal_templates>
|
||||
<template name="Class.java" reformat="true" live-template-enabled="true" enabled="true" />
|
||||
</internal_templates>
|
||||
</component>
|
||||
</application>
|
|
@ -1,6 +1,6 @@
|
|||
<application>
|
||||
<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;" />
|
||||
<ignoreFiles list="*.iml;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.idea;.svn;CVS;__pycache__;_svn;node_modules;target;vssver.scc;vssver2.scc;" />
|
||||
<extensionMap>
|
||||
<mapping ext="space.kts" type="Kotlin" />
|
||||
<mapping ext="gradle.kts" type="Kotlin" />
|
||||
|
|
2
find.xml
2
find.xml
|
@ -2,6 +2,8 @@
|
|||
<component name="FindSettings">
|
||||
<option name="customScope" value="All Places" />
|
||||
<option name="defaultScopeName" value="All Places" />
|
||||
<option name="wholeWordsOnly" value="true" />
|
||||
<option name="WHOLE_WORDS_ONLY" value="true" />
|
||||
<option name="SEARCH_SCOPE" value="All Places" />
|
||||
<mask>*.css</mask>
|
||||
<mask>*.html</mask>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<entry key="com.zeroturnaround.jrebel.intellij.autocompile.enabled" value="true" />
|
||||
<entry key="com.zeroturnaround.jrebel.intellij.autocompile.feature-seen" value="true" />
|
||||
<entry key="com.zeroturnaround.jrebel.intellij.autosave.enabled" value="true" />
|
||||
<entry key="com.zeroturnaround.jrebel.intellij.plugin.old-agent-version" value="2021.2.1" />
|
||||
<entry key="com.zeroturnaround.jrebel.intellij.plugin.old-agent-version" value="2021.2.2" />
|
||||
<entry key="com.zeroturnaround.jrebel.update.LastKnownVersionOnUpdateSite" value="2021.2.2" />
|
||||
<entry key="com.zeroturnaround.jrebel.update.UpdateNotificationCount" value="2" />
|
||||
</map>
|
||||
|
|
|
@ -159,7 +159,7 @@
|
|||
</entry>
|
||||
<entry key="JetRunConfigurationType">
|
||||
<value>
|
||||
<FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
|
||||
<FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="JettyConfiguration">
|
||||
|
@ -169,12 +169,12 @@
|
|||
</entry>
|
||||
<entry key="KotlinJavaScriptTestRunnerProtractor">
|
||||
<value>
|
||||
<FeaturePluginData displayName="Protractor (Kotlin)" pluginName="org.jetbrains.kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
|
||||
<FeaturePluginData displayName="Protractor (Kotlin)" pluginName="org.jetbrains.kotlin" pluginId="org.jetbrains.kotlin" />
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="KotlinStandaloneScriptRunConfigurationType">
|
||||
<value>
|
||||
<FeaturePluginData displayName="Kotlin script" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
|
||||
<FeaturePluginData displayName="Kotlin script" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="MavenRunConfiguration">
|
||||
|
@ -369,7 +369,7 @@
|
|||
</entry>
|
||||
<entry key="kotlin-language">
|
||||
<value>
|
||||
<FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
|
||||
<FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="native-android-gradle">
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
<application>
|
||||
<component name="SetterTemplates" defaultTemplateName="Builder" />
|
||||
</application>
|
Loading…
Reference in New Issue