~saiko/intellij-settings

259bfae85fd06815dc311aaf96335966e87fcce0 — 2xsaiko 3 months ago 78ffd88 + 4f524ed
RD-2020.3.3 <saiko@invader Merge branch 'master'

Conflicts:
	find.xml
5 files changed, 20 insertions(+), 20 deletions(-)

M _linux/path.macros.xml
M editor.xml
M filetypes.xml
M find.xml
M pluginAdvertiser.xml
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 +3 -3
@@ 1,6 1,8 @@
<application>
  <component name="FileTypeManager" version="18">
    <extensionMap>
      <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" />


@@ 9,9 11,7 @@
      <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="moc" type="ObjectiveC" />
      <mapping ext="gsh" type="GLSL shader file" />
    </extensionMap>
  </component>
</application>
\ No newline at end of file

M find.xml => find.xml +3 -3
@@ 1,8 1,8 @@
<application>
  <component name="FindSettings">
    <option name="customScope" value="Solution" />
    <option name="defaultScopeName" value="Solution" />
    <option name="SEARCH_SCOPE" value="Solution" />
    <option name="customScope" value="All Places" />
    <option name="defaultScopeName" value="All Places" />
    <option name="SEARCH_SCOPE" value="All Places" />
    <mask>*.properties</mask>
    <mask>*.html</mask>
    <mask>*.jsp</mask>

M pluginAdvertiser.xml => pluginAdvertiser.xml +12 -13
@@ 257,8 257,8 @@
        <entry key="*.config">
          <value>
            <plugin>
              <option name="myPluginId" value="com.intellij" />
              <option name="myPluginName" value="IDEA CORE" />
              <option name="myPluginId" value="Lombook Plugin" />
              <option name="myPluginName" value="Lombok" />
              <option name="myBundled" value="true" />
            </plugin>
          </value>


@@ 545,8 545,8 @@
        <entry key="*.form">
          <value>
            <plugin>
              <option name="myPluginId" value="com.intellij" />
              <option name="myPluginName" value="IDEA CORE" />
              <option name="myPluginId" value="com.intellij.uiDesigner" />
              <option name="myPluginName" value="UI Designer" />
              <option name="myBundled" value="true" />
            </plugin>
          </value>


@@ 626,8 626,8 @@
        <entry key="*.gdsl">
          <value>
            <plugin>
              <option name="myPluginId" value="com.intellij" />
              <option name="myPluginName" value="IDEA CORE" />
              <option name="myPluginId" value="org.intellij.groovy" />
              <option name="myPluginName" value="Groovy" />
              <option name="myBundled" value="true" />
            </plugin>
          </value>


@@ 671,8 671,8 @@
        <entry key="*.groovy">
          <value>
            <plugin>
              <option name="myPluginId" value="com.intellij" />
              <option name="myPluginName" value="IDEA CORE" />
              <option name="myPluginId" value="org.intellij.groovy" />
              <option name="myPluginName" value="Groovy" />
              <option name="myBundled" value="true" />
            </plugin>
          </value>


@@ 680,8 680,8 @@
        <entry key="*.gy">
          <value>
            <plugin>
              <option name="myPluginId" value="com.intellij" />
              <option name="myPluginName" value="IDEA CORE" />
              <option name="myPluginId" value="org.intellij.groovy" />
              <option name="myPluginName" value="Groovy" />
              <option name="myBundled" value="true" />
            </plugin>
          </value>


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