~saiko/intellij-settings

ff78c84f3e71dd9e04cea769c71c4bcae66cb274 — Marco Rebhan 2 months ago f1dd730 + 1b136a0
CL-2020.3.3 <saiko@invader Merge branch 'master'

Conflicts:
	filetypes.xml
6 files changed, 14 insertions(+), 8 deletions(-)

M CodeGlance.xml
M _linux/path.macros.xml
M editor.xml
M filetypes.xml
M pluginAdvertiser.xml
A projectView.xml
M CodeGlance.xml => CodeGlance.xml +0 -1
@@ 1,6 1,5 @@
<application>
  <component name="CodeGlance">
    <option name="disabled" value="true" />
    <option name="locked" value="true" />
    <option name="width" value="61" />
  </component>

M _linux/path.macros.xml => _linux/path.macros.xml +1 -1
@@ 1,6 1,6 @@
<application>
  <component name="PathMacrosImpl">
    <macro name="MAVEN_REPOSITORY" value="/home/zx/.m2/repository" />
    <macro name="KOTLIN_BUNDLED" value="/opt/idea-ultimate-bin-2020.3.2/plugins/Kotlin/kotlinc" />
    <macro name="KOTLIN_BUNDLED" value="/opt/idea-ultimate-bin-2020.3.3/plugins/Kotlin/kotlinc" />
  </component>
</application>
\ No newline at end of file

M editor.xml => editor.xml +1 -0
@@ 14,6 14,7 @@
    <option name="USE_SOFT_WRAPS" value="MAIN_EDITOR:CONSOLE" />
    <option name="SOFT_WRAP_FILE_MASKS" value="*.md; *.txt; *.rst; *.adoc; *" />
    <option name="USE_CUSTOM_SOFT_WRAP_INDENT" value="true" />
    <option name="CUSTOM_SOFT_WRAP_INDENT" value="80" />
    <option name="IS_ALL_SOFTWRAPS_SHOWN" value="true" />
  </component>
  <component name="InlayHintsSettings">

M filetypes.xml => filetypes.xml +4 -4
@@ 1,18 1,18 @@
<application>
  <component name="FileTypeManager" version="18">
    <extensionMap>
      <mapping pattern="srvrc" type="AUTO_DETECTED" />
      <mapping ext="gsh" type="GLSL shader file" />
      <mapping ext="gradle.kts" type="Kotlin" />
      <mapping ext="main.kts" type="Kotlin" />
      <mapping ext="blend" type="Native" />
      <mapping ext="ase" type="Native" />
      <mapping ext="xcf" type="Native" />
      <mapping ext="rtw" type="Native" />
      <mapping pattern=".clang-format" type="PLAIN_TEXT" />
      <mapping pattern="LICENSE" type="PLAIN_TEXT" />
      <mapping ext="sdef" type="PLAIN_TEXT" />
      <mapping ext="themerc" type="PLAIN_TEXT" />
      <mapping ext="obj" type="PLAIN_TEXT" />
      <mapping ext="gradle.kts" type="Kotlin" />
      <mapping ext="main.kts" type="Kotlin" />
      <mapping ext="gsh" type="GLSL shader file" />
    </extensionMap>
  </component>
</application>
\ No newline at end of file

M pluginAdvertiser.xml => pluginAdvertiser.xml +3 -2
@@ 2116,8 2116,9 @@
        <entry key="*.swift">
          <value>
            <plugin>
              <option name="myPluginId" value="com.intellij.clion-swift" />
              <option name="myPluginName" value="Swift" />
              <option name="myPluginId" value="com.intellij" />
              <option name="myPluginName" value="IDEA CORE" />
              <option name="myBundled" value="true" />
            </plugin>
          </value>
        </entry>

A projectView.xml => projectView.xml +5 -0
@@ 0,0 1,5 @@
<application>
  <component name="ProjectViewSharedSettings">
    <option name="abbreviatePackages" value="true" />
  </component>
</application>
\ No newline at end of file