Przeglądaj źródła

CL-2022.3.3 <theoryofnekomata@CIPANGU.local Merge branch 'master'

Conflicts:
	ide.general.xml
	material_theme.xml
master
TheoryOfNekomata 1 rok temu
rodzic
commit
d64c24f1ad
13 zmienionych plików z 12676 dodań i 19 usunięć
  1. +5
    -0
      baseRefactoring.xml
  2. +30
    -6
      codestyles/TheoryOfNekomata.xml
  3. +3042
    -0
      colors/Light Owl.icls
  4. +3280
    -0
      colors/Material Forest.icls
  5. +3278
    -0
      colors/Material Space.icls
  6. +3028
    -0
      colors/Synthwave.icls
  7. +8
    -8
      colors/TheoryOfNekomata.icls
  8. +1
    -1
      colors/_@user_Darcula.icls
  9. +1
    -1
      databaseDrivers.xml
  10. BIN
      ide.general.xml
  11. BIN
      material_theme.xml
  12. +2
    -2
      pomodoro.state.xml
  13. +1
    -1
      web-types-npm-loader.xml

+ 5
- 0
baseRefactoring.xml Wyświetl plik

@@ -0,0 +1,5 @@
<application>
<component name="BaseRefactoringSettings">
<option name="MOVE_SEARCH_FOR_REFERENCES_FOR_FILE" value="false" />
</component>
</application>

+ 30
- 6
codestyles/TheoryOfNekomata.xml Wyświetl plik

@@ -9,6 +9,7 @@
<option name="HTML_ALIGN_ATTRIBUTES" value="false" />
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
<option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="" />
<option name="HTML_KEEP_WHITESPACES_INSIDE" value="" />
<option name="HTML_ENFORCE_QUOTES" value="true" />
<option name="HTML_NEWLINE_BEFORE_FIRST_ATTRIBUTE" value="When multiline" />
<option name="HTML_NEWLINE_AFTER_LAST_ATTRIBUTE" value="When multiline" />
@@ -40,9 +41,11 @@
</extensions>
</Objective-C-extensions>
<TypeScriptCodeStyleSettings version="0">
<option name="FORCE_SEMICOLON_STYLE" value="true" />
<option name="REFORMAT_C_STYLE_COMMENTS" value="true" />
<option name="USE_DOUBLE_QUOTES" value="false" />
<option name="FORCE_QUOTE_STYlE" value="true" />
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
<option name="JSX_ATTRIBUTE_VALUE" value="Based on type" />
<option name="VAR_DECLARATION_WRAP" value="5" />
<option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" />
</TypeScriptCodeStyleSettings>
@@ -91,6 +94,7 @@
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JSON">
@@ -115,11 +119,21 @@
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
<option name="EXTENDS_LIST_WRAP" value="5" />
<option name="METHOD_CALL_CHAIN_WRAP" value="5" />
<option name="PARENTHESES_EXPRESSION_LPAREN_WRAP" value="true" />
<option name="PARENTHESES_EXPRESSION_RPAREN_WRAP" value="true" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
<option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
<option name="WRAP_COMMENTS" value="true" />
<option name="IF_BRACE_FORCE" value="3" />
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="LESS">
@@ -153,6 +167,14 @@
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="SQL">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="Stylus">
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="2" />
@@ -160,22 +182,24 @@
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="TypeScript">
<option name="INDENT_CASE_FROM_SWITCH" value="false" />
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="CALL_PARAMETERS_WRAP" value="5" />
<option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
<option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
<option name="EXTENDS_LIST_WRAP" value="5" />
<option name="METHOD_CALL_CHAIN_WRAP" value="5" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="PARENTHESES_EXPRESSION_LPAREN_WRAP" value="true" />
<option name="PARENTHESES_EXPRESSION_RPAREN_WRAP" value="true" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="ARRAY_INITIALIZER_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
<option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
<option name="WRAP_COMMENTS" value="true" />
<option name="IF_BRACE_FORCE" value="3" />
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />


+ 3042
- 0
colors/Light Owl.icls
Plik diff jest za duży
Wyświetl plik


+ 3280
- 0
colors/Material Forest.icls
Plik diff jest za duży
Wyświetl plik


+ 3278
- 0
colors/Material Space.icls
Plik diff jest za duży
Wyświetl plik


+ 3028
- 0
colors/Synthwave.icls
Plik diff jest za duży
Wyświetl plik


+ 8
- 8
colors/TheoryOfNekomata.icls Wyświetl plik

@@ -4,7 +4,7 @@
<property name="created">2023-02-23T14:55:53</property>
<property name="ide">WebStorm</property>
<property name="ideVersion">2022.3.1.0.0</property>
<property name="modified">2023-09-02T22:22:46</property>
<property name="modified">2023-10-16T14:41:41</property>
<property name="originalScheme">TheoryOfNekomata</property>
</metaInfo>
<console-font>
@@ -186,8 +186,8 @@
<option name="EFFECT_COLOR" value="99cc" />
</value>
</option>
<option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="DEFAULT_INVALID_STRING_ESCAPE" />
<option name="CUSTOM_KEYWORD1_ATTRIBUTES" baseAttributes="DEFAULT_KEYWORD" />
<option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="" />
<option name="CUSTOM_KEYWORD1_ATTRIBUTES" baseAttributes="" />
<option name="CUSTOM_KEYWORD2_ATTRIBUTES">
<value>
<option name="FOREGROUND" value="aaa321" />
@@ -206,11 +206,11 @@
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="CUSTOM_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_LINE_COMMENT" />
<option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_BLOCK_COMMENT" />
<option name="CUSTOM_NUMBER_ATTRIBUTES" baseAttributes="DEFAULT_NUMBER" />
<option name="CUSTOM_STRING_ATTRIBUTES" baseAttributes="DEFAULT_STRING" />
<option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="DEFAULT_VALID_STRING_ESCAPE" />
<option name="CUSTOM_LINE_COMMENT_ATTRIBUTES" baseAttributes="" />
<option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES" baseAttributes="" />
<option name="CUSTOM_NUMBER_ATTRIBUTES" baseAttributes="" />
<option name="CUSTOM_STRING_ATTRIBUTES" baseAttributes="" />
<option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="" />
<option name="DEFAULT_ATTRIBUTE">
<value>
<option name="FOREGROUND" value="ffa1c9" />


+ 1
- 1
colors/_@user_Darcula.icls Wyświetl plik

@@ -3,7 +3,7 @@
<property name="created">2023-07-08T18:32:37</property>
<property name="ide">WebStorm</property>
<property name="ideVersion">2023.1.3.0.0</property>
<property name="modified">2023-09-02T22:22:46</property>
<property name="modified">2023-10-16T14:41:41</property>
<property name="originalScheme">Darcula</property>
</metaInfo>
<colors>


+ 1
- 1
databaseDrivers.xml Wyświetl plik

@@ -1,7 +1,7 @@
<application>
<component name="LocalDatabaseDriverManager" version="201">
<driver id="sqlite.xerial">
<artifact id="Xerial SQLiteJDBC" name="Xerial SQLiteJDBC" use="true" version="3.40.1" />
<artifact id="Xerial SQLiteJDBC" name="Xerial SQLiteJDBC" use="true" version="3.43.0" />
</driver>
</component>
</application>

BIN
ide.general.xml Wyświetl plik


BIN
material_theme.xml Wyświetl plik


+ 2
- 2
pomodoro.state.xml Wyświetl plik

@@ -1,8 +1,8 @@
<application>
<component name="PomodoroState">
<option name="pomodorosTillLongBreak" value="2" />
<option startTime="startTime" value="1597476443009" />
<option lastUpdateTime="lastUpdateTime" value="1597476743265" />
<option startTime="startTime" value="1696475155876" />
<option lastUpdateTime="lastUpdateTime" value="1696475156591" />
<option pomodorosAmount="pomodorosAmount" value="6" />
</component>
</application>

+ 1
- 1
web-types-npm-loader.xml Wyświetl plik

@@ -1,5 +1,5 @@
<application>
<component name="WebTypesNpmLoader">
<component name="WebTypesNpmLoader" timestamp="1697184774350">
<package name="@web-types/at-nuxt-vue-app">
<version value="2.10.0-1" url="https://registry.npmjs.org/@web-types/at-nuxt-vue-app/-/at-nuxt-vue-app-2.10.0-1.tgz" />
<version value="2.4.0-1" url="https://registry.npmjs.org/@web-types/at-nuxt-vue-app/-/at-nuxt-vue-app-2.4.0-1.tgz" />


Ładowanie…
Anuluj
Zapisz