WS-2021.1 <martin@Stolas Merge branch 'master'

This commit is contained in:
Martin Donnelly 2021-04-16 21:24:44 +01:00
commit a93c897fb4
5 changed files with 31 additions and 4 deletions

View File

@ -4,17 +4,17 @@
<property name="created">2020-02-15T17:42:07</property> <property name="created">2020-02-15T17:42:07</property>
<property name="ide">WebStorm</property> <property name="ide">WebStorm</property>
<property name="ideVersion">2019.3.2.0.0</property> <property name="ideVersion">2019.3.2.0.0</property>
<property name="modified">2021-02-18T15:31:52</property> <property name="modified">2021-04-07T10:17:49</property>
<property name="originalScheme">Monokai copy</property> <property name="originalScheme">Monokai copy</property>
</metaInfo> </metaInfo>
<option name="LINE_SPACING" value="1.0" /> <option name="LINE_SPACING" value="1.0" />
<font> <font>
<option name="EDITOR_FONT_NAME" value="Fira Code" /> <option name="EDITOR_FONT_NAME" value="Fira Code" />
<option name="EDITOR_FONT_SIZE" value="14" /> <option name="EDITOR_FONT_SIZE" value="16" />
</font> </font>
<font> <font>
<option name="EDITOR_FONT_NAME" value="Fira Code Light" /> <option name="EDITOR_FONT_NAME" value="Fira Code Light" />
<option name="EDITOR_FONT_SIZE" value="12" /> <option name="EDITOR_FONT_SIZE" value="14" />
</font> </font>
<option name="EDITOR_LIGATURES" value="true" /> <option name="EDITOR_LIGATURES" value="true" />
<console-font> <console-font>

9
duplicatesDetector.xml Normal file
View File

@ -0,0 +1,9 @@
<application>
<component name="DuplicatesDetector">
<entry key="JavaScript">
<language>
<option name="anonymizeFunctions" value="true" />
</language>
</entry>
</component>
</application>

View File

@ -2,6 +2,8 @@
<component name="DefaultFont"> <component name="DefaultFont">
<option name="FONT_SIZE" value="15" /> <option name="FONT_SIZE" value="15" />
<option name="FONT_FAMILY" value="Fira Code" /> <option name="FONT_FAMILY" value="Fira Code" />
<option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
<option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
</component> </component>
<component name="EditorSettings"> <component name="EditorSettings">
<option name="STRIP_TRAILING_SPACES" value="Whole" /> <option name="STRIP_TRAILING_SPACES" value="Whole" />
@ -9,6 +11,20 @@
</component> </component>
<component name="InlayHintsSettings"> <component name="InlayHintsSettings">
<option name="lastViewedProviderKeyId" value="parameter.hints.old" /> <option name="lastViewedProviderKeyId" value="parameter.hints.old" />
<settingsMapElement>
<JavaScript.js.type.hints>
<Settings>
<option name="showForFunctions" value="true" />
<option name="showForVariablesAndFields" value="true" />
</Settings>
</JavaScript.js.type.hints>
<TypeScript.ts.type.hints>
<Settings>
<option name="showForFunctions" value="true" />
<option name="showForShorthandFunctions" value="true" />
</Settings>
</TypeScript.ts.type.hints>
</settingsMapElement>
</component> </component>
<component name="TodoConfiguration"> <component name="TodoConfiguration">
<pattern pattern="\btodo\b.*" /> <pattern pattern="\btodo\b.*" />

View File

@ -7,13 +7,13 @@
<mapping ext="jst" type="EJS" /> <mapping ext="jst" type="EJS" />
<mapping pattern="wordlist.json" type="JSON" /> <mapping pattern="wordlist.json" type="JSON" />
<mapping pattern=".eslintrc.json.orig" type="PLAIN_TEXT" /> <mapping pattern=".eslintrc.json.orig" type="PLAIN_TEXT" />
<mapping pattern=".env" type="PLAIN_TEXT" />
<mapping ext="bak" type="PLAIN_TEXT" /> <mapping ext="bak" type="PLAIN_TEXT" />
<mapping ext="toml" type="PLAIN_TEXT" /> <mapping ext="toml" type="PLAIN_TEXT" />
<mapping ext="min" type="PLAIN_TEXT" /> <mapping ext="min" type="PLAIN_TEXT" />
<mapping ext="mysql" type="SQL" /> <mapping ext="mysql" type="SQL" />
<mapping pattern=".analysis_options" type="YAML" /> <mapping pattern=".analysis_options" type="YAML" />
<removed_mapping ext="ignore" approved="true" type="IgnoreLang file" /> <removed_mapping ext="ignore" approved="true" type="IgnoreLang file" />
<removed_mapping pattern=".env" approved="true" type="PLAIN_TEXT" />
</extensionMap> </extensionMap>
</component> </component>
</application> </application>

View File

@ -5,5 +5,7 @@
<option name="skipResultsWithOneUsage" value="true" /> <option name="skipResultsWithOneUsage" value="true" />
<option name="SKIP_RESULTS_WHEN_ONE_USAGE" value="true" /> <option name="SKIP_RESULTS_WHEN_ONE_USAGE" value="true" />
<option name="SEARCH_SCOPE" value="All Places" /> <option name="SEARCH_SCOPE" value="All Places" />
<option name="FILE_MASK" value="*.js,*.html" />
<mask>*.js,*.html</mask>
</component> </component>
</application> </application>