IU-2020.2 <aiko@Lindas-MacBook-Pro.local Merge branch 'master'

Conflicts:
	databaseDrivers.xml
	filetypes.xml

databaseDrivers.xml

@@ -1,61 +1,48 @@
 <application>
-  <component name="LocalDatabaseDriverManager" version="163">
+  <component name="LocalDatabaseDriverManager" version="201">
     <driver id="cassandra">
-      <artifact name="Cassandra" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="clickhouse">
-      <artifact name="ClickHouse" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="db2">
-      <artifact name="DB2" use="true" />
       <option name="auto-sync" value="false" />
     </driver>
     <driver id="db2.jtopen">
-      <artifact name="JTOpen (DB2 iSeries)" use="true" />
       <option name="auto-sync" value="false" />
     </driver>
     <driver id="derby.embedded">
-      <artifact name="Apache Derby" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="derby.remote">
-      <artifact name="Apache Derby" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="exasol">
-      <artifact name="Exasol" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="greenplum">
-      <artifact name="PostgreSQL" use="true" />
       <option name="auto-sync" value="true" />
       <option name="schema-control" value="MANUAL" />
       <option name="send-app-info" value="false" />
     </driver>
     <driver id="h2.unified">
-      <artifact name="H2" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="hive">
-      <artifact name="Hive" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="hsqldb.local">
-      <artifact name="HSQLDB" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="hsqldb.remote">
-      <artifact name="HSQLDB" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="mariadb">
-      <artifact name="MariaDB Connector J" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="mongo">
-      <artifact name="MongoDB" use="true" version="1.7.2" />
+      <artifact id="MongoDB" name="MongoDB" use="true" version="1.7.2" />
       <option name="auto-sync" value="true" />
       <option name="auto-commit" value="true" />
       <option name="format-sources-on-sync" value="true" />
@@ -64,34 +51,32 @@
       <option name="schema-control" value="AUTOMATIC" />
     </driver>
     <driver id="sqlserver.ms">
-      <artifact name="SQL Server" use="true" />
       <option name="auto-sync" value="true" />
       <option name="send-app-info" value="false" />
     </driver>
     <driver id="sqlserver.jtds">
-      <artifact name="jTDS (SQL Server and Sybase)" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="azure.ms">
-      <artifact name="SQL Server" use="true" />
       <option name="auto-sync" value="true" />
       <option name="send-app-info" value="false" />
     </driver>
     <driver id="mysql.8">
-      <artifact name="MySQL Connector/J 8" use="true" />
+      <artifact id="MySQL Connector/J 8" name="MySQL Connector/J 8" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="mysql">
-      <artifact name="MySQL Connector/J" use="true" />
+      <option name="auto-sync" value="true" />
+    </driver>
+    <driver id="mysql_aurora">
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="oracle">
-      <artifact name="Oracle" use="true" />
       <option name="auto-sync" value="true" />
       <option name="auto-commit" value="false" />
     </driver>
     <driver id="postgresql">
-      <artifact name="PostgreSQL" use="true" version="42.2.5" />
+      <artifact id="PostgreSQL" name="PostgreSQL" use="true" version="42.2.5" />
       <option name="auto-sync" value="true" />
       <option name="schema-control" value="MANUAL" />
       <option name="auto-commit" value="true" />
@@ -100,16 +85,14 @@
       <option name="source-loading" value="USER_SOURCES" />
     </driver>
     <driver id="redshift">
-      <artifact name="Redshift" use="true" />
       <option name="auto-sync" value="true" />
       <option name="schema-control" value="MANUAL" />
     </driver>
     <driver id="snowflake">
-      <artifact name="Snowflake" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="sqlite.xerial">
-      <artifact name="Xerial SQLiteJDBC" use="true" version="3.25.1" />
+      <artifact id="Xerial SQLiteJDBC" name="Xerial SQLiteJDBC" use="true" version="3.25.1" />
       <option name="auto-sync" value="true" />
       <option name="auto-commit" value="true" />
       <option name="format-sources-on-sync" value="true" />
@@ -118,14 +101,12 @@
       <option name="schema-control" value="AUTOMATIC" />
     </driver>
     <driver id="sybase.jtds">
-      <artifact name="jTDS (SQL Server and Sybase)" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="sybase.ase">
       <option name="auto-sync" value="true" />
     </driver>
     <driver id="vertica">
-      <artifact name="Vertica" use="true" />
       <option name="auto-sync" value="true" />
     </driver>
   </component>

filetypes.xml

@@ -6,6 +6,7 @@
       <removed_mapping ext="log" approved="true" type="PLAIN_TEXT" />
       <removed_mapping ext="cmd" approved="true" type="PLAIN_TEXT" />
       <mapping pattern="setenv*" type="Shell Script" />
+      <mapping pattern="elixir" type="Shell Script" />
       <removed_mapping ext="bat" approved="true" type="PLAIN_TEXT" />
       <removed_mapping ext="log" approved="true" type="PLAIN_TEXT" />
       <removed_mapping ext="dockerfile" approved="true" type="textmate" />
@@ -13,8 +14,6 @@
       <removed_mapping pattern="setenv" approved="true" type="JSHELL" />
       <removed_mapping ext="cmd" approved="true" type="PLAIN_TEXT" />
       <removed_mapping ext="snakefile" approved="true" type="textmate" />
-      <mapping pattern="elixir" type="Bash" />
-      <mapping pattern="setenv" type="Bash" />
     </extensionMap>
   </component>
 </application>

templates.xml

@@ -0,0 +1,124 @@
+<application>
+  <component name="TemplateSettings">
+    <option name="deletedKeys">
+      <list>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_if" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_elif" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_select" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_case" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_for" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_while" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_until" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_function" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_string equal" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_string not equal" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_string is empty" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_string not empty" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_number equal" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_number not equal" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_number less" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_number less or equal" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_number greater" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_number greater or equal" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_file exists" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_file not empty" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_file readable" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_file writable" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_file executable" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_file equals" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_file newer" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_file older" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_path exists" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_directory exists" />
+        </TemplateKey>
+        <TemplateKey>
+          <option name="groupName" value="Shell Script Hidden" />
+          <option name="key" value="shell_command exists" />
+        </TemplateKey>
+      </list>
+    </option>
+  </component>
+</application>

templates/Elixir.xml

@@ -0,0 +1,23 @@
+<templateSet group="Elixir">
+  <template name="defml" value="defmodule LiveViewStudioWeb.$MODULENAME$ do&#10;  use LiveViewStudioWeb, :live_view&#10;  $END$&#10;end&#10;" description="def module LiveView" toReformat="false" toShortenFQNames="true">
+    <variable name="MODULENAME" expression="" defaultValue="" alwaysStopAt="true" />
+    <context>
+      <option name="ELIXIR_CODE" value="true" />
+    </context>
+  </template>
+  <template name="mount" value="def mount(_params, _session, socket) do&#10;  $END$&#10;  {:ok, socket}&#10;end" description="def mount(_params, _session, socket) do" toReformat="false" toShortenFQNames="true">
+    <context>
+      <option name="ELIXIR_CODE" value="true" />
+    </context>
+  </template>
+  <template name="handlee" value="def handle_event(&quot;$END$&quot;, _, socket) do&#10;  socket = assign(socket, key:, value)&#10;  {:noreply, socket}&#10;end" description="def handle_event(&quot;$END$&quot;, _, socket) do" toReformat="false" toShortenFQNames="true">
+    <context>
+      <option name="ELIXIR_CODE" value="true" />
+    </context>
+  </template>
+  <template name="handlei" value="def handle_info(:$END$, socket) do&#10;  socket = assign(&#10;    socket, &#10;    key: value&#10;  )&#10;  {:noreply, socket}&#10;end" description="def handle_info(&quot;$END$&quot;, _, socket) do" toReformat="false" toShortenFQNames="true">
+    <context>
+      <option name="ELIXIR_CODE" value="true" />
+    </context>
+  </template>
+</templateSet>