Przeglądaj źródła

WS-2021.1.2 <TheoryOfNekomata@VALHALLA Merge branch 'master'

Conflicts:
	filetypes.xml
master
TheoryOfNekomata 3 lat temu
rodzic
commit
e47c3433ed
9 zmienionych plików z 12 dodań i 94 usunięć
  1. +0
    -5
      _windows/keymap.xml
  2. +5
    -0
      _windows/path.macros.xml
  3. +5
    -0
      androidStudioFirstRun.xml
  4. +1
    -1
      code.style.schemes.xml
  5. +0
    -70
      editor.xml
  6. +1
    -0
      ide.general.xml
  7. +0
    -5
      intentionSettings.xml
  8. +0
    -6
      notifications.xml
  9. +0
    -7
      ui.lnf.xml

+ 0
- 5
_windows/keymap.xml Wyświetl plik

@@ -1,5 +0,0 @@
<application>
<component name="KeymapManager">
<active_keymap name="Windows Proper Redo" />
</component>
</application>

+ 5
- 0
_windows/path.macros.xml Wyświetl plik

@@ -0,0 +1,5 @@
<application>
<component name="PathMacrosImpl">
<macro name="KOTLIN_BUNDLED" value="C:\Users\TheoryOfNekomata\AppData\Roaming\Google\AndroidStudio4.2\plugins\Kotlin\kotlinc" />
</component>
</application>

+ 5
- 0
androidStudioFirstRun.xml Wyświetl plik

@@ -0,0 +1,5 @@
<application>
<component name="AndroidFirstRunPersistentData">
<version>1</version>
</component>
</application>

+ 1
- 1
code.style.schemes.xml Wyświetl plik

@@ -1,5 +1,5 @@
<application>
<component name="CodeStyleSchemeSettings">
<option name="CURRENT_SCHEME_NAME" value="TheoryOfNekomata" />
<option name="CURRENT_SCHEME_NAME" />
</component>
</application>

+ 0
- 70
editor.xml Wyświetl plik

@@ -1,71 +1,4 @@
<application>
<component name="CodeInsightSettings">
<option name="AUTOINSERT_PAIR_BRACKET" value="false" />
</component>
<component name="DefaultFont">
<option name="FONT_SIZE" value="12" />
<option name="FONT_FAMILY" value="mononoki" />
<option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
<option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
<option name="LINE_SPACING" value="0.9" />
</component>
<component name="EditorSettings">
<option name="languageBreadcrumbsMap">
<map>
<entry key="CSS" value="true" />
<entry key="HOCON" value="true" />
<entry key="HTML" value="true" />
<entry key="JSON" value="true" />
<entry key="Jade" value="true" />
<entry key="JavaScript" value="true" />
<entry key="LESS" value="true" />
<entry key="SASS" value="true" />
<entry key="SCSS" value="true" />
<entry key="TypeScript" value="true" />
<entry key="XHTML" value="true" />
<entry key="XML" value="true" />
<entry key="yaml" value="true" />
<entry key="yamlEx" value="true" />
</map>
</option>
<option name="USE_SOFT_WRAPS" value="PREVIEW" />
<option name="STRIP_TRAILING_SPACES" value="Whole" />
<option name="IS_ENSURE_NEWLINE_AT_EOF" value="true" />
<option name="CARET_BLINKING_PERIOD" value="250" />
<option name="ARE_GUTTER_ICONS_SHOWN" value="false" />
<option name="SHOW_BREADCRUMBS" value="false" />
<option name="IS_BLOCK_CURSOR" value="true" />
<option name="IS_WHITESPACES_SHOWN" value="true" />
<option name="ADDITIONAL_PAGE_AT_BOTTOM" value="true" />
</component>
<component name="InlayHintsSettings">
<option name="disabledHintProviderIds">
<set>
<option value="JavaScript.js.chain.hints" />
<option value="JavaScript.js.type.hints" />
<option value="JavaScript.microservices.url.path.inlay.hints" />
<option value="TypeScript.ts.chain.hints" />
<option value="TypeScript.ts.enum.hints" />
<option value="TypeScript.ts.type.hints" />
</set>
</option>
<option name="lastViewedProviderKeyId" value="parameter.hints.old" />
<settingsMapElement>
<TypeScript.ts.type.hints>
<Settings>
<option name="showForInferredParameters" value="false" />
<option name="showForShorthandFunctions" value="true" />
</Settings>
</TypeScript.ts.type.hints>
<JavaScript.js.type.hints>
<Settings>
<option name="showForFunctions" value="true" />
<option name="showForShorthandFunctions" value="true" />
<option name="showForVariablesAndFields" value="true" />
</Settings>
</JavaScript.js.type.hints>
</settingsMapElement>
</component>
<component name="JSEditorOptions">
<option name="START_STRING_INTERPOLATION_ON_TYPING" value="true" />
</component>
@@ -73,7 +6,4 @@
<pattern pattern="\btodo\b.*" />
<pattern icon="important" pattern="\bfixme\b.*" />
</component>
<component name="XmlEditorOptions">
<option name="showCssInlineColorPreview" value="true" />
</component>
</application>

+ 1
- 0
ide.general.xml Wyświetl plik

@@ -28,6 +28,7 @@
<entry key="ide.tree.ui.experimental" value="false" />
<entry key="ide.mac.allowDarkWindowDecorations" value="true" />
<entry key="ide.new.stripes.ui" value="true" />
<entry key="external.system.auto.import.disabled" value="true" />
</component>
<component name="StatusBar">
<option name="widgets">


+ 0
- 5
intentionSettings.xml Wyświetl plik

@@ -1,5 +0,0 @@
<application>
<component name="IntentionManagerSettings">
<ignoreAction name="JavaScript/JSX/Wrap value with {}" />
</component>
</application>

+ 0
- 6
notifications.xml Wyświetl plik

@@ -1,6 +0,0 @@
<application>
<component name="NotificationConfiguration">
<notification groupId="Docker: Dockerfile detection" displayType="NONE" shouldLog="false" />
<notification groupId="Quokka Notifications" displayType="NONE" shouldLog="false" />
</component>
</application>

+ 0
- 7
ui.lnf.xml Wyświetl plik

@@ -1,7 +0,0 @@
<application>
<component name="UISettings">
<option name="FULL_PATHS_IN_TITLE_BAR" value="true" />
<option name="MAX_LOOKUP_WIDTH2" value="830" />
<option name="SHOW_NAVIGATION_BAR" value="false" />
</component>
</application>

Ładowanie…
Anuluj
Zapisz