RD-2021.3.3 <rodude123@rodude123s-x360 Merge branch 'master'

Conflicts:
	nodejs.xml

csv-plugin.xml

@@ -1,6 +1,6 @@
 <application>
   <component name="CsvEditorSettings">
-    <option name="CURRENT_PLUGIN_VERSION" value="2.18.1" />
+    <option name="CURRENT_PLUGIN_VERSION" value="2.18.2" />
     <option name="USE_SOFT_WRAP" value="true" />
   </component>
 </application>

filetypes.xml

@@ -4,10 +4,10 @@
     <extensionMap>
       <mapping pattern="ArtifactDB" type="AUTO_DETECTED" />
       <mapping ext="mat" type="AUTO_DETECTED" />
+      <mapping ext=".tabnine.model" type="Tabnine project model file" />
       <mapping ext=".tabnine" type="Tabnine project model file" />
       <mapping ext=".model" type="Tabnine project model file" />
       <mapping ext="tabnine" type="Tabnine project model file" />
-      <mapping ext=".tabnine.model" type="Tabnine project model file" />
       <mapping ext="model" type="Tabnine project model file" />
       <removed_mapping ext="csv" approved="true" type="CSV" />
       <removed_mapping ext="ignore" approved="true" type="IgnoreLang file" />

grazie_global.xml

@@ -5,6 +5,7 @@
         <option name="suppressed">
           <set>
             <option value="or" />
+            <option value="Coca Cola" />
           </set>
         </option>
       </SuppressingContext>