~saiko/intellij-settings

09b29e19faab0e30e131fbf672154054cdb748c4 — Marco Rebhan 2 months ago e7e1853 + 92ebebf
IU-2021.1 <saiko@invader Merge branch 'master'

Conflicts:
	filetypes.xml
2 files changed, 80 insertions(+), 132 deletions(-)

M filetypes.xml
M pluginAdvertiser.xml
M filetypes.xml => filetypes.xml +4 -6
@@ 1,11 1,7 @@
<application>
  <component name="FileTypeManager" version="18">
    <extensionMap>
      <mapping pattern="pack.mcmeta" type="JSON" />
      <mapping pattern="mcmod.info" type="JSON" />
      <mapping ext="space.kts" type="Kotlin" />
      <mapping ext="gradle.kts" type="Kotlin" />
      <mapping ext="main.kts" type="Kotlin" />
      <mapping ext="gsh" type="GLSL shader file" />
      <mapping ext="blend" type="Native" />
      <mapping ext="ase" type="Native" />
      <mapping ext="xcf" type="Native" />


@@ 14,7 10,9 @@
      <mapping ext="sdef" type="PLAIN_TEXT" />
      <mapping ext="themerc" type="PLAIN_TEXT" />
      <mapping ext="obj" type="PLAIN_TEXT" />
      <mapping ext="gsh" type="GLSL shader file" />
      <mapping ext="gradle.kts" type="Kotlin" />
      <mapping ext="main.kts" type="Kotlin" />
      <mapping ext="space.kts" type="Kotlin" />
    </extensionMap>
  </component>
</application>
\ No newline at end of file

M pluginAdvertiser.xml => pluginAdvertiser.xml +76 -126
@@ 7,124 7,124 @@
            <FeaturePluginsList>
              <option name="featureMap">
                <map>
                  <entry key="#org.jetbrains.idea.devkit.run.PluginConfigurationType">
                  <entry key="CLionExternalRunConfiguration">
                    <value>
                      <FeaturePluginData displayName="Plugin" pluginName="Plugin DevKit" pluginId="DevKit" bundled="true" />
                      <FeaturePluginData displayName="Custom Build Application" pluginName="CLion IDE" pluginId="com.intellij.clion" bundled="true" />
                    </value>
                  </entry>
                  <entry key="Application">
                  <entry key="CLionNativeAppRunConfigurationType">
                    <value>
                      <FeaturePluginData displayName="Application" pluginName="Java" pluginId="com.intellij.java" bundled="true" />
                      <FeaturePluginData displayName="Makefile Application" pluginName="Makefile" pluginId="com.intellij.clion-makefile" bundled="true" />
                    </value>
                  </entry>
                  <entry key="BSP_TEST_RUN_CONFIGURATION">
                  <entry key="CLion_CoreDump">
                    <value>
                      <FeaturePluginData displayName="BSP test" pluginName="Scala" pluginId="org.intellij.scala" />
                      <FeaturePluginData displayName="Core Dump Debug" pluginName="CLion IDE" pluginId="com.intellij.clion" bundled="true" />
                    </value>
                  </entry>
                  <entry key="ChromiumRemoteDebugType">
                  <entry key="CLion_Remote">
                    <value>
                      <FeaturePluginData displayName="Attach to Node.js/Chrome" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" />
                      <FeaturePluginData displayName="GDB Remote Debug" pluginName="CLion IDE" pluginId="com.intellij.clion" bundled="true" />
                    </value>
                  </entry>
                  <entry key="CompoundRunConfigurationType">
                  <entry key="CMakeBoostTestRunConfigurationType">
                    <value>
                      <FeaturePluginData displayName="Compound" pluginName="IDEA CORE" pluginId="com.intellij" bundled="true" />
                      <FeaturePluginData displayName="Boost.Test" pluginName="CLion Boost.Test" pluginId="org.jetbrains.plugins.clion.test.boost" bundled="true" />
                    </value>
                  </entry>
                  <entry key="DatabaseScript">
                  <entry key="CMakeCatchTestRunConfigurationType">
                    <value>
                      <FeaturePluginData displayName="Database Script" pluginName="Database Tools and SQL" pluginId="com.intellij.database" bundled="true" />
                      <FeaturePluginData displayName="Catch" pluginName="CLion Catch" pluginId="org.jetbrains.plugins.clion.test.catch" bundled="true" />
                    </value>
                  </entry>
                  <entry key="DjangoTestsConfigurationType">
                  <entry key="CMakeDoctestTestRunConfigurationType">
                    <value>
                      <FeaturePluginData displayName="Django tests" pluginName="Python" pluginId="Pythonid" bundled="true" />
                      <FeaturePluginData displayName="Doctest" pluginName="CLion Doctest" pluginId="org.jetbrains.plugins.clion.test.doctest" bundled="true" />
                    </value>
                  </entry>
                  <entry key="FirefoxRemoteDebugType">
                  <entry key="CMakeGoogleTestRunConfigurationType">
                    <value>
                      <FeaturePluginData displayName="Firefox Remote" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" />
                      <FeaturePluginData displayName="Google Test" pluginName="CLion Google Testing and Mocking Framework" pluginId="org.jetbrains.plugins.clion.test.google" bundled="true" />
                    </value>
                  </entry>
                  <entry key="GradleRunConfiguration">
                  <entry key="CMakeRunConfiguration">
                    <value>
                      <FeaturePluginData displayName="Gradle" pluginName="Gradle" pluginId="com.intellij.gradle" bundled="true" />
                      <FeaturePluginData displayName="CMake Application" pluginName="CLion IDE" pluginId="com.intellij.clion" bundled="true" />
                    </value>
                  </entry>
                  <entry key="GroovyScriptRunConfiguration">
                  <entry key="CTestRunConfiguration">
                    <value>
                      <FeaturePluginData displayName="Groovy" pluginName="Groovy" pluginId="org.intellij.groovy" bundled="true" />
                      <FeaturePluginData displayName="CTest Application" pluginName="CLion CTest" pluginId="org.jetbrains.plugins.clion.ctest" bundled="true" />
                    </value>
                  </entry>
                  <entry key="HttpClient.HttpRequestRunConfigurationType">
                  <entry key="CargoCommandRunConfiguration">
                    <value>
                      <FeaturePluginData displayName="HTTP Request" pluginName="HTTP Client" pluginId="com.jetbrains.restClient" bundled="true" />
                      <FeaturePluginData displayName="Cargo" pluginName="Rust" pluginId="org.rust.lang" />
                    </value>
                  </entry>
                  <entry key="JUnit">
                  <entry key="ChromiumRemoteDebugType">
                    <value>
                      <FeaturePluginData displayName="JUnit" pluginName="JUnit" pluginId="JUnit" bundled="true" />
                      <FeaturePluginData displayName="Attach to Node.js/Chrome" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" />
                    </value>
                  </entry>
                  <entry key="JarApplication">
                  <entry key="CompoundRunConfigurationType">
                    <value>
                      <FeaturePluginData displayName="JAR Application" pluginName="Java" pluginId="com.intellij.java" bundled="true" />
                      <FeaturePluginData displayName="Compound" pluginName="IDEA CORE" pluginId="com.intellij" bundled="true" />
                    </value>
                  </entry>
                  <entry key="Java Scratch">
                  <entry key="DatabaseScript">
                    <value>
                      <FeaturePluginData displayName="Java Scratch" pluginName="Java" pluginId="com.intellij.java" bundled="true" />
                      <FeaturePluginData displayName="Database Script" pluginName="Database Tools and SQL" pluginId="com.intellij.database" bundled="true" />
                    </value>
                  </entry>
                  <entry key="JavaScriptTestRunnerJest">
                  <entry key="DjangoTestsConfigurationType">
                    <value>
                      <FeaturePluginData displayName="Jest" pluginName="JavaScript and TypeScript" pluginId="JavaScript" bundled="true" />
                      <FeaturePluginData displayName="Django tests" pluginName="Python" pluginId="Pythonid" bundled="true" />
                    </value>
                  </entry>
                  <entry key="JavaScriptTestRunnerProtractor">
                  <entry key="FirefoxRemoteDebugType">
                    <value>
                      <FeaturePluginData displayName="Protractor" pluginName="JavaScript and TypeScript" pluginId="JavaScript" bundled="true" />
                      <FeaturePluginData displayName="Firefox Remote" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" />
                    </value>
                  </entry>
                  <entry key="JavascriptDebugType">
                  <entry key="GradleAppRunConfiguration">
                    <value>
                      <FeaturePluginData displayName="JavaScript Debug" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" />
                      <FeaturePluginData displayName="Gradle Native Application" pluginName="com.intellij.clion-gradle" pluginId="com.intellij.clion-gradle" bundled="true" />
                    </value>
                  </entry>
                  <entry key="JetRunConfigurationType">
                  <entry key="GradleRunConfiguration">
                    <value>
                      <FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
                      <FeaturePluginData displayName="Gradle" pluginName="Gradle" pluginId="com.intellij.gradle" bundled="true" />
                    </value>
                  </entry>
                  <entry key="KotlinStandaloneScriptRunConfigurationType">
                  <entry key="HttpClient.HttpRequestRunConfigurationType">
                    <value>
                      <FeaturePluginData displayName="Kotlin script" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
                      <FeaturePluginData displayName="HTTP Request" pluginName="HTTP Client" pluginId="com.jetbrains.restClient" bundled="true" />
                    </value>
                  </entry>
                  <entry key="MAKEFILE_TARGET_RUN_CONFIGURATION">
                  <entry key="JavaScriptTestRunnerJest">
                    <value>
                      <FeaturePluginData displayName="Makefile Target" pluginName="Makefile Language" pluginId="name.kropp.intellij.makefile" />
                      <FeaturePluginData displayName="Jest" pluginName="JavaScript and TypeScript" pluginId="JavaScript" bundled="true" />
                    </value>
                  </entry>
                  <entry key="MUnitRunConfiguration">
                  <entry key="JavaScriptTestRunnerProtractor">
                    <value>
                      <FeaturePluginData displayName="MUnit" pluginName="Scala" pluginId="org.intellij.scala" />
                      <FeaturePluginData displayName="Protractor" pluginName="JavaScript and TypeScript" pluginId="JavaScript" bundled="true" />
                    </value>
                  </entry>
                  <entry key="MavenRunConfiguration">
                  <entry key="JavascriptDebugType">
                    <value>
                      <FeaturePluginData displayName="Maven" pluginName="Maven" pluginId="org.jetbrains.idea.maven" bundled="true" />
                      <FeaturePluginData displayName="JavaScript Debug" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" />
                    </value>
                  </entry>
                  <entry key="NodeWebKit">
                  <entry key="MAKEFILE_TARGET_RUN_CONFIGURATION">
                    <value>
                      <FeaturePluginData displayName="NW.js" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" />
                      <FeaturePluginData displayName="Makefile Target" pluginName="Makefile Language" pluginId="name.kropp.intellij.makefile" bundled="true" />
                    </value>
                  </entry>
                  <entry key="Play2FrameworkRunConfigurations">
                  <entry key="NodeWebKit">
                    <value>
                      <FeaturePluginData displayName="Play 2 App" pluginName="org.intellij.scala" pluginId="org.intellij.scala" />
                      <FeaturePluginData displayName="NW.js" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" />
                    </value>
                  </entry>
                  <entry key="PyBehaveRunConfigurationType">


@@ 159,7 159,7 @@
                  </entry>
                  <entry key="PythonConfigurationType">
                    <value>
                      <FeaturePluginData displayName="Python" pluginName="Python" pluginId="Pythonid" bundled="true" />
                      <FeaturePluginData displayName="Python" pluginName="Python Community Edition" pluginId="PythonCore" bundled="true" />
                    </value>
                  </entry>
                  <entry key="ReactNative">


@@ 167,59 167,54 @@
                      <FeaturePluginData displayName="React Native" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" />
                    </value>
                  </entry>
                  <entry key="Remote">
                    <value>
                      <FeaturePluginData displayName="Remote JVM Debug" pluginName="Java" pluginId="com.intellij.java" bundled="true" />
                    </value>
                  </entry>
                  <entry key="SbtRunConfiguration">
                  <entry key="ShConfigurationType">
                    <value>
                      <FeaturePluginData displayName="sbt Task" pluginName="Scala" pluginId="org.intellij.scala" />
                      <FeaturePluginData displayName="Shell Script" pluginName="Shell Script" pluginId="com.jetbrains.sh" bundled="true" />
                    </value>
                  </entry>
                  <entry key="ScalaAmmoniteRunConfigurationType">
                  <entry key="SwiftPackageManagerRunConfiguration">
                    <value>
                      <FeaturePluginData displayName="Ammonite" pluginName="Scala" pluginId="org.intellij.scala" />
                      <FeaturePluginData displayName="Swift Package Run" pluginName="Swift" pluginId="com.intellij.clion-swift" />
                    </value>
                  </entry>
                  <entry key="ScalaScriptConsoleRunConfiguration">
                  <entry key="SwiftPackageManagerTestRunConfiguration">
                    <value>
                      <FeaturePluginData displayName="Scala REPL" pluginName="Scala" pluginId="org.intellij.scala" />
                      <FeaturePluginData displayName="Swift Package Test" pluginName="Swift" pluginId="com.intellij.clion-swift" />
                    </value>
                  </entry>
                  <entry key="ScalaTestRunConfiguration">
                  <entry key="TSqltConfigurationType">
                    <value>
                      <FeaturePluginData displayName="ScalaTest" pluginName="Scala" pluginId="org.intellij.scala" />
                      <FeaturePluginData displayName="tSQLt Test" pluginName="Database Tools and SQL" pluginId="com.intellij.database" bundled="true" />
                    </value>
                  </entry>
                  <entry key="ShConfigurationType">
                  <entry key="Tox">
                    <value>
                      <FeaturePluginData displayName="Shell Script" pluginName="Shell Script" pluginId="com.jetbrains.sh" bundled="true" />
                      <FeaturePluginData displayName="tox" pluginName="Python Community Edition" pluginId="PythonCore" bundled="true" />
                    </value>
                  </entry>
                  <entry key="SpaceRunConfiguration">
                  <entry key="UtPlSqlConfigurationType">
                    <value>
                      <FeaturePluginData displayName="Space Task" pluginName="Space" pluginId="com.jetbrains.space" bundled="true" />
                      <FeaturePluginData displayName="utPLSQL Test" pluginName="Database Tools and SQL" pluginId="com.intellij.database" bundled="true" />
                    </value>
                  </entry>
                  <entry key="Specs2RunConfiguration">
                  <entry key="WasmPackCommandRunConfiguration">
                    <value>
                      <FeaturePluginData displayName="Specs2" pluginName="Scala" pluginId="org.intellij.scala" />
                      <FeaturePluginData displayName="wasm-pack" pluginName="Rust" pluginId="org.rust.lang" />
                    </value>
                  </entry>
                  <entry key="TSqltConfigurationType">
                  <entry key="com.jetbrains.cidr.embedded.customgdbserver.type">
                    <value>
                      <FeaturePluginData displayName="tSQLt Test" pluginName="Database Tools and SQL" pluginId="com.intellij.database" bundled="true" />
                      <FeaturePluginData displayName="Embedded GDB Server" pluginName="com.intellij.clion.embedded" pluginId="com.intellij.clion.embedded" bundled="true" />
                    </value>
                  </entry>
                  <entry key="Tox">
                  <entry key="com.jetbrains.cidr.embedded.openocd.conf.type">
                    <value>
                      <FeaturePluginData displayName="tox" pluginName="Python" pluginId="Pythonid" bundled="true" />
                      <FeaturePluginData displayName="OpenOCD Download &amp; Run" pluginName="com.intellij.clion.embedded" pluginId="com.intellij.clion.embedded" bundled="true" />
                    </value>
                  </entry>
                  <entry key="UtPlSqlConfigurationType">
                  <entry key="com.jetbrains.cidr.remote.gdbserver.type">
                    <value>
                      <FeaturePluginData displayName="utPLSQL Test" pluginName="Database Tools and SQL" pluginId="com.intellij.database" bundled="true" />
                      <FeaturePluginData displayName="Remote GDB Server" pluginName="CLion IDE" pluginId="com.intellij.clion" bundled="true" />
                    </value>
                  </entry>
                  <entry key="docker-deploy">


@@ 249,12 244,7 @@
                  </entry>
                  <entry key="tests">
                    <value>
                      <FeaturePluginData displayName="Python tests" pluginName="Python" pluginId="Pythonid" bundled="true" />
                    </value>
                  </entry>
                  <entry key="uTestRunConfiguration">
                    <value>
                      <FeaturePluginData displayName="utest" pluginName="Scala" pluginId="org.intellij.scala" />
                      <FeaturePluginData displayName="Python tests" pluginName="Python Community Edition" pluginId="PythonCore" bundled="true" />
                    </value>
                  </entry>
                </map>


@@ 267,9 257,14 @@
            <FeaturePluginsList>
              <option name="featureMap">
                <map>
                  <entry key="Python">
                    <value>
                      <FeaturePluginData displayName="Python" pluginName="PythonCore" pluginId="PythonCore" bundled="true" />
                    </value>
                  </entry>
                  <entry key="buildout-python">
                    <value>
                      <FeaturePluginData displayName="Buildout Support" pluginName="Python" pluginId="Pythonid" bundled="true" />
                      <FeaturePluginData displayName="Buildout Support" pluginName="Python Community Edition" pluginId="PythonCore" bundled="true" />
                    </value>
                  </entry>
                  <entry key="django">


@@ 282,51 277,6 @@
                      <FeaturePluginData displayName="Google App Engine (Python)" pluginName="Pythonid" pluginId="Pythonid" bundled="true" />
                    </value>
                  </entry>
                  <entry key="kotlin-language">
                    <value>
                      <FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
                    </value>
                  </entry>
                  <entry key="minecraft">
                    <value>
                      <FeaturePluginData displayName="Minecraft" pluginName="Minecraft Development" pluginId="com.demonwav.minecraft-dev" />
                    </value>
                  </entry>
                </map>
              </option>
            </FeaturePluginsList>
          </value>
        </entry>
        <entry key="com.intellij.packaging.artifacts.ArtifactType">
          <value>
            <FeaturePluginsList>
              <option name="featureMap">
                <map>
                  <entry key="jar">
                    <value>
                      <FeaturePluginData displayName="JAR" pluginName="Java" pluginId="com.intellij.java" bundled="true" />
                    </value>
                  </entry>
                  <entry key="javafx">
                    <value>
                      <FeaturePluginData displayName="JavaFx application" pluginName="JavaFX" pluginId="org.jetbrains.plugins.javaFX" bundled="true" />
                    </value>
                  </entry>
                  <entry key="javafx-preloader">
                    <value>
                      <FeaturePluginData displayName="JavaFx preloader" pluginName="JavaFX" pluginId="org.jetbrains.plugins.javaFX" bundled="true" />
                    </value>
                  </entry>
                  <entry key="jpackage">
                    <value>
                      <FeaturePluginData displayName="Platform specific package" pluginName="JavaFX" pluginId="org.jetbrains.plugins.javaFX" bundled="true" />
                    </value>
                  </entry>
                  <entry key="plain">
                    <value>
                      <FeaturePluginData displayName="Other" pluginName="Java" pluginId="com.intellij.java" bundled="true" />
                    </value>
                  </entry>
                </map>
              </option>
            </FeaturePluginsList>