IU-2021.2.3 <aiko@pro.local Merge branch 'master'

Conflicts:
	colors.scheme.xml
	editor.xml
	find.xml
This commit is contained in:
Aiko Mastboom 2021-12-15 13:23:29 +01:00
commit f7187c1582
5 changed files with 19 additions and 22 deletions

View File

@ -1,5 +1,5 @@
<application> <application>
<component name="EditorColorsManagerImpl"> <component name="EditorColorsManagerImpl">
<global_color_scheme name="IntelliJ Light" /> <global_color_scheme name="Darcula" />
</component> </component>
</application> </application>

14
customization.xml Normal file
View File

@ -0,0 +1,14 @@
<application>
<component name="com.intellij.ide.ui.customization.CustomActionsSchema">
<group value="space.actions.MainToolbarActionGroup" is_group="true" action_type="-1" position="15">
<path value="root" />
<path value="Main Toolbar" />
<option name="myInitialPosition" value="-1" />
</group>
<group value="space.actions.MainToolbarActionGroup" is_group="true" action_type="-1" position="9">
<path value="root" />
<path value="Navigation Bar Toolbar" />
<option name="myInitialPosition" value="-1" />
</group>
</component>
</application>

View File

@ -24,7 +24,7 @@
<entry key="ChangesView"> <entry key="ChangesView">
<PlaceSettings> <PlaceSettings>
<option name="EXPAND_BY_DEFAULT" value="false" /> <option name="EXPAND_BY_DEFAULT" value="false" />
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES" /> <option name="IGNORE_POLICY" value="TRIM_WHITESPACES" />
</PlaceSettings> </PlaceSettings>
</entry> </entry>
<entry key="CommitDialog"> <entry key="CommitDialog">

View File

@ -4,9 +4,6 @@
<mapping pattern="setenv" type="AUTO_DETECTED" /> <mapping pattern="setenv" type="AUTO_DETECTED" />
<mapping ext="aiko" type="AUTO_DETECTED" /> <mapping ext="aiko" type="AUTO_DETECTED" />
<mapping pattern=".dockerignore" type="GitIgnore file" /> <mapping pattern=".dockerignore" type="GitIgnore file" />
<mapping ext="space.kts" type="Kotlin" />
<mapping ext="main.kts" type="Kotlin" />
<mapping ext="heex" type="Live Embedded Elixir" />
<mapping pattern="gemfile.lock" type="PLAIN_TEXT" /> <mapping pattern="gemfile.lock" type="PLAIN_TEXT" />
<mapping ext="plist" type="PLAIN_TEXT" /> <mapping ext="plist" type="PLAIN_TEXT" />
<mapping ext="prj" type="PLAIN_TEXT" /> <mapping ext="prj" type="PLAIN_TEXT" />
@ -21,6 +18,9 @@
<removed_mapping ext="makefile" approved="true" type="textmate" /> <removed_mapping ext="makefile" approved="true" type="textmate" />
<removed_mapping ext="snakefile" approved="true" type="textmate" /> <removed_mapping ext="snakefile" approved="true" type="textmate" />
<removed_mapping pattern="setenv" approved="true" type="JSHELL" /> <removed_mapping pattern="setenv" approved="true" type="JSHELL" />
<mapping ext="heex" type="Live Embedded Elixir" />
<mapping ext="main.kts" type="Kotlin" />
<mapping ext="space.kts" type="Kotlin" />
</extensionMap> </extensionMap>
</component> </component>
</application> </application>

View File

@ -1,17 +0,0 @@
<application>
<component name="LightEdit">
<option name="supportedFilePatterns">
<list>
<option value="*.conf" />
<option value="*.ini" />
<option value="*.json" />
<option value="*.log" />
<option value="*.md" />
<option value="*.sh" />
<option value="*.txt" />
<option value="*.xml" />
<option value="*.yml" />
</list>
</option>
</component>
</application>