Skip to content

Commit 07839bf

Browse files
tavishtavish
committed
IU-171.2272.14 <tavish@Tavs-P50 Update vim_settings.xml, colors.scheme.xml, _@user_Darcula.icls Create Darcula _P-50_.icls, editor.codeinsight.xml
1 parent d283837 commit 07839bf

5 files changed

Lines changed: 60 additions & 17 deletions

File tree

‎colors.scheme.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<application>
22
<component name="EditorColorsManagerImpl">
3-
<global_color_scheme name="_@user_Darcula" />
3+
<global_color_scheme name="Darcula (P-50)" />
44
</component>
55
</application>

‎colors/Darcula _P-50_.icls‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<scheme name="Darcula (P-50)" version="142" parent_scheme="Darcula">
2+
<option name="FONT_SCALE" value="2.0" />
3+
<metaInfo>
4+
<property name="created">2017-01-15T22:01:55</property>
5+
<property name="ide">idea</property>
6+
<property name="ideVersion">2017.1.0.0</property>
7+
<property name="modified">2017-01-15T22:02:04</property>
8+
<property name="originalScheme">_@user_Darcula</property>
9+
</metaInfo>
10+
<option name="EDITOR_FONT_SIZE" value="30" />
11+
<option name="CONSOLE_FONT_NAME" value="Monospaced" />
12+
<option name="EDITOR_FONT_NAME" value="Source Code Pro" />
13+
</scheme>

‎colors/_@user_Darcula.icls‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
<property name="created">2017-01-15T19:53:38</property>
55
<property name="ide">idea</property>
66
<property name="ideVersion">2017.1.0.0</property>
7-
<property name="modified">2017-01-15T20:11:50</property>
7+
<property name="modified">2017-01-15T21:53:43</property>
88
<property name="originalScheme">Darcula</property>
99
</metaInfo>
10-
<option name="EDITOR_FONT_SIZE" value="24" />
10+
<option name="EDITOR_FONT_SIZE" value="30" />
1111
<option name="CONSOLE_FONT_NAME" value="Monospaced" />
12+
<option name="CONSOLE_FONT_SIZE" value="24" />
1213
<option name="EDITOR_FONT_NAME" value="Source Code Pro" />
1314
</scheme>

‎editor.codeinsight.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<application>
2+
<component name="CodeFoldingSettings">
3+
<option name="COLLAPSE_DOC_COMMENTS" value="true" />
4+
<option name="COLLAPSE_CUSTOM_FOLDING_REGIONS" value="true" />
5+
</component>
6+
<component name="JavaCodeFoldingSettings">
7+
<option name="collapseAccessors" value="true" />
8+
<option name="collapseAnnotations" value="true" />
9+
</component>
10+
</application>

‎vim_settings.xml‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<file name="/JSON Fragment (exportReesSwagger.yaml:6212).json" timestamp="1482363376874">
99
<mark key="[" line="0" column="0" />
1010
</file>
11-
<file name="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/Request.java" timestamp="1484276979005">
12-
<mark key="'" line="2" column="0" />
11+
<file name="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/Request.java" timestamp="1484542618673">
12+
<mark key="'" line="6" column="13" />
1313
<mark key="[" line="2" column="0" />
1414
<mark key="]" line="2" column="0" />
1515
<mark key="." line="2" column="0" />
@@ -422,8 +422,8 @@
422422
<mark key="." line="41" column="8" />
423423
<mark key="^" line="41" column="8" />
424424
</file>
425-
<file name="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/action/AbstractAction.java" timestamp="1484539940320">
426-
<mark key="'" line="52" column="2" />
425+
<file name="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/action/AbstractAction.java" timestamp="1484542723566">
426+
<mark key="'" line="0" column="0" />
427427
<mark key="[" line="5" column="2" />
428428
<mark key="]" line="5" column="8" />
429429
<mark key="." line="5" column="8" />
@@ -439,6 +439,7 @@
439439
<mark key="." line="26" column="58" />
440440
<mark key="^" line="26" column="3" />
441441
</file>
442+
<file name="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/model/ModelBase.java" timestamp="1484542652134" />
442443
<file name="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/model/template/TemplateHelper.java" timestamp="1484019448573">
443444
<mark key="'" line="25" column="0" />
444445
<mark key="[" line="5" column="0" />
@@ -570,8 +571,8 @@
570571
<mark key="^" line="21" column="12" />
571572
<mark key="." line="20" column="13" />
572573
</file>
573-
<file name="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/RequestRouter.java" timestamp="1484440309699">
574-
<mark key="'" line="108" column="31" />
574+
<file name="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/RequestRouter.java" timestamp="1484542424798">
575+
<mark key="'" line="112" column="4" />
575576
<mark key="[" line="14" column="0" />
576577
<mark key="]" line="14" column="34" />
577578
<mark key="^" line="101" column="3" />
@@ -619,12 +620,6 @@
619620
</file>
620621
</filemarks>
621622
<jumps>
622-
<jump line="95" column="0" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/model/ModelBase.java" />
623-
<jump line="34" column="4" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/Request.java" />
624-
<jump line="3" column="32" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/Request.java" />
625-
<jump line="121" column="39" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/model/ModelBase.java" />
626-
<jump line="118" column="11" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/model/ModelBase.java" />
627-
<jump line="109" column="17" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/model/ModelBase.java" />
628623
<jump line="13" column="13" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/action/slots/SlotsPost.java" />
629624
<jump line="48" column="11" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/Request.java" />
630625
<jump line="43" column="91" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/Request.java" />
@@ -638,7 +633,6 @@
638633
<jump line="25" column="0" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/Request.java" />
639634
<jump line="18" column="13" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/Request.java" />
640635
<jump line="17" column="60" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/Request.java" />
641-
<jump line="6" column="28" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/Request.java" />
642636
<jump line="29" column="27" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/model/ModelBase.java" />
643637
<jump line="31" column="19" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/model/ModelBase.java" />
644638
<jump line="51" column="6" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/model/ModelBase.java" />
@@ -718,6 +712,13 @@
718712
<jump line="23" column="2" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/action/AbstractAction.java" />
719713
<jump line="110" column="21" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/model/ModelBase.java" />
720714
<jump line="51" column="2" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/action/AbstractAction.java" />
715+
<jump line="112" column="4" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/RequestRouter.java" />
716+
<jump line="0" column="0" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/RequestRouter.java" />
717+
<jump line="6" column="13" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/Request.java" />
718+
<jump line="21" column="2" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/action/AbstractAction.java" />
719+
<jump line="18" column="0" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/action/AbstractAction.java" />
720+
<jump line="56" column="2" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/action/AbstractAction.java" />
721+
<jump line="28" column="2" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/action/AbstractAction.java" />
721722
<jump line="0" column="0" filename="$USER_HOME$/code/backend-api/src/main/java/com/equipews/apigateway/action/AbstractAction.java" />
722723
</jumps>
723724
<registers>
@@ -864,7 +865,7 @@
864865
<shortcut-conflict owner="ide">
865866
<text>ctrl pressed F</text>
866867
</shortcut-conflict>
867-
<shortcut-conflict owner="vim">
868+
<shortcut-conflict owner="ide">
868869
<text>ctrl pressed N</text>
869870
</shortcut-conflict>
870871
<shortcut-conflict owner="vim">
@@ -894,6 +895,24 @@
894895
<shortcut-conflict owner="vim">
895896
<text>ctrl pressed Y</text>
896897
</shortcut-conflict>
898+
<shortcut-conflict owner="ide">
899+
<text>ctrl pressed U</text>
900+
</shortcut-conflict>
901+
<shortcut-conflict owner="ide">
902+
<text>ctrl pressed X</text>
903+
</shortcut-conflict>
904+
<shortcut-conflict owner="vim">
905+
<text>ctrl pressed OPEN_BRACKET</text>
906+
</shortcut-conflict>
907+
<shortcut-conflict owner="ide">
908+
<text>ctrl pressed H</text>
909+
</shortcut-conflict>
910+
<shortcut-conflict owner="vim">
911+
<text>ctrl pressed CLOSE_BRACKET</text>
912+
</shortcut-conflict>
913+
<shortcut-conflict owner="ide">
914+
<text>ctrl pressed S</text>
915+
</shortcut-conflict>
897916
</shortcut-conflicts>
898917
<editor>
899918
<key-repeat enabled="true" />

0 commit comments

Comments
 (0)