Conflicts: material_theme.xml pluginAdvertiser.xmlmaster
@@ -0,0 +1,5 @@ | |||||
<application> | |||||
<component name="LafManager" autodetect="false"> | |||||
<laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" themeId="CUSTOM" /> | |||||
</component> | |||||
</application> |
@@ -0,0 +1,5 @@ | |||||
<application> | |||||
<component name="KeymapManager"> | |||||
<active_keymap name="Windows Proper Redo" /> | |||||
</component> | |||||
</application> |
@@ -4,7 +4,7 @@ | |||||
<property name="created">2021-05-17T09:10:15</property> | <property name="created">2021-05-17T09:10:15</property> | ||||
<property name="ide">WebStorm</property> | <property name="ide">WebStorm</property> | ||||
<property name="ideVersion">2021.1.1.0.0</property> | <property name="ideVersion">2021.1.1.0.0</property> | ||||
<property name="modified">2021-05-17T09:28:40</property> | |||||
<property name="modified">2021-05-22T08:53:26</property> | |||||
<property name="originalScheme">Temoto-kun copy</property> | <property name="originalScheme">Temoto-kun copy</property> | ||||
</metaInfo> | </metaInfo> | ||||
<console-font> | <console-font> | ||||
@@ -860,105 +860,21 @@ | |||||
<option name="FONT_TYPE" value="1" /> | <option name="FONT_TYPE" value="1" /> | ||||
</value> | </value> | ||||
</option> | </option> | ||||
<option name="PY.BRACES"> | |||||
<value> | |||||
<option name="FOREGROUND" value="d8f69c" /> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.BRACKETS"> | |||||
<value> | |||||
<option name="FOREGROUND" value="ffffff" /> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.BUILTIN_NAME"> | |||||
<value> | |||||
<option name="FOREGROUND" value="cccc" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.CLASS_DEFINITION"> | |||||
<value> | |||||
<option name="FOREGROUND" value="ffffff" /> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.DECORATOR"> | |||||
<value> | |||||
<option name="FOREGROUND" value="6699ff" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.DOC_COMMENT"> | |||||
<value> | |||||
<option name="FOREGROUND" value="d2c200" /> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.FUNC_DEFINITION"> | |||||
<value> | |||||
<option name="FOREGROUND" value="ffffff" /> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.KEYWORD"> | |||||
<value> | |||||
<option name="FOREGROUND" value="cc9900" /> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.LINE_COMMENT"> | |||||
<value> | |||||
<option name="FOREGROUND" value="ff6666" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.OPERATION_SIGN"> | |||||
<value> | |||||
<option name="FOREGROUND" value="ffffff" /> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.PARENTHS"> | |||||
<value> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.PREDEFINED_DEFINITION"> | |||||
<value> | |||||
<option name="FOREGROUND" value="83d6f1" /> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.BUILTIN_NAME" baseAttributes="DEFAULT_PREDEFINED_SYMBOL" /> | |||||
<option name="PY.CLASS_DEFINITION" baseAttributes="DEFAULT_CLASS_NAME" /> | |||||
<option name="PY.DECORATOR" baseAttributes="DEFAULT_IDENTIFIER" /> | |||||
<option name="PY.FUNC_DEFINITION" baseAttributes="DEFAULT_FUNCTION_DECLARATION" /> | |||||
<option name="PY.KEYWORD_ARGUMENT" baseAttributes="DEFAULT_PARAMETER" /> | |||||
<option name="PY.PREDEFINED_DEFINITION" baseAttributes="DEFAULT_PREDEFINED_SYMBOL" /> | |||||
<option name="PY.PREDEFINED_NAME"> | <option name="PY.PREDEFINED_NAME"> | ||||
<value> | <value> | ||||
<option name="FOREGROUND" value="33ccff" /> | <option name="FOREGROUND" value="33ccff" /> | ||||
<option name="FONT_TYPE" value="1" /> | <option name="FONT_TYPE" value="1" /> | ||||
</value> | </value> | ||||
</option> | </option> | ||||
<option name="PY.PREDEFINED_USAGE"> | |||||
<value> | |||||
<option name="FOREGROUND" value="bbb06a" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.STRING.B"> | |||||
<value> | |||||
<option name="FOREGROUND" value="85cd00" /> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.STRING.U"> | |||||
<value> | |||||
<option name="FOREGROUND" value="b580" /> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.VALID_STRING_ESCAPE"> | |||||
<value> | |||||
<option name="FOREGROUND" value="ff00" /> | |||||
<option name="FONT_TYPE" value="1" /> | |||||
<option name="EFFECT_COLOR" value="ff00" /> | |||||
<option name="EFFECT_TYPE" value="1" /> | |||||
</value> | |||||
</option> | |||||
<option name="PY.PREDEFINED_USAGE" baseAttributes="DEFAULT_PREDEFINED_SYMBOL" /> | |||||
<option name="PY.SELF_PARAMETER" baseAttributes="DEFAULT_PARAMETER" /> | |||||
<option name="PY.STRING.U" baseAttributes="DEFAULT_STRING" /> | |||||
<option name="REASSIGNED_LOCAL_VARIABLE_ATTRIBUTES"> | <option name="REASSIGNED_LOCAL_VARIABLE_ATTRIBUTES"> | ||||
<value> | <value> | ||||
<option name="EFFECT_COLOR" value="9bc28e" /> | <option name="EFFECT_COLOR" value="9bc28e" /> | ||||
@@ -5,6 +5,8 @@ | |||||
<component name="DefaultFont"> | <component name="DefaultFont"> | ||||
<option name="FONT_SIZE" value="12" /> | <option name="FONT_SIZE" value="12" /> | ||||
<option name="FONT_FAMILY" value="mononoki" /> | <option name="FONT_FAMILY" value="mononoki" /> | ||||
<option name="FONT_REGULAR_SUB_FAMILY" value="Regular" /> | |||||
<option name="FONT_BOLD_SUB_FAMILY" value="Bold" /> | |||||
<option name="LINE_SPACING" value="0.9" /> | <option name="LINE_SPACING" value="0.9" /> | ||||
</component> | </component> | ||||
<component name="EditorSettings"> | <component name="EditorSettings"> | ||||
@@ -47,7 +49,7 @@ | |||||
<option value="TypeScript.ts.type.hints" /> | <option value="TypeScript.ts.type.hints" /> | ||||
</set> | </set> | ||||
</option> | </option> | ||||
<option name="lastViewedProviderKeyId" value="microservices.url.path.inlay.hints" /> | |||||
<option name="lastViewedProviderKeyId" value="parameter.hints.old" /> | |||||
<settingsMapElement> | <settingsMapElement> | ||||
<TypeScript.ts.type.hints> | <TypeScript.ts.type.hints> | ||||
<Settings> | <Settings> | ||||
@@ -27,6 +27,7 @@ | |||||
<entry key="mac.editor.thumb.darcula.fill.max" value="163" /> | <entry key="mac.editor.thumb.darcula.fill.max" value="163" /> | ||||
<entry key="ide.tree.ui.experimental" value="false" /> | <entry key="ide.tree.ui.experimental" value="false" /> | ||||
<entry key="ide.mac.allowDarkWindowDecorations" value="true" /> | <entry key="ide.mac.allowDarkWindowDecorations" value="true" /> | ||||
<entry key="ide.new.stripes.ui" value="true" /> | |||||
</component> | </component> | ||||
<component name="StatusBar"> | <component name="StatusBar"> | ||||
<option name="widgets"> | <option name="widgets"> | ||||
@@ -0,0 +1,8 @@ | |||||
<keymap version="1" name="Windows Proper Redo" parent="$default"> | |||||
<action id="$Redo"> | |||||
<keyboard-shortcut first-keystroke="shift ctrl z" /> | |||||
<keyboard-shortcut first-keystroke="shift alt back_space" /> | |||||
<keyboard-shortcut first-keystroke="ctrl y" /> | |||||
</action> | |||||
<action id="EditorDeleteLine" /> | |||||
</keymap> |
@@ -9,10 +9,13 @@ | |||||
<option name="indicatorStyle" value="None" /> | <option name="indicatorStyle" value="None" /> | ||||
<option name="customSidebarHeight" value="24" /> | <option name="customSidebarHeight" value="24" /> | ||||
<option name="leftTreeIndent" value="10" /> | <option name="leftTreeIndent" value="10" /> | ||||
<option name="settingsSelectedTab" value="5" /> | |||||
<option name="tabsHeight" value="16" /> | <option name="tabsHeight" value="16" /> | ||||
<option name="accentColor" value="eeca3f" /> | <option name="accentColor" value="eeca3f" /> | ||||
<option name="selectedTheme" value="CUSTOM" /> | <option name="selectedTheme" value="CUSTOM" /> | ||||
<option name="userId" value="7a11f371:1686d9b67db:-8000" /> | <option name="userId" value="7a11f371:1686d9b67db:-8000" /> | ||||
<option name="version" value="5.5.0" /> | |||||
<option name="version" value="6.5.0.1" /> | |||||
<option name="stripedToolWindowsEnabled" value="true" /> | |||||
<option name="showWhatsNew" value="false" /> | |||||
</component> | </component> | ||||
</application> | </application> |
@@ -1731,6 +1731,191 @@ | |||||
<FeaturePluginsList> | <FeaturePluginsList> | ||||
<option name="featureMap"> | <option name="featureMap"> | ||||
<map> | <map> | ||||
<entry key="ChromiumRemoteDebugType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Attach to Node.js/Chrome" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="CompoundRunConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Compound" pluginName="IDEA CORE" pluginId="com.intellij" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="DatabaseScript"> | |||||
<value> | |||||
<FeaturePluginData displayName="Database Script" pluginName="Database Tools and SQL for WebStorm" pluginId="com.intellij.database" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="ErlangApplicationRunConfiguration"> | |||||
<value> | |||||
<FeaturePluginData displayName="Erlang Application" pluginName="Erlang" pluginId="org.jetbrains.erlang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="ErlangConsoleRunConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Erlang Console" pluginName="Erlang" pluginId="org.jetbrains.erlang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="ErlangRemoteDebugRunConfiguration"> | |||||
<value> | |||||
<FeaturePluginData displayName="Erlang Remote Node" pluginName="Erlang" pluginId="org.jetbrains.erlang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="ErlangUnitRunConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Erlang Eunit" pluginName="Erlang" pluginId="org.jetbrains.erlang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="FirefoxRemoteDebugType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Firefox Remote" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="HttpClient.HttpRequestRunConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="HTTP Request" pluginName="HTTP Client" pluginId="com.jetbrains.restClient" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="JavaScriptNodeJsTraceType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Spy-js for Node.js" pluginName="Spy-js" pluginId="spy-js" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="JavaScriptTestRunnerJest"> | |||||
<value> | |||||
<FeaturePluginData displayName="Jest" pluginName="JavaScript and TypeScript" pluginId="JavaScript" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="JavaScriptTestRunnerKarma"> | |||||
<value> | |||||
<FeaturePluginData displayName="Karma" pluginName="Karma" pluginId="Karma" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="JavaScriptTestRunnerProtractor"> | |||||
<value> | |||||
<FeaturePluginData displayName="Protractor" pluginName="JavaScript and TypeScript" pluginId="JavaScript" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="JavaScriptTraceType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Spy-js" pluginName="Spy-js" pluginId="spy-js" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="JavascriptDebugType"> | |||||
<value> | |||||
<FeaturePluginData displayName="JavaScript Debug" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="MAKEFILE_TARGET_RUN_CONFIGURATION"> | |||||
<value> | |||||
<FeaturePluginData displayName="Makefile Target" pluginName="Makefile Language" pluginId="name.kropp.intellij.makefile" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="MixESpecRunConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Elixir Mix ESpec" pluginName="Elixir" pluginId="org.elixir_lang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="MixExUnitRunConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Elixir Mix ExUnit" pluginName="Elixir" pluginId="org.elixir_lang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="MixRunConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Elixir Mix" pluginName="Elixir" pluginId="org.elixir_lang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="NodeJSConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Node.js" pluginName="Node.js" pluginId="NodeJS" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="NodeWebKit"> | |||||
<value> | |||||
<FeaturePluginData displayName="NW.js" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="NodeunitConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Nodeunit" pluginName="Node.js" pluginId="NodeJS" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="ReactNative"> | |||||
<value> | |||||
<FeaturePluginData displayName="React Native" pluginName="JavaScript Debugger" pluginId="JavaScriptDebugger" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="RebarEunitRunConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Erlang Rebar Eunit" pluginName="Erlang" pluginId="org.jetbrains.erlang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="RebarRunConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Erlang Rebar" pluginName="Erlang" pluginId="org.jetbrains.erlang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="ShConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Shell Script" pluginName="Shell Script" pluginId="com.jetbrains.sh" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="TSqltConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="tSQLt Test" pluginName="Database Tools and SQL for WebStorm" pluginId="com.intellij.database" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="UtPlSqlConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="utPLSQL Test" pluginName="Database Tools and SQL for WebStorm" pluginId="com.intellij.database" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="docker-deploy"> | |||||
<value> | |||||
<FeaturePluginData displayName="Docker" pluginName="IDEA CORE" pluginId="com.intellij" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="js.build_tools.grunt"> | |||||
<value> | |||||
<FeaturePluginData displayName="Grunt.js" pluginName="JavaScript and TypeScript" pluginId="JavaScript" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="js.build_tools.gulp"> | |||||
<value> | |||||
<FeaturePluginData displayName="Gulp.js" pluginName="JavaScript and TypeScript" pluginId="JavaScript" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="js.build_tools.npm"> | |||||
<value> | |||||
<FeaturePluginData displayName="npm" pluginName="JavaScript and TypeScript" pluginId="JavaScript" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="mocha-javascript-test-runner"> | |||||
<value> | |||||
<FeaturePluginData displayName="Mocha" pluginName="Node.js" pluginId="NodeJS" bundled="true" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="org.elixir_lang.distillery.configuration.Type"> | |||||
<value> | |||||
<FeaturePluginData displayName="Distillery Release CLI" pluginName="Elixir" pluginId="org.elixir_lang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="org.elixir_lang.elixir.configuration.ConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="Elixir" pluginName="Elixir" pluginId="org.elixir_lang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="org.elixir_lang.iex.configuration.ConfigurationType"> | |||||
<value> | |||||
<FeaturePluginData displayName="IEx" pluginName="Elixir" pluginId="org.elixir_lang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="org.elixir_lang.iex.mix.configuration.Type"> | |||||
<value> | |||||
<FeaturePluginData displayName="IEx Mix" pluginName="Elixir" pluginId="org.elixir_lang" /> | |||||
</value> | |||||
</entry> | |||||
<entry key="CLionExternalRunConfiguration"> | <entry key="CLionExternalRunConfiguration"> | ||||
<value> | <value> | ||||
<FeaturePluginData displayName="Custom Build Application" pluginName="CLion IDE" pluginId="com.intellij.clion" /> | <FeaturePluginData displayName="Custom Build Application" pluginName="CLion IDE" pluginId="com.intellij.clion" /> | ||||
@@ -1911,6 +2096,11 @@ | |||||
<FeaturePluginData displayName="Buildout Support" pluginName="Python Community Edition" pluginId="PythonCore" /> | <FeaturePluginData displayName="Buildout Support" pluginName="Python Community Edition" pluginId="PythonCore" /> | ||||
</value> | </value> | ||||
</entry> | </entry> | ||||
<entry key="Elixir"> | |||||
<value> | |||||
<FeaturePluginData displayName="Elixir" pluginName="Elixir" pluginId="org.elixir_lang" /> | |||||
</value> | |||||
</entry> | |||||
</map> | </map> | ||||
</option> | </option> | ||||
</FeaturePluginsList> | </FeaturePluginsList> | ||||