PS-2022.2.3 <rodude123@rodude123s-yoga7 Merge branch 'master'

Conflicts:
	filetypes.xml
This commit is contained in:
Rohit Pai 2022-11-02 20:04:01 +00:00
commit 2c07052a03
11 changed files with 23 additions and 108 deletions

View File

@ -1,28 +1 @@
<code_scheme name="Default" version="173"> <code_scheme name="Default" version="173" />
<JSCodeStyleSettings version="0">
<option name="FUNCTION_EXPRESSION_BRACE_STYLE" value="2" />
</JSCodeStyleSettings>
<PHPCodeStyleSettings>
<option name="ANONYMOUS_BRACE_STYLE" value="2" />
<option name="NAMESPACE_BRACE_STYLE" value="2" />
</PHPCodeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="BRACE_STYLE" value="2" />
<option name="CLASS_BRACE_STYLE" value="2" />
<option name="METHOD_BRACE_STYLE" value="2" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
</codeStyleSettings>
<codeStyleSettings language="PHP">
<option name="BRACE_STYLE" value="2" />
<option name="LAMBDA_BRACE_STYLE" value="2" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="SPECIAL_ELSE_IF_TREATMENT" value="true" />
</codeStyleSettings>
</code_scheme>

View File

@ -1,5 +1,5 @@
<application> <application>
<component name="EditorColorsManagerImpl"> <component name="EditorColorsManagerImpl">
<global_color_scheme name="_@user_oblivion" /> <global_color_scheme name="Darcula" />
</component> </component>
</application> </application>

View File

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

View File

@ -1,8 +1,6 @@
<application> <application>
<component name="XDebuggerSettings"> <component name="XDebuggerSettings">
<data-views> <data-views />
<option name="valueLookupDelay" value="150" />
</data-views>
<general /> <general />
<debuggers> <debuggers>
<debugger id="javascript"> <debugger id="javascript">

View File

@ -1,8 +1,8 @@
<application> <application>
<component name="DefaultFont"> <component name="DefaultFont">
<option name="VERSION" value="1" /> <option name="VERSION" value="1" />
<option name="FONT_REGULAR_SUB_FAMILY" value="Regular" /> <option name="FONT_SIZE" value="23" />
<option name="FONT_BOLD_SUB_FAMILY" value="Bold" /> <option name="FONT_SIZE_2D" value="22.75" />
<option name="USE_LIGATURES" value="true" /> <option name="FONT_SCALE" value="1.75" />
</component> </component>
</application> </application>

View File

@ -1,21 +1,6 @@
<application> <application>
<component name="CodeInsightSettings"> <component name="CodeInsightSettings">
<option name="completionCaseSensitive" value="2" /> <option name="REFORMAT_ON_PASTE" value="1" />
<option name="selectAutopopupSuggestionsByChars" value="true" /> <option name="INDENT_TO_CARET_ON_PASTE" value="true" />
<option name="AUTO_POPUP_JAVADOC_INFO" value="true" />
<option name="COMPLETION_CASE_SENSITIVE" value="2" />
<option name="SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS" value="true" />
<option name="AUTOCOMPLETE_ON_CODE_COMPLETION" value="false" />
<option name="INSERT_BRACE_ON_ENTER" value="false" />
</component>
<component name="EditorSettings">
<option name="STRIP_TRAILING_SPACES" value="None" />
<option name="IS_WHEEL_FONTCHANGE_ENABLED" value="true" />
</component>
<component name="LiveEditOptions" chromeUpdateJSOnChanges="true" restartIfHotSwapFailed="true" updateFilesToCompile="true" />
<component name="TodoConfiguration">
<pattern pattern="\bNotImplementedException\b" />
<pattern pattern="(?&lt;=\W|^)(?&lt;TAG&gt;BUG)(\W|$)(.*)" />
<pattern pattern="(?&lt;=\W|^)(?&lt;TAG&gt;TODO)(\W|$)(.*)" />
</component> </component>
</application> </application>

View File

@ -2,6 +2,10 @@
<component name="FileTypeManager" version="18"> <component name="FileTypeManager" version="18">
<ignoreFiles list="*$py.class;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc" /> <ignoreFiles list="*$py.class;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc" />
<extensionMap> <extensionMap>
<mapping ext="csv" type="CSV" />
<removed_mapping ext="tsv" type="CSV/TSV" />
<removed_mapping ext="csv" type="CSV/TSV" />
<mapping ext="tsv" type="TSV" />
<mapping pattern="ArtifactDB" type="AUTO_DETECTED" /> <mapping pattern="ArtifactDB" type="AUTO_DETECTED" />
<mapping ext="mat" type="AUTO_DETECTED" /> <mapping ext="mat" type="AUTO_DETECTED" />
<removed_mapping ext="csv" approved="true" type="CSV" /> <removed_mapping ext="csv" approved="true" type="CSV" />

View File

@ -1,20 +1,9 @@
<application> <application>
<component name="FindSettings"> <component name="FindSettings">
<option name="customScope" value="Project Files" />
<option name="defaultScopeName" value="Project Files" />
<option name="wholeWordsOnly" value="true" />
<option name="WHOLE_WORDS_ONLY" value="true" />
<option name="SEARCH_SCOPE" value="Project Files" />
<mask>*.css</mask> <mask>*.css</mask>
<mask>*.html</mask> <mask>*.html</mask>
<mask>*.xml</mask> <mask>*.xml</mask>
<mask>*.php4</mask> <mask>*.pyw</mask>
<mask>*.phtml</mask> <mask>*.py</mask>
<mask>*.php5</mask>
<mask>*.ctp</mask>
<mask>*.hphp</mask>
<mask>*.module</mask>
<mask>*.inc</mask>
<mask>*.php</mask>
</component> </component>
</application> </application>

View File

@ -1,10 +1,5 @@
<application> <application>
<component name="NodeJsLocalInterpreterManager"> <component name="NodeJsLocalInterpreterManager">
<local-interpreter path="/usr/bin/node"> <local-interpreter path="/usr/bin/node" />
<version-cache last-modified="0" />
</local-interpreter>
<local-interpreter path="C:/Program Files/nodejs/node.exe">
<version-cache last-modified="0" />
</local-interpreter>
</component> </component>
</application> </application>

7
shared-indexes.xml Normal file
View File

@ -0,0 +1,7 @@
<application>
<component name="download-consent">
<option name="consentItems">
<item download="ALLOWED" kind="python" url="https://index-cdn.jetbrains.com/v2" />
</option>
</component>
</application>

36
vcs.xml
View File

@ -1,41 +1,5 @@
<application> <application>
<component name="GitRememberedInputs">
<option name="visitedUrls">
<list>
<UrlAndUserName>
<option name="url" value="https://github.com/udacity/reactnd-contacts-app.git" />
<option name="userName" value="" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="http://github.com" />
<option name="userName" value="rodude123@gmail.com" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="https://github.com/udacity/reactnd-UdaciFitness-complete.git" />
<option name="userName" value="" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="http://gitea.rohitpai.co.uk" />
<option name="userName" value="rodude123" />
</UrlAndUserName>
</list>
</option>
<option name="cloneParentDir" value="$USER_HOME$/Documents/My Projects/React Nanodegree" />
</component>
<component name="Vcs.Log.App.Settings">
<option name="SHOW_CHANGES_FROM_PARENTS" value="true" />
<option name="COLUMN_ID_ORDER">
<list>
<option value="Default.Root" />
<option value="Default.Subject" />
<option value="Default.Author" />
<option value="Default.Date" />
<option value="Space.CommitStatus" />
</list>
</option>
</component>
<component name="VcsApplicationSettings"> <component name="VcsApplicationSettings">
<option name="COMMIT_FROM_LOCAL_CHANGES" value="true" /> <option name="COMMIT_FROM_LOCAL_CHANGES" value="true" />
<option name="SHOW_EDITOR_PREVIEW_ON_DOUBLE_CLICK" value="false" />
</component> </component>
</application> </application>